hydra-core 6.3.4 → 6.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8106466b12a6f1dba6af3166196978901845be03
-  data.tar.gz: ad73413b369fea0f7f49f4905d99f3dc940bfada
+  metadata.gz: b2138b3738292db81150e74f4873486da132a065
+  data.tar.gz: 1493d7514bd788955066095b7b836afba12e9467
 SHA512:
-  metadata.gz: da415a6c990c4feb67c452b9dc09265f0635f4f7130233eca0717727f18e6ccdfeefc3ad6c1f217aefaefbda94498c07d1c5beaa8dde53030758fdbc5a8c8fa4
-  data.tar.gz: d5af7016ec5f63d9619f0938255d4bfb03b02477c4661de3595585030909eee3f518a91fbc4e1e822b6b17144eda54280b965fa3fc8051296e02c9c841a8c965
+  metadata.gz: ab203db4e2d63aa4e0c82bcd347685490f9575fe67ab50e291829f65a3c88f2e630401cb3c4b23b0a0e1aa4dd8bcd05dbaea69615b643a4829c7e27e234b8750
+  data.tar.gz: 6735a3ed38c61fdb294f8d3a780b4da2f39d5548981fd31fa8ae9d034d55df1626e694bde5f45d628321b283d15a3b19971b0fe4bd1d80d7d41baeba37241364

data/app/models/mods_asset.rb

@@ -1,4 +1,3 @@
-require 'hydra'
 # An EXAMPLE   Basic Model for Assets that conform to Hydra commonMetadata cModel and have basic MODS metadata (currently "Article" is the MODS exemplar)
 class ModsAsset < ActiveFedora::Base
   

data/lib/generators/hydra/templates/ability.rb

@@ -1,9 +1,8 @@
 class Ability
-  include Hydra::Ability 
+  include Hydra::Ability
   
-  # Define any customized permissions here.  Some commented examples are included below.
+  # Define any customized permissions here.
   def custom_permissions
-
     # Limits deleting objects to a the admin user
     #
     # if current_user.admin?
@@ -15,7 +14,5 @@ class Ability
     # if user_groups.include? 'special_group'
     #   can [:create], ActiveFedora::Base
     # end
-
   end
-
 end

data/lib/hydra-core.rb

@@ -1,4 +1,20 @@
-require 'hydra'
+require 'hydra-access-controls'
+
+module Hydra
+  extend ActiveSupport::Autoload
+  autoload :GlobalConfigurable
+  extend GlobalConfigurable
+  autoload :Controller
+  autoload :ModelMethods
+  autoload :RepositoryController
+  autoload :Solr
+  module ModelMixins
+    # ModelMixins already loaded by hydra-access-controls
+    autoload :CommonMetadata
+    autoload :SolrDocumentExtension
+  end
+  autoload :Models
+end
 
 module HydraHead 
   require 'hydra-head/engine' if defined?(Rails)

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.3.4"
+  VERSION = "6.4.0.pre1"
 end
 

data/lib/hydra/controller/download_behavior.rb

@@ -14,15 +14,21 @@ module Hydra
           # we can now examine asset and determine if we should send_content, or some other action.
           send_content (asset)
         else 
-          logger.info "Can not read #{params['id']}"
-          raise Hydra::AccessDenied.new("You do not have sufficient access privileges to read this document, which has been marked private.", :read, params[:id])
+          logger.info "Can not read #{params[asset_param_key]}"
+          raise Hydra::AccessDenied.new("You do not have sufficient access privileges to read this document, which has been marked private.", :read, params[asset_param_key])
         end
       end
 
       protected
 
+      # Override this method if asset PID is not passed in params[:id],
+      # for example, in a nested resource.
+      def asset_param_key
+        :id
+      end
+
       def load_asset
-        @asset = ActiveFedora::Base.load_instance_from_solr(params[:id])
+        @asset = ActiveFedora::Base.load_instance_from_solr(params[asset_param_key])
       end
 
       def load_datastream

data/lib/railties/hydra-fixtures.rake

@@ -7,7 +7,6 @@ namespace :hydra do
 
   desc "Load hydra-head models"
   task :load_models do
-    require "hydra"
     Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), "..",'app','models', '*.rb')).each do |model|
       load model
     end

data/spec/controllers/downloads_controller_spec.rb

@@ -74,9 +74,9 @@ describe DownloadsController do
       end
       describe "stream" do
         before do
-          stub_response = stub()
+          stub_response = double()
           stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
-          stub_repo = stub()
+          stub_repo = double()
           stub_repo.stub(:datastream_dissemination).and_yield(stub_response)
           stub_ds = ActiveFedora::Datastream.new
           stub_ds.stub(:repository).and_return(stub_repo)
@@ -84,7 +84,7 @@ describe DownloadsController do
           stub_ds.stub(:dsSize).and_return(16)
           stub_ds.stub(:dsid).and_return('webm')
           stub_ds.stub(:pid).and_return('changeme:test')
-          stub_file = stub('stub object', datastreams: {'webm' => stub_ds}, pid:'changeme:test', label: "MyVideo.webm")
+          stub_file = double('stub object', datastreams: {'webm' => stub_ds}, pid:'changeme:test', label: "MyVideo.webm")
           ActiveFedora::Base.should_receive(:load_instance_from_solr).with('changeme:test').and_return(stub_file)
           controller.stub(:can?).with(:read, 'changeme:test').and_return(true)
           controller.stub(:log_download)
@@ -139,5 +139,22 @@ describe DownloadsController do
         end
       end
     end
+
+    describe "overriding the default asset param key" do
+      before do
+        Rails.application.routes.draw do
+          scope 'objects/:object_id' do
+            get 'download' => 'downloads#show'
+          end
+        end
+        sign_in @user
+      end
+      it "should use the custom param value to retrieve the asset" do
+        controller.stub(:asset_param_key).and_return(:object_id)
+        get "show", :object_id => @obj.pid
+        response.should be_successful
+      end
+    end
+
   end
 end

data/spec/helpers/upload_behavior_spec.rb

@@ -8,28 +8,28 @@ describe Hydra::Controller::UploadBehavior do
 
   describe "add_posted_blob_to_asset" do
     it "should set object title and label, relying on datastream_id to set dsId" do
-      mock_file = mock("File")
+      mock_file = double("File")
       file_name = "Posted Filename.foo"
       helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
-      mock_fa = mock("file asset")
+      mock_fa = double("file asset")
       helper.stub(:datastream_id).and_return('bar')
       mock_fa.should_receive(:add_file).with(mock_file, 'bar', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name) # this is the deprecated 2 argument method
     end
     
     it "should support submissions from swfupload" do
-      mock_file = mock("File")
+      mock_file = double("File")
       file_name = "Posted Filename.foo"
       helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
-      mock_fa = mock("file asset")
+      mock_fa = double("file asset")
       mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name)
     end
     it "should support submissions from single-file uploader, defaulting to dsId of content" do
-      mock_file = mock("File")
+      mock_file = double("File")
       file_name = "Posted Filename.foo"
       helper.stub(:params).and_return( :Filedata=>[mock_file], :container_id=>"hydrangea:2973" )      
-      mock_fa = mock("file asset")
+      mock_fa = double("file asset")
       mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name)
     end

data/spec/lib/model_methods_spec.rb

@@ -27,7 +27,7 @@ describe Hydra::ModelMethods do
       subject.properties.depositor.should == ['chris']
     end
     it "should accept objects that respond_to? :user_key" do
-      stub_user = stub(:user, :user_key=>'monty')
+      stub_user = double(:user, :user_key=>'monty')
       subject.apply_depositor_metadata(stub_user)
       subject.properties.depositor.should == ['monty']
     end
@@ -39,7 +39,7 @@ describe Hydra::ModelMethods do
       mock_file = "File contents"
       subject.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
       subject.should_receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
-      MIME::Types.should_receive(:of).with(file_name).and_return([stub(:content_type=>"mymimetype")])
+      MIME::Types.should_receive(:of).with(file_name).and_return([double(:content_type=>"mymimetype")])
       subject.add_file(mock_file, 'bar', file_name)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.3.4
+  version: 6.4.0.pre1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.4
+        version: 6.4.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.4
+        version: 6.4.0.pre1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,6 @@ files:
 - lib/hydra-head/engine.rb
 - lib/hydra-head/routes.rb
 - lib/hydra-head/version.rb
-- lib/hydra.rb
 - lib/hydra/controller.rb
 - lib/hydra/controller/controller_behavior.rb
 - lib/hydra/controller/download_behavior.rb
@@ -276,9 +275,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.5

data/lib/hydra.rb

@@ -1,17 +0,0 @@
-require 'hydra-access-controls'
-
-module Hydra
-  extend ActiveSupport::Autoload
-  autoload :GlobalConfigurable
-  extend GlobalConfigurable
-  autoload :Controller
-  autoload :ModelMethods
-  autoload :RepositoryController
-  autoload :Solr
-  module ModelMixins
-    # ModelMixins already loaded by hydra-access-controls
-    autoload :CommonMetadata
-    autoload :SolrDocumentExtension
-  end
-  autoload :Models
-end