hydra-head 4.0.3 → 4.1.0

data/test_support/spec/helpers/javascript_includes_helper_spec.rb

@@ -3,6 +3,14 @@ include JavascriptIncludesHelper
 # include HydraHelper # This helper provides the Controller's javascript_includes method
 
 describe JavascriptIncludesHelper do
+  before :all do
+    @behavior = Hydra::JavascriptIncludesHelperBehavior.deprecation_behavior
+    Hydra::JavascriptIncludesHelperBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::JavascriptIncludesHelperBehavior.deprecation_behavior = @behavior
+  end
 
   before(:each) do
     # Mock behavior of Controller's javascript_includes method
@@ -40,4 +48,4 @@ describe JavascriptIncludesHelper do
     end
   end
   
-end
+end

data/test_support/spec/lib/catalog_spec.rb

@@ -1,16 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Hydra::Catalog do
+describe Hydra::Controller::CatalogControllerBehavior do
   
   before(:all) do
+    @behavior = Hydra::Controller::CatalogControllerBehavior.deprecation_behavior
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = :silence
+
     class CatalogTest < ApplicationController
-      include Hydra::Catalog
+      include Hydra::Controller::CatalogControllerBehavior
     end
     @catalog = CatalogTest.new
   end
+
+  after(:all) do
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = @behavior
+  end
   
   it "should extend classes with the necessary Hydra modules" do
     CatalogTest.included_modules.should include(Hydra::AccessControlsEnforcement)
   end
   
-end
+end

data/test_support/spec/lib/global_configurable_spec.rb

@@ -0,0 +1,98 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Blacklight::GlobalConfigurable do
+  
+  class TestConfig
+    extend Blacklight::GlobalConfigurable
+  end
+  
+  before(:each) do
+    TestConfig.reset_configs!
+  end
+  
+  it "should respond to configure" do
+    TestConfig.respond_to? :configure
+  end
+  
+  describe "the default state" do
+    describe "config" do
+      it "should be a Hash" do
+          TestConfig.config.should be_a Hash      
+      end
+    end
+    describe "configs[:shared]" do
+      it "should be a Hash" do
+        TestConfig.configs[:shared].should be_a Hash
+      end
+    end
+  end
+  
+  describe "configs[:shared]" do
+    it "should not have the values of its members altered by other environments" do
+      TestConfig.configure do |config|
+        config[:key] = ":shared value"
+      end
+      TestConfig.configure(::Rails.env) do |config|
+        config[:key] = ":test value"
+      end
+      TestConfig.config[:key].should == ":test value"
+      TestConfig.configs[:shared][:key].should == ":shared value"
+      TestConfig.configs[::Rails.env][:key].should == ":test value"
+    end
+  end
+  
+  describe "the #configure method behavior" do
+    it "requires a block" do
+      lambda{TestConfig.configure}.should raise_error(LocalJumpError)
+    end
+    it "yields a hash" do
+      TestConfig.configure{|config| config.should be_a(Hash) }
+    end
+    it "should clear the configs if reset_configs! is called" do
+      TestConfig.configure do |config|
+        config[:asdf] = 'asdf'
+      end
+      TestConfig.configs[:shared][:asdf].should == 'asdf'
+      TestConfig.reset_configs!
+      TestConfig.configs[:shared][:asdf].should == nil
+    end
+    
+    it "should merge settings from the :shared environment" do
+      TestConfig.configure do |config|
+        config[:app_id] = 'Blacklight'
+        config[:mode] = :shared!
+      end
+      TestConfig.configure(::Rails.env) do |config|
+        config[:mode] = ::Rails.env
+      end
+      TestConfig.config[:app_id].should == 'Blacklight'
+      TestConfig.config[:mode].should_not == :shared!
+      TestConfig.config[:mode].should == ::Rails.env
+    end
+  end
+  
+  describe "config" do
+    it "should return an empty Hash if nothing was configured" do
+      TestConfig.config.should == {}
+    end
+    
+    it "should return only what is in configs[:shared] if no other environment was configured" do
+      TestConfig.configure(:shared) do |config|
+        config[:foo] = 'bar'
+        config[:baz] = 'dang'
+      end
+      TestConfig.config.should == {:foo => 'bar', :baz => 'dang'}
+      TestConfig.config.should == TestConfig.configs[:shared]
+    end
+    
+    it "should return a merge of configs[:shared] and configs[RAILS_ENV]" do
+      TestConfig.configure(:shared) do |config|
+        config[:foo] = 'bar'
+        config[:baz] = 'dang'
+      end
+    end
+  end
+  
+  
+end

data/test_support/spec/lib/model_methods_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Hydra::ModelMethods do
+  
+  before :all do
+    class TestModel < ActiveFedora::Base
+      include Hydra::ModelMixins::CommonMetadata
+      include Hydra::ModelMethods
+      has_metadata :name => "properties", :type => Hydra::Datastream::Properties
+    end
+  end
+
+  describe "apply_depositor_metadata" do
+    subject {TestModel.new }
+    it "should add edit access" do
+      subject.apply_depositor_metadata('naomi')
+      subject.rightsMetadata.individuals.should == {'naomi' => 'edit'}
+    end
+    it "should not overwrite people with edit access" do
+      subject.rightsMetadata.permissions({:person=>"jessie"}, 'edit')
+      subject.apply_depositor_metadata('naomi')
+      subject.rightsMetadata.individuals.should == {'naomi' => 'edit', 'jessie' =>'edit'}
+    end
+    it "should set depositor" do
+      subject.apply_depositor_metadata('chris')
+      subject.properties.depositor.should == ['chris']
+    end
+  end
+end

data/test_support/spec/models/generic_content_spec.rb

@@ -2,6 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require "active_fedora"
 
 describe GenericContent do
+  before :all do
+    @behavior = GenericContent.deprecation_behavior
+    @h_behavior = Hydra::GenericContent.deprecation_behavior
+    GenericContent.deprecation_behavior = :silence
+    Hydra::GenericContent.deprecation_behavior = :silence
+  end
+
+  after :all do
+    GenericContent.deprecation_behavior = @behavior
+    Hydra::GenericContent.deprecation_behavior = @h_behavior
+  end
   
   before(:each) do
     @hydra_content = GenericContent.new

data/test_support/spec/models/generic_image_spec.rb

@@ -4,6 +4,21 @@ require "active_fedora"
 describe GenericImage do
   
   subject { GenericImage.new(:pid=>'test:pid')}
+
+  before :all do
+    @behavior = GenericImage.deprecation_behavior
+    @h_behavior = Hydra::GenericImage.deprecation_behavior
+    @hc_behavior = Hydra::GenericContent.deprecation_behavior
+    GenericImage.deprecation_behavior = :silence
+    Hydra::GenericImage.deprecation_behavior = :silence
+    Hydra::GenericContent.deprecation_behavior = :silence
+  end
+
+  after :all do
+    GenericImage.deprecation_behavior = @behavior
+    Hydra::GenericImage.deprecation_behavior = @h_behavior 
+    Hydra::GenericContent.deprecation_behavior = @hc_behavior
+  end
   
   it "Should be a kind of ActiveFedora::Base" do
     subject.should be_kind_of(ActiveFedora::Base)

data/test_support/spec/models/user_spec.rb

@@ -3,18 +3,43 @@ require "active_fedora"
 
 describe User do
 
+  describe "user_key" do
+    before do
+      @user = User.new(:email=>"foo@example.com")
+      @user.stubs(:username =>'foo')
+    end
+
+    it "should return email" do
+      @user.user_key.should == 'foo@example.com'
+    end
+
+    it "should return username" do
+      Devise.stubs(:authentication_keys =>[:username])
+      @user.user_key.should == 'foo'
+    end
+
+  end
+
   describe "superuser" do
     before(:all) do
+      Superuser.delete_all
       @orig_deprecation_behavior = Hydra::SuperuserAttributes.deprecation_behavior
       Hydra::SuperuserAttributes.deprecation_behavior = :silence
+
+      @orig_su_deprecation_behavior = Superuser.deprecation_behavior
+      Superuser.deprecation_behavior = :silence
     end
     after(:all) do
       Hydra::SuperuserAttributes.deprecation_behavior = @orig_deprecation_behavior
+      Superuser.deprecation_behavior = @orig_su_deprecation_behavior
     end
 
     before(:each) do
       @user = User.create(:email=> "testuser@example.com", :password=> "password", :password_confirmation => "password")
     end
+    after(:each) do
+      @user.delete
+    end
     it "should know if a user can be a superuser" do
       superuser = Superuser.new()
       superuser.id = 20

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -125,13 +125,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: hydra-mods
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hydra-access-controls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +227,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -219,7 +235,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -424,22 +440,11 @@ files:
 - app/helpers/javascript_includes_helper.rb
 - app/helpers/personalization_helper.rb
 - app/helpers/release_process_helper.rb
-- app/models/ability.rb
-- app/models/common_metadata_asset.rb
 - app/models/file_asset.rb
 - app/models/generic_content.rb
 - app/models/generic_image.rb
-- app/models/hydra/ability.rb
-- app/models/hydra/datastream/common_mods_index_methods.rb
-- app/models/hydra/datastream/mods_article.rb
-- app/models/hydra/datastream/mods_dataset.rb
-- app/models/hydra/datastream/mods_generic_content.rb
-- app/models/hydra/datastream/mods_image.rb
 - app/models/hydra/datastream/properties.rb
-- app/models/hydra/datastream/rights_metadata.rb
-- app/models/hydra/role_mapper_behavior.rb
 - app/models/mods_asset.rb
-- app/models/role_mapper.rb
 - app/models/superuser.rb
 - app/models/user_attribute.rb
 - app/models/uses_default_partials.rb
@@ -529,6 +534,7 @@ files:
 - app/views/user_sessions/logged_out.html.erb
 - config/fedora.yml
 - config/jetty.yml
+- config/locales/hydra.en.yml
 - config/role_map_cucumber.yml
 - config/role_map_development.yml
 - config/role_map_production.yml
@@ -570,28 +576,27 @@ files:
 - lib/hydra-head/routes.rb
 - lib/hydra-head/version.rb
 - lib/hydra.rb
-- lib/hydra/access_controls_enforcement.rb
-- lib/hydra/access_controls_evaluation.rb
 - lib/hydra/assets.rb
 - lib/hydra/assets_controller_helper.rb
 - lib/hydra/catalog.rb
-- lib/hydra/common_mods_index_methods.rb
 - lib/hydra/controller.rb
+- lib/hydra/controller/assets_controller_behavior.rb
+- lib/hydra/controller/catalog_controller_behavior.rb
+- lib/hydra/controller/controller_behavior.rb
+- lib/hydra/controller/file_assets_behavior.rb
+- lib/hydra/controller/repository_controller_behavior.rb
+- lib/hydra/controller/upload_behavior.rb
 - lib/hydra/file_assets.rb
 - lib/hydra/file_assets_helper.rb
 - lib/hydra/generic_content.rb
 - lib/hydra/generic_image.rb
 - lib/hydra/generic_user_attributes.rb
+- lib/hydra/global_configurable.rb
 - lib/hydra/model_methods.rb
 - lib/hydra/model_mixins.rb
 - lib/hydra/model_mixins/common_metadata.rb
-- lib/hydra/model_mixins/mods_object.rb
-- lib/hydra/model_mixins/rights_metadata.rb
+- lib/hydra/model_mixins/solr_document_extension.rb
 - lib/hydra/models/file_asset.rb
-- lib/hydra/mods_article.rb
-- lib/hydra/mods_dataset.rb
-- lib/hydra/mods_generic_content.rb
-- lib/hydra/mods_image.rb
 - lib/hydra/repository_controller.rb
 - lib/hydra/rights_metadata.rb
 - lib/hydra/submission_workflow.rb
@@ -607,7 +612,6 @@ files:
 - lib/railties/hydra-fixtures.rake
 - lib/railties/hydra_jetty.rake
 - lib/user_attributes_loader.rb
-- lib/uva/mods_index_methods.rb
 - solr/conf/schema.xml
 - solr/conf/solrconfig.xml
 - solr/solr.xml
@@ -623,6 +627,7 @@ files:
 - tasks/solrizer-fedora.rake
 - tasks/solrizer.rake
 - test_support/etc/Gemfile
+- test_support/etc/common_metadata_asset.rb
 - test_support/features/absent_model_edit.feature
 - test_support/features/absent_model_search_result.feature
 - test_support/features/absent_model_show.feature
@@ -716,15 +721,13 @@ files:
 - test_support/spec/helpers/javascript_includes_helper_spec.rb
 - test_support/spec/integration/file_asset_spec.rb
 - test_support/spec/lib/catalog_spec.rb
-- test_support/spec/lib/common_mods_index_methods_spec.rb
+- test_support/spec/lib/global_configurable_spec.rb
 - test_support/spec/lib/hydra_submission_workflow_spec.rb
-- test_support/spec/models/ability_spec.rb
+- test_support/spec/lib/model_methods_spec.rb
 - test_support/spec/models/file_asset_spec.rb
 - test_support/spec/models/generic_content_spec.rb
 - test_support/spec/models/generic_image_spec.rb
-- test_support/spec/models/hydra_rights_metadata_spec.rb
 - test_support/spec/models/mods_asset_spec.rb
-- test_support/spec/models/role_mapper_spec.rb
 - test_support/spec/models/user_spec.rb
 - test_support/spec/rcov.opts
 - test_support/spec/spec.opts
@@ -733,7 +736,6 @@ files:
 - test_support/spec/support/matchers/solr_matchers.rb
 - test_support/spec/unit/hydra-head-engine_spec.rb
 - test_support/spec/unit/hydra-head_spec.rb
-- test_support/spec/unit/rights_metadata_spec.rb
 - tmp/.placeholder
 homepage: http://projecthydra.org
 licenses: []