hydra-core 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3786d515271e29c2bcf01e9be0e267986c99a0
-  data.tar.gz: 2d3301d339b4de9f69e90f66e8e546501776814a
+  metadata.gz: 27d360e48d308028e629a192bff49030c4531963
+  data.tar.gz: 2792914261dbf079ce249d0ee442cb6dd2a5c1e8
 SHA512:
-  metadata.gz: 97389da6bd0a5e3717a3799ae551943c8fb0cc914f0fc5308cdba8e8e4515be58f222a66e47387a47621d4280770f57bc65da236d2933f41dd6a364813d65d53
-  data.tar.gz: 2453360ba72924d2e9aab977cd81c89d35944c9a5c47dc41e4af0231dba8db99b5d265e121f87e3ef92fae6bf04c72660ada3589debbae279521f5e51cae289c
+  metadata.gz: fdd6ca02a1bf8203154ab9a8e43316dcb5adcfb85c92a82cc4b8b29a6acd4b4d4cccaf8cc99a43e42d2956ede4e4dbf45ca7a526dccc4ddbef9f419783c3b72e
+  data.tar.gz: 2dd1d1e4d4d03ada5a302047dfe1e37ee401ed986493fd5b0092b5351e9923907f2e5f83e0c4291b505d10b21065930c1dae97305215b9002c628de6278c1a3d

data/app/controllers/concerns/hydra/controller/download_behavior.rb

@@ -11,8 +11,12 @@ module Hydra
       # Responds to http requests to show the datastream
       def show
         if can_download?
-          # we can now examine asset and determine if we should send_content, or some other action.
-          send_content (asset)
+          if datastream.new?
+            render_404
+          else
+            # we can now examine asset and determine if we should send_content, or some other action.
+            send_content (asset)
+          end
         else 
           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])
@@ -21,6 +25,13 @@ module Hydra
 
       protected
 
+      def render_404
+        respond_to do |format|
+          format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found }
+          format.any  { head :not_found }
+        end
+      end
+
       # Override this method if asset PID is not passed in params[:id],
       # for example, in a nested resource.
       def asset_param_key
@@ -55,7 +66,7 @@ module Hydra
       # Loads the datastream specified by the HTTP parameter `:datastream_id`. 
       # If this object does not have a datastream by that name, return the default datastream
       # as returned by {#default_content_ds}
-      # @return [ActiveFedora::Datastream] the datastr
+      # @return [ActiveFedora::Datastream] the datastream
       def datastream_to_show
         ds = asset.datastreams[params[:datastream_id]] if params.has_key?(:datastream_id)
         ds = default_content_ds if ds.nil?

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.4.0"
+  VERSION = "6.4.1"
 end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -15,9 +15,12 @@ describe DownloadsController do
 
   describe "with a file" do
     before do
+      class ContentHolder < ActiveFedora::Base
+        include Hydra::AccessControls::Permissions
+        has_file_datastream 'thumbnail'
+      end
       @user = User.new.tap {|u| u.email = 'email@example.com'; u.password = 'password'; u.save}
-      @obj = ActiveFedora::Base.new
-      @obj = ModsAsset.new
+      @obj = ContentHolder.new
       @obj.label = "world.png"
       @obj.add_file_datastream('fizz', :dsid=>'buzz', :mimeType => 'image/png')
       @obj.add_file_datastream('foobarfoobarfoobar', :dsid=>'content', :mimeType => 'image/png')
@@ -27,6 +30,7 @@ describe DownloadsController do
     end
     after do
       @obj.destroy
+      Object.send(:remove_const, :ContentHolder)
     end 
     describe "when logged in as reader" do
       before do
@@ -35,7 +39,7 @@ describe DownloadsController do
       end
       describe "show" do
         it "should default to returning default download configured by object" do
-          ModsAsset.stub(:default_content_ds).and_return('buzz')
+          ContentHolder.stub(:default_content_ds).and_return('buzz')
           get "show", :id => @obj.pid
           response.should be_success
           response.headers['Content-Type'].should == "image/png"
@@ -50,12 +54,23 @@ describe DownloadsController do
           response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
           response.body.should == 'foobarfoobarfoobar'
         end
-        it "should return requested datastreams" do
-          get "show", :id => @obj.pid, :datastream_id => "descMetadata"
-          response.should be_success
-          response.headers['Content-Type'].should == "text/plain"
-          response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
-          response.body.should == "It's a stream"
+
+        context "when a specific datastream is requested" do
+          context "and it doesn't exist" do
+            it "should return :not_found when the datastream doesn't exist" do
+              get "show", :id => @obj.pid, :datastream_id => "thumbnail"
+              response.should be_not_found
+            end
+          end
+          context "and it exists" do
+            it "should return it" do
+              get "show", :id => @obj.pid, :datastream_id => "descMetadata"
+              response.should be_success
+              response.headers['Content-Type'].should == "text/plain"
+              response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
+              response.body.should == "It's a stream"
+            end
+          end
         end
         it "should support setting disposition to inline" do
           get "show", :id => @obj.pid, :disposition => "inline"
@@ -83,6 +98,7 @@ describe DownloadsController do
           stub_ds.stub(:mimeType).and_return('video/webm')
           stub_ds.stub(:dsSize).and_return(16)
           stub_ds.stub(:dsid).and_return('webm')
+          stub_ds.stub(:new?).and_return(false)
           stub_ds.stub(:pid).and_return('changeme:test')
           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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 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-10-17 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)