hydra-core 5.0.0.pre15 → 5.0.0.rc1

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -2,10 +2,6 @@ module Hydra
   module BlacklightHelperBehavior
     include Blacklight::BlacklightHelperBehavior
     
-    def document_partial_path_templates
-      ["%2$s/%1$s"] + super
-    end
-
     # Given a Fedora uri, generate a reasonable partial name
     def document_partial_name(document)
       display_type = document[blacklight_config.show.display_type]

data/hydra-core.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "rails", '~>3.2.3' 
-  gem.add_dependency "blacklight", '~> 4.0.0.rc1'  
+  gem.add_dependency "blacklight", '~> 4.0.0'  
   gem.add_dependency "devise"
-  gem.add_dependency "active-fedora", '~> 5.0.0.rc5'
+  gem.add_dependency "active-fedora", '~> 5.0.0'
   gem.add_dependency 'RedCloth', '=4.2.9'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'sanitize'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.pre15"
+  VERSION = "5.0.0.rc1"
 end
 

data/lib/hydra/controller/controller_behavior.rb

@@ -14,7 +14,6 @@ module Hydra::Controller::ControllerBehavior
   included do
     # Other modules to auto-include
     include Hydra::AccessControlsEnforcement
-    include Hydra::Controller::RepositoryControllerBehavior
   
     # Catch permission errors
     rescue_from Hydra::AccessDenied do |exception|

data/lib/hydra/controller/repository_controller_behavior.rb

@@ -1,6 +1,8 @@
 # Hydra::RepositoryContollerBehavior is a controller layer mixin. It is in the controller scope: request params, session etc.
 #
 module Hydra::Controller::RepositoryControllerBehavior
+  extend Deprecation 
+  self.deprecation_horizon = "hydra-access-controls 6.0"
   
   # TODO, move these to a helper file.
   def self.included(c)
@@ -14,20 +16,24 @@ module Hydra::Controller::RepositoryControllerBehavior
   #
   # This method converts pid strings into xhtml safe IDs, since xhmlt expects namespaces to be defined. 
   # I.E. hydrus:123 = hydrus_123
+  # @deprecated
   def format_pid(pid)
     pid.gsub(":", "_")
   end
+  deprecation_deprecate :format_pid
   
   
-  
+  # @deprecated
   def solr_name(field_name, field_type = :text)
     ::ActiveFedora::SolrService.solr_name(field_name, field_type)
   end
+  deprecation_deprecate :solr_name
   
   
   # Returns a list of datastreams for download.
   # Uses user's roles and "mime_type" value in submitted params to decide what to return.
   # if you pass the optional argument of :canonical=>true, it will return the canonical datastream for this object (a single object not a hash of datastreams)
+  # @deprecated
   def downloadables(fedora_object=@fedora_object, opts={})
     if opts[:canonical]
       mime_type = opts[:mime_type] ? opts[:mime_type] : "application/pdf"
@@ -57,14 +63,20 @@ module Hydra::Controller::RepositoryControllerBehavior
     # puts "downloadables result: #{result}"
     return result    
   end
+  deprecation_deprecate :downloadables
 
   protected 
+
+  # @deprecated
   def load_document
     @document = ActiveFedora::Base.find(params[:id], :cast=>true)
   end
+  deprecation_deprecate :load_document
 
   private
   
+
+  # @deprecated
   def filter_datastreams_for_mime_type(datastreams_hash, mime_type)
     result = Hash[]
     datastreams_hash.each_pair do |dsid,ds|

data/lib/hydra/model_methods.rb

@@ -11,10 +11,13 @@ module Hydra::ModelMethods
   #
   # Adds metadata about the depositor to the asset
   # Most important behavior: if the asset has a rightsMetadata datastream, this method will add +depositor_id+ to its individual edit permissions.
+  # @param [String, #user_key] depositor
   #
-  def apply_depositor_metadata(depositor_id)
+  def apply_depositor_metadata(depositor)
     prop_ds = self.datastreams["properties"]
     rights_ds = self.datastreams["rightsMetadata"]
+    
+    depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
   
     if prop_ds 
       prop_ds.depositor = depositor_id unless prop_ds.nil?

data/spec/controllers/catalog_valid_html_spec.rb

@@ -53,48 +53,22 @@ describe CatalogController do
         sign_in mock_user
     end
     
-    #Article Data Type
-    it "Should have valid html when in Article Edit Show" do
-      controller.session[:viewing_context] = "edit"
-      get(:show, {:id=>"hydrangea:fixture_mods_article1"}, :action=>"edit")
-      document_check(response.body)
-    end
-    
     it "Should have valid html when in Article Browse Show" do 
-       
-       controller.session[:viewing_context] = "browse"
-       get(:show, {:id=>"hydrangea:fixture_mods_article1"}, :action=>"browse")
+       get(:show, {:id=>"hydrangea:fixture_mods_article1"})
        document_check(response.body)
     end
     
-    #Data Set Data Type
-    it "Should have valid html when in Dataset Edit Show" do
-      controller.session[:viewing_context] = "edit"
-      get(:show, {:id=>"hydrangea:fixture_mods_dataset1"}, :action=>"edit")
+    it "Should have valid html when in Dataset Browse Show" do 
+      get(:show, {:id=>"hydrangea:fixture_mods_dataset1"})
       document_check(response.body)
     end
     
     it "Should have valid html when in Dataset Browse Show" do 
-       controller.session[:viewing_context] = "browse"
-       get(:show, {:id=>"hydrangea:fixture_mods_dataset1"}, :action=>"browse")
-       document_check(response.body)
+      get(:show, {:id=>"hydrus:admin_class1"})
+      File.open('/tmp/out.xml', 'w') { |f| f << response.body }
+      document_check(response.body)
     end
     
-    #APO datatype hydrus:admin_class1
-     it "Should have valid html when in Dataset Edit Show" do
-        controller.session[:viewing_context] = "edit"
-        get(:show, {:id=>"hydrus:admin_class1"}, :action=>"edit")
-        document_check(response.body)
-      end
-
-      it "Should have valid html when in Dataset Browse Show" do 
-         controller.session[:viewing_context] = "browse"
-         get(:show, {:id=>"hydrus:admin_class1"}, :action=>"browse")
-        File.open('/tmp/out.xml', 'w') { |f| f << response.body }
-        document_check(response.body)
-            
-      end
-    
     # The delete view should be the same for all data types
     it "Should have valid html when in Dataset Delete" do 
        get(:show, {:id=>"hydrangea:fixture_mods_dataset1"}, :action=>"delete")

data/spec/lib/model_methods_spec.rb

@@ -25,5 +25,10 @@ describe Hydra::ModelMethods do
       subject.apply_depositor_metadata('chris')
       subject.properties.depositor.should == ['chris']
     end
+    it "should accept objects that respond_to? :user_key" do
+      stub_user = stub(:user, :user_key=>'monty')
+      subject.apply_depositor_metadata(stub_user)
+      subject.properties.depositor.should == ['monty']
+    end
   end
 end

data/spec/lib/repository_controller_behavior_spec.rb

@@ -11,6 +11,7 @@ describe Hydra::Controller::RepositoryControllerBehavior do
   
   describe "load_document" do
     it "should load the model for the pid" do
+      Deprecation.stub(:warn)
       mock_model = mock("model")
       subject.stub(:params).and_return( {:id => "object id"} )
       ActiveFedora::Base.should_receive(:find).with("object id", :cast=>true).and_return(mock_model)
@@ -20,6 +21,7 @@ describe Hydra::Controller::RepositoryControllerBehavior do
   
   describe "format_pid" do
     it "convert pids into XHTML safe strings" do 
+     Deprecation.stub(:warn)
      pid = subject.format_pid("hydra:123")
      pid.should match(/hydra_123/)   
     end 

data/tasks/rspec.rake

@@ -1,12 +1,11 @@
 ENV["RAILS_ROOT"] ||= 'spec/internal'
-require 'rspec/core/rake_task'
-
 
 desc "Run specs"
 task :spec => [:generate, :fixtures] do |t|
   Bundler.with_clean_env do
     within_test_app do
       system "rake myspec"
+      abort "Error running hydra-core" unless $?.success?
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre15
+  version: 5.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc5
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc5
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre15
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre15
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement