Skip to content

Commit

Permalink
use a cul_hydra ref with no blacklight dependency and some zeitwerk-f…
Browse files Browse the repository at this point in the history
…riendly module renames
  • Loading branch information
barmintor authored and elohanlon committed Dec 21, 2023
1 parent 0ced1d3 commit b61629f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 23 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ gem 'devise', '~> 4.9.3'
# gem 'childprocess', '~> 2.0'

# CUL Fedora Dependencies and Content Models
gem 'cul_hydra', git: 'https://github.com/cul/cul_hydra', ref: 'master'
# gem 'cul_hydra', path: '../cul_hydra'
gem 'cul_hydra', git: 'https://github.com/cul/cul_hydra', ref: 'remove_blacklight'
gem 'active-fedora', '8.6.0'
gem 'rubydora'
# Temporarily use specific commit because new version of gem hasn't been released yet. Latest is 1.1.3.
Expand Down
23 changes: 3 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ GIT

GIT
remote: https://github.com/cul/cul_hydra
revision: eed9abddd10b341ccc26b753353966efaf533736
ref: master
revision: 30a3ef5dce579bb63c6a3b3ff00ca9ab9480d5c9
ref: remove_blacklight
specs:
cul_hydra (1.12.0.dev)
active-fedora (>= 8.0, < 8.7.0)
active-triples (~> 0.4.0)
active_fedora_finders (>= 0.5.0)
blacklight (~> 7.0)
httpclient
json (>= 1.8.3)
mods
Expand Down Expand Up @@ -119,16 +118,6 @@ GEM
best_type (1.0.0)
mime-types (~> 3.4)
bigdecimal (3.1.5)
blacklight (7.35.0)
deprecation
globalid
hashdiff
i18n (>= 1.7.0)
jbuilder (~> 2.7)
kaminari (>= 0.15)
ostruct (>= 0.3.2)
rails (>= 5.1, < 7.2)
view_component (>= 2.66, < 4)
bootsnap (1.17.0)
msgpack (~> 1.2)
bootstrap-sass (3.4.1)
Expand Down Expand Up @@ -214,7 +203,7 @@ GEM
railties (>= 3.0.0)
faker (3.2.2)
i18n (>= 1.8.11, < 2)
faraday (2.7.12)
faraday (2.8.1)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
Expand All @@ -227,7 +216,6 @@ GEM
haml (5.2.2)
temple (>= 0.8.0)
tilt
hashdiff (1.1.0)
hooks (0.4.1)
uber (~> 0.0.14)
htmlentities (4.3.4)
Expand Down Expand Up @@ -324,7 +312,6 @@ GEM
nokogiri (>= 1.4.2)
solrizer (~> 3.3)
orm_adapter (0.5.0)
ostruct (0.6.0)
parallel (1.24.0)
parser (3.2.2.4)
ast (~> 2.4.1)
Expand Down Expand Up @@ -538,10 +525,6 @@ GEM
sequel (>= 4.26.0)
vegas (0.1.11)
rack (>= 1.0.0)
view_component (3.8.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
Expand Down
1 change: 0 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class Application < Rails::Application
# -- all .rb files in that directory are automatically loaded.

config.load_defaults 6.0
config.autoloader = :classic # need this because of "RDF::CUL" naming in cul_hydra gem

config.generators do |g|
g.test_framework :rspec, spec: true
Expand Down
15 changes: 15 additions & 0 deletions config/initializers/zeitwerk.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Rails.autoloaders.each do |autoloader|
# inflections for some all-caps module names
autoloader.inflector.inflect(
'dc_metadata' => 'DCMetadata',
'fcrepo3' => 'FCREPO3',
'nfo' => 'NFO',
'nie' => 'NIE',
'olo' => 'OLO',
'ore' => 'ORE',
'pimo' => 'PIMO',
'rdf' => 'RDF',
'sc' => 'SC',
'xml_generator' => 'XMLGenerator'
)
end

0 comments on commit b61629f

Please sign in to comment.