hydra-core 5.0.0.pre3 → 5.0.0.pre4

data/lib/hydra-core.rb

@@ -1 +1,18 @@
-require 'hydra-head'
+require 'hydra'
+
+module HydraHead 
+  require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'hydra-head/routes'
+  # If you put this in your application's routes.rb, it will add the Hydra Head routes to the app.
+  # The hydra:head generator puts this in routes.rb for you by default.
+  # See {HydraHead::Routes} for information about how to modify which routes are generated.
+  # @example 
+  #   # in config/routes.rb
+  #   MyAppName::Application.routes.draw do
+  #     Blacklight.add_routes(self)
+  #     HydraHead.add_routes(self)
+  #   end
+  def self.add_routes(router, options = {})
+    HydraHead::Routes.new(router, options).draw
+  end
+end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.pre3"
+  VERSION = "5.0.0.pre4"
 end
 

data/lib/hydra.rb

@@ -1,6 +1,4 @@
 require 'hydra-access-controls'
-require 'hydra-file-access'
-
 # Hydra libraries
 module Hydra
   extend ActiveSupport::Autoload
@@ -10,19 +8,17 @@ module Hydra
   autoload :ModelMethods
   autoload :RepositoryController
   autoload :Solr
-
   module ModelMixins
-    # We can't autoload ModelMixins, because it's defined by hydra-access-controls
+    # ModelMixins already loaded by hydra-access-controls
     autoload :CommonMetadata
     autoload :SolrDocumentExtension
   end
-  module Models
-    extend ActiveSupport::Autoload
-    autoload :FileAsset
-  end
-
+  autoload :Models
 end
 
+# require these models once the hydra module has been set up, so that all autoloads take place
+#require 'hydra-file-access'
+
 begin
   SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension
 rescue NameError

data/lib/hydra/models.rb

@@ -0,0 +1,7 @@
+module Hydra
+  module Models
+    extend ActiveSupport::Autoload
+    autoload :FileAsset
+  end
+end
+

data/spec/support/Gemfile

@@ -7,6 +7,6 @@ gem 'sqlite3'
 gem 'devise'
 gem 'blacklight'
 gem 'hydra-access-controls', :path=>'../../../hydra-access-controls'
-gem 'hydra-core', :path=>'../../'
+gem 'hydra-core', :path=>'../../', :require=>'hydra-core'
 gem 'rspec-rails'
 gem 'factory_girl_rails', "<2.0.0" # >=2.0.0 requires ruby 1.9

data/spec/unit/hydra-head-engine_spec.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "hydra-head"
 
 describe HydraHead::Engine do
   it "should be a subclass of Rails::Engine" do
     HydraHead::Engine.superclass.should == Rails::Engine
   end
-end
+end

data/spec/unit/hydra-head_spec.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "hydra-head"
 
 describe HydraHead do
   it "should be valid" do
     HydraHead.should be_a(Module)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre3
+  version: 5.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre3
+        version: 5.0.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre3
+        version: 5.0.0.pre4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +362,6 @@ files:
 - lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml
 - lib/generators/hydra/templates/solr_conf/solr.xml
 - lib/hydra-core.rb
-- lib/hydra-head.rb
 - lib/hydra-head/engine.rb
 - lib/hydra-head/routes.rb
 - lib/hydra-head/version.rb
@@ -375,6 +374,7 @@ files:
 - lib/hydra/model_methods.rb
 - lib/hydra/model_mixins/common_metadata.rb
 - lib/hydra/model_mixins/solr_document_extension.rb
+- lib/hydra/models.rb
 - lib/hydra/models/file_asset.rb
 - lib/hydra/repository_controller.rb
 - lib/hydra/solr.rb

data/lib/hydra-head.rb

@@ -1,27 +0,0 @@
-module HydraHead 
-  require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'hydra-head/routes'
-  require 'hydra'
-  
-  def self.version
-    HydraHead::VERSION
-  end
-
-  def self.root
-    @root ||= File.expand_path(File.dirname(File.dirname(__FILE__)))
-  end
-  
-  # If you put this in your application's routes.rb, it will add the Hydra Head routes to the app.
-  # The hydra:head generator puts this in routes.rb for you by default.
-  # See {HydraHead::Routes} for information about how to modify which routes are generated.
-  # @example 
-  #   # in config/routes.rb
-  #   MyAppName::Application.routes.draw do
-  #     Blacklight.add_routes(self)
-  #     HydraHead.add_routes(self)
-  #   end
-  def self.add_routes(router, options = {})
-    HydraHead::Routes.new(router, options).draw
-  end
-  
-end