diff --git a/init.rb b/init.rb index b2e0f6fb2..3c19a743c 100644 --- a/init.rb +++ b/init.rb @@ -1,12 +1 @@ # Include hook code here -require "solrizer" -require "solrizer-fedora" - -module ActiveSupport::Dependencies::Loadable - # Provides a hook for intercepting calls to require_dependency that are referencing other plugins - def require_plugin_dependency(dependency_path) - modified_path = dependency_path - p "requiring #{modified_path}" - require_dependency modified_path - end -end \ No newline at end of file diff --git a/lib/blacklight.rb b/lib/blacklight.rb index a94b8f659..39c86b72a 100644 --- a/lib/blacklight.rb +++ b/lib/blacklight.rb @@ -1,4 +1,4 @@ -require "init" # This is a hacky way of ensuring that require_plugin_dependency is defined. +require "hydra-head" # This is a hacky way of ensuring that require_plugin_dependency is defined. module Blacklight require_plugin_dependency "vendor/plugins/blacklight/lib/blacklight.rb" diff --git a/lib/hydra-head.rb b/lib/hydra-head.rb index 35e7b6081..7f5dffa42 100644 --- a/lib/hydra-head.rb +++ b/lib/hydra-head.rb @@ -1,4 +1,6 @@ require "active-fedora" +require "solrizer" +require "solrizer-fedora" module Hydra module Head @@ -6,6 +8,14 @@ module Head require 'hydra-head/version' end end + +module ActiveSupport::Dependencies::Loadable + # Provides a hook for intercepting calls to require_dependency that are referencing other plugins + def require_plugin_dependency(dependency_path) + require_dependency modified_path + end +end + Dir[File.join(File.dirname(__FILE__), "hydra", "**", "*.rb")].each {|f| require f} require "hydra" require "stanford_blacklight_extensions"