Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT disable bulkrax #124

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
source 'https://rubygems.org'

# workarounds for gems failing to build
require 'pathname'
if Pathname.new('vendor/bundle/ruby/2.7.0/gems/libxml-ruby-3.1.0').exist?
gem 'libxml-ruby', '3.1.0', path: 'vendor/bundle/ruby/2.7.0/gems/libxml-ruby-3.1.0'
else
gem 'libxml-ruby', '3.1.0'
end
# disable bulkrax
# require 'pathname'
# if Pathname.new('vendor/bundle/ruby/2.7.0/gems/libxml-ruby-3.1.0').exist?
# gem 'libxml-ruby', '3.1.0', path: 'vendor/bundle/ruby/2.7.0/gems/libxml-ruby-3.1.0'
# else
# gem 'libxml-ruby', '3.1.0'
# end
gem "posix-spawn", github: "https://github.com/rtomayko/posix-spawn/pull/93"

git_source(:github) do |repo_name|
Expand Down Expand Up @@ -55,8 +56,9 @@ gem 'active_scheduler'

gem 'net-ldap'

# disable bulkrax
# temporarily hold back bulkrax version to 0.1.0
gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: '5299b81' # branch: 'main'
# gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: '5299b81' # branch: 'main'

# EZID client from Duke
gem 'ezid-client'
Expand Down Expand Up @@ -144,7 +146,8 @@ group :development, :test do
gem 'solr_wrapper', '~> 2.1.0'
end

gem 'willow_sword', github: 'notch8/willow_sword', ref: '0a669d7'
# disable bulkrax
# gem 'willow_sword', github: 'notch8/willow_sword', ref: '0a669d7'

gem 'dotenv-rails'
gem 'recaptcha'
Expand Down
50 changes: 0 additions & 50 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,44 +1,10 @@
GIT
remote: https://github.com/notch8/willow_sword.git
revision: 0a669d78617c6003e4aa1a46a10447be92be27d5
ref: 0a669d7
specs:
willow_sword (0.2.0)
bagit (~> 0.4.1)
rails (>= 5.1.6)
rubyzip (>= 1.0.0)

GIT
remote: https://github.com/rtomayko/posix-spawn.git
revision: 0fce38ed5458b638eda5f3bb711903424a4366db
ref: refs/pull/93/head
specs:
posix-spawn (0.3.15)

GIT
remote: https://github.com/samvera-labs/bulkrax.git
revision: 5299b8195e51d859b10dcd4f83b631746da2e66e
ref: 5299b81
specs:
bulkrax (0.1.0)
bagit (~> 0.4)
coderay
iso8601 (~> 0.9.0)
kaminari
language_list (~> 1.2, >= 1.2.1)
libxml-ruby (~> 3.1.0)
loofah (>= 2.2.3)
oai (>= 0.4, < 2.x)
rack (>= 2.0.6)
rails (>= 5.1.6)
rdf (>= 2.0.2, < 4.0)
simple_form

PATH
remote: vendor/bundle/ruby/2.7.0/gems/libxml-ruby-3.1.0
specs:
libxml-ruby (3.1.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -145,9 +111,6 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bagit (0.4.6)
docopt (~> 0.5.0)
validatable (~> 1.6)
base64 (0.2.0)
bcp47 (0.3.3)
i18n
Expand Down Expand Up @@ -246,7 +209,6 @@ GEM
devise-guests (0.8.3)
devise
diff-lcs (1.5.1)
docopt (0.5.0)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
Expand Down Expand Up @@ -340,8 +302,6 @@ GEM
multipart-post (>= 1.2, < 3)
faraday-encoding (0.0.4)
faraday
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
fcrepo_wrapper (0.9.0)
ruby-progressbar
ffi (1.17.0)
Expand Down Expand Up @@ -485,7 +445,6 @@ GEM
iiif_manifest (0.5.0)
activesupport (>= 4)
io-like (0.3.1)
iso8601 (0.9.1)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -536,7 +495,6 @@ GEM
kaminari-core (1.2.2)
kaminari_route_prefix (0.1.1)
kaminari (~> 1.0)
language_list (1.2.1)
language_server-protocol (3.17.0.3)
ld-patch (3.2.2)
ebnf (~> 2.3)
Expand Down Expand Up @@ -653,10 +611,6 @@ GEM
racc (~> 1.4)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4)
oai (1.1.0)
builder (>= 3.1.0)
faraday
faraday_middleware
oauth (0.6.2)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
Expand Down Expand Up @@ -1031,7 +985,6 @@ GEM
execjs (>= 0.3.0, < 3)
unicode-display_width (2.6.0)
unicode-types (1.10.0)
validatable (1.6.7)
version_gem (1.1.4)
warden (1.2.9)
rack (>= 2.0.9)
Expand All @@ -1058,7 +1011,6 @@ DEPENDENCIES
active_scheduler
bigdecimal (~> 1.4.4)
bootstrap-sass (~> 3.4.1)
bulkrax!
byebug
capybara
chromedriver-helper
Expand All @@ -1080,7 +1032,6 @@ DEPENDENCIES
jira-ruby (~> 1.1)
jquery-rails
ldap_groups_lookup (~> 0.11.0)
libxml-ruby (= 3.1.0)!
listen (~> 3.0.5)
loofah (~> 2.19.1)
mysql2
Expand Down Expand Up @@ -1128,7 +1079,6 @@ DEPENDENCIES
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
willow_sword!

BUNDLED WITH
2.4.22
2 changes: 2 additions & 0 deletions config/initializers/bulkrax.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

if defined?(Bulkrax)
Bulkrax.setup do |config|
# Add local parsers
# config.parsers += [
Expand Down Expand Up @@ -95,3 +96,4 @@
# Properties that should not be used in imports/exports. They are reserved for use by Hyrax.
# config.reserved_properties += ['my_field']
end
end
2 changes: 1 addition & 1 deletion config/initializers/hyrax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,6 @@
Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')

# set bulkrax default work type to first curation_concern if it isn't already set
if Bulkrax.default_work_type.blank?
if defined?(Bulkrax) && Bulkrax.default_work_type.blank?
Bulkrax.default_work_type = Hyrax.config.curation_concerns.first.to_s
end
4 changes: 3 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
end

Rails.application.routes.draw do
mount Bulkrax::Engine, at: '/'
if defined?(Bulkrax)
mount Bulkrax::Engine, at: '/'
end
mount BrowseEverything::Engine => '/browse'

# block Blacklight bookmark routes
Expand Down