hydra-core 8.2.0 → 9.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9149fd7d024bdce7772151bc109c99c4b5d32108
-  data.tar.gz: f00f9eacaf3fe941bbb5a136cb73c6496ab25109
+  metadata.gz: e233f2087f4d4d190c24ffe41bfd5915ac668bf7
+  data.tar.gz: 0d257fe1e9583e99e60df8d863bb30e9eba9f7c2
 SHA512:
-  metadata.gz: 27c8e9be8cca17069ff6770d885ae4bd93879cd8a8cff3c5d57d677101edffa52ff8d5fc1e76d5cb95293a3261ca6fdac26a4c4e643f8935ad21e44e9dfadea2
-  data.tar.gz: 15c49fd63d8820d7bce149d261c891e1bc6e16db2e1a1d8b49a5b1421fa14f009a5d5da19391837ea10324c929e97a511172626507653f0cb1381ccda602e13a
+  metadata.gz: 0a0843e0f816379e1da9da3e6af2c07855cbddf7310c42d63fdf45fc1f06940e8585f1a349287b974591249503a1aa5389782f8a850d6b32898a05f838c3a707
+  data.tar.gz: 39f081771adf23e600202ad12c4550a08ea0d7df4d8da6cc50e779bcdec2e4d7806261938258b02f0a4602402b6019105131df4d1953bab2affbb77a6e410b67

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

@@ -12,6 +12,9 @@ module Hydra::Controller::ControllerBehavior
   extend ActiveSupport::Concern
 
   included do
+    # Other modules to auto-include
+    include Hydra::AccessControlsEnforcement
+  
     # Catch permission errors
     rescue_from CanCan::AccessDenied do |exception|
       if (exception.action == :edit)
@@ -24,11 +27,7 @@ module Hydra::Controller::ControllerBehavior
       end
     end
   end
-
-  # Override blacklight to produce a search_builder that has the current collection in context
-  def search_builder processor_chain = search_params_logic
-    super.tap { |builder| builder.current_ability = current_ability }
-  end  
+  
   
   # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
   # defaults to using whatever you have set as the Devise authentication_key
@@ -39,7 +38,7 @@ module Hydra::Controller::ControllerBehavior
   module ClassMethods
     # get the solr name for a field with this name and using the given solrizer descriptor
     def solr_name(name, *opts)
-      ActiveFedora::SolrService.solr_name(name, *opts)
+      ActiveFedora::SolrQueryBuilder.solr_name(name, *opts)
     end
   end
 end

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

@@ -5,14 +5,12 @@ module Hydra
 
       included do
         include Hydra::Controller::ControllerBehavior
-        before_filter :load_asset
-        before_filter :load_datastream
         before_filter :authorize_download!
       end
-      
+
       # Responds to http requests to show the datastream
       def show
-        if datastream.new?
+        if datastream.new_record?
           render_404
         else
           send_content
@@ -34,41 +32,34 @@ module Hydra
         :id
       end
 
-      def load_asset
-        @asset = ActiveFedora::Base.load_instance_from_solr(params[asset_param_key])
-      end
-
-      def load_datastream
-        @ds = datastream_to_show
-      end
-
       # Customize the :download ability in your Ability class, or override this method
       def authorize_download!
         authorize! :download, datastream
       end
 
       def asset
-        @asset
+        @asset ||= ActiveFedora::Base.find(params[asset_param_key])
       end
 
       def datastream
-        @ds
+        @ds ||= datastream_to_show
       end
 
       # Override this method to change which datastream is shown.
-      # Loads the datastream specified by the HTTP parameter `:datastream_id`. 
+      # Loads the file 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 datastream
+      # @return [ActiveFedora::File] the file
       def datastream_to_show
-        ds = asset.datastreams[params[:datastream_id]] if params.has_key?(:datastream_id)
-        ds = default_content_ds if ds.nil?
+        ds = asset.attached_files[params[:datastream_id]] if params.has_key?(:datastream_id)
+        ds ||= default_content_ds
         raise "Unable to find a datastream for #{asset}" if ds.nil?
         ds
       end
-      
+
       # Handle the HTTP show request
       def send_content
+
         response.headers['Accept-Ranges'] = 'bytes'
 
         if request.head?
@@ -82,60 +73,67 @@ module Hydra
 
       # Create some headers for the datastream
       def content_options
-        {disposition: 'inline', type: datastream.mimeType, filename: datastream_name}
+        {disposition: 'inline', type: datastream.mime_type, filename: datastream_name}
       end
 
       # Override this if you'd like a different filename
       # @return [String] the filename
       def datastream_name
-        params[:filename] || asset.label
+        params[:filename] || datastream.original_name || (asset.respond_to?(:label) && asset.label) || datastream.id
       end
 
 
       # render an HTTP HEAD response
       def content_head
-        response.headers['Content-Length'] = datastream.dsSize
-        response.headers['Content-Type'] = datastream.mimeType
+        response.headers['Content-Length'] = datastream.size
+        response.headers['Content-Type'] = datastream.mime_type
         head :ok
       end
-      
+
 
       # render an HTTP Range response
       def send_range
         _, range = request.headers['HTTP_RANGE'].split('bytes=')
         from, to = range.split('-').map(&:to_i)
-        to = datastream.dsSize - 1 unless to
+        to = datastream.size - 1 unless to
         length = to - from + 1
-        response.headers['Content-Range'] = "bytes #{from}-#{to}/#{datastream.dsSize}"
+        response.headers['Content-Range'] = "bytes #{from}-#{to}/#{datastream.size}"
         response.headers['Content-Length'] = "#{length}"
         self.status = 206
         prepare_file_headers
-        self.response_body = datastream.stream(from, length)
+        datastream.stream(request.headers['HTTP_RANGE']) do |block|
+          response.stream.write block
+        end
+      ensure
+        response.stream.close
       end
 
       def send_file_contents
         self.status = 200
         prepare_file_headers
-        self.response_body = datastream.stream
+        datastream.stream do |block|
+          response.stream.write block
+        end
+      ensure
+        response.stream.close
       end
-      
+
       def prepare_file_headers
         send_file_headers! content_options
-        response.headers['Content-Type'] = datastream.mimeType
-        self.content_type = datastream.mimeType
+        response.headers['Content-Type'] = datastream.mime_type
+        self.content_type = datastream.mime_type
       end
 
-      private 
-      
+      private
+
       def default_content_ds
-        ActiveFedora::ContentModel.known_models_for(asset).each do |model_class|
-          return asset.datastreams[model_class.default_content_ds] if model_class.respond_to?(:default_content_ds)
-        end
-        if asset.datastreams.keys.include?(DownloadsController.default_content_dsid)
-          return asset.datastreams[DownloadsController.default_content_dsid]
+        if asset.class.respond_to?(:default_content_ds)
+          asset.attached_files[asset.class.default_content_ds]
+        elsif asset.attached_files.key?(DownloadsController.default_content_dsid)
+          asset.attached_files[DownloadsController.default_content_dsid]
         end
       end
-      
+
       module ClassMethods
         def default_content_dsid
           "content"

data/app/models/concerns/hydra/model_methods.rb

@@ -1,39 +1,40 @@
+require 'mime/types'
+
 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)
-    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?
+
+    if respond_to? :depositor
+      self.depositor = depositor_id
     end
-    rights_ds.permissions({:person=>depositor_id}, 'edit') unless rights_ds.nil?
+    self.edit_users += [depositor_id]
     return true
   end
 
-  # Puts the contents of file (posted blob) into a datastream and sets the title and label 
+  # Puts the contents of file (posted blob) into a datastream and sets the title and label
   # Sets asset label and title to filename if they're empty
   #
   # @param [#read] file the IO object that is the blob
   # @param [String] file the IO object that is the blob
-  def add_file(file, dsid, file_name)
-    mime_types = MIME::Types.of(file_name)
-    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-    options = {:label=>file_name, :mimeType=>mime_type}
+  def add_file(file, dsid, file_name, mime_type=nil)
+    mime_type ||= best_mime_for_filename(file_name)
+    options = {label: file_name, mime_type: mime_type, original_name: file_name}
     options[:dsid] = dsid if dsid
     add_file_datastream(file, options)
-    set_title_and_label( file_name, :only_if_blank=>true )
+    set_title_and_label( file_name, only_if_blank: true )
+  end
+
+  def best_mime_for_filename(file_name)
+    mime_types = MIME::Types.of(file_name)
+    mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
   end
 
 
-  
   # Set the title and label on the current object
   #
   # @param [String] new_title
@@ -52,18 +53,17 @@ module Hydra::ModelMethods
       set_title( new_title )
     end
   end
-  
+
   # Set the title and label on the current object
   #
   # @param [String] new_title
   # @param [Hash] opts (optional) hash of configuration options
   def set_title(new_title, opts={})
-    if self.datastreams.has_key?("descMetadata")
-      desc_metadata_ds = self.datastreams["descMetadata"]
-      if desc_metadata_ds.respond_to?(:title_values)
-        desc_metadata_ds.title_values = new_title
+    if attached_files.has_key?("descMetadata")
+      if descMetadata.respond_to?(:title_values)
+        descMetadata.title_values = new_title
       else
-        desc_metadata_ds.title = new_title
+        descMetadata.title = new_title
       end
     end
   end

data/hydra-core.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |gem|
   gem.version       = version
   gem.license       = "APACHE2"
 
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = '>= 1.9.3'
 
 
-  gem.add_dependency "rails", '~> 4.0'
+  gem.add_dependency "rails", '>= 3.2.3', '< 5' 
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency 'jettywrapper', "~> 1.5"
+  gem.add_dependency 'jettywrapper', ">=1.4.1"
   
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'yard'

data/lib/generators/hydra/head_generator.rb

@@ -62,8 +62,6 @@ module Hydra
 
       # Fedora & Solr YAML files
       invoke('active_fedora:config')
-
-      copy_file 'config/blacklight.yml', force: true
     end
 
     # Add Hydra behaviors to the user model

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

@@ -8,11 +8,10 @@ class CatalogController < ApplicationController
   # These before_filters apply the hydra access controls
   before_filter :enforce_show_permissions, :only=>:show
   # This applies appropriate access controls to all solr queries
-  CatalogController.search_params_logic += [:add_access_controls_to_solr_params]
+  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
 
 
   configure_blacklight do |config|
-    config.search_builder_class = Hydra::SearchBuilder
     config.default_solr_params = {
       :qt => 'search',
       :rows => 10

data/lib/generators/hydra/templates/config/initializers/hydra_config.rb

@@ -6,15 +6,15 @@ Hydra.configure do |config|
   # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
   # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
   #
-  # config.permissions.discover.group       = ActiveFedora::SolrService.solr_name("discover_access_group", :symbol)
-  # config.permissions.discover.individual  = ActiveFedora::SolrService.solr_name("discover_access_person", :symbol)
-  # config.permissions.read.group           = ActiveFedora::SolrService.solr_name("read_access_group", :symbol)
-  # config.permissions.read.individual      = ActiveFedora::SolrService.solr_name("read_access_person", :symbol)
-  # config.permissions.edit.group           = ActiveFedora::SolrService.solr_name("edit_access_group", :symbol)
-  # config.permissions.edit.individual      = ActiveFedora::SolrService.solr_name("edit_access_person", :symbol)
+  # config.permissions.discover.group       = ActiveFedora::SolrQueryBuilder.solr_name("discover_access_group", :symbol)
+  # config.permissions.discover.individual  = ActiveFedora::SolrQueryBuilder.solr_name("discover_access_person", :symbol)
+  # config.permissions.read.group           = ActiveFedora::SolrQueryBuilder.solr_name("read_access_group", :symbol)
+  # config.permissions.read.individual      = ActiveFedora::SolrQueryBuilder.solr_name("read_access_person", :symbol)
+  # config.permissions.edit.group           = ActiveFedora::SolrQueryBuilder.solr_name("edit_access_group", :symbol)
+  # config.permissions.edit.individual      = ActiveFedora::SolrQueryBuilder.solr_name("edit_access_person", :symbol)
   #
-  # config.permissions.embargo.release_date  = ActiveFedora::SolrService.solr_name("embargo_release_date", :stored_sortable, type: :date)
-  # config.permissions.lease.expiration_date = ActiveFedora::SolrService.solr_name("lease_expiration_date", :stored_sortable, type: :date)
+  # config.permissions.embargo.release_date  = ActiveFedora::SolrQueryBuilder.solr_name("embargo_release_date", :stored_sortable, type: :date)
+  # config.permissions.lease.expiration_date = ActiveFedora::SolrQueryBuilder.solr_name("lease_expiration_date", :stored_sortable, type: :date)
   #
   #
   # specify the user model

data/lib/hydra-core.rb

@@ -2,6 +2,10 @@ require 'hydra-access-controls'
 require 'deprecation'
 
 module HydraHead 
+  extend Deprecation
   require 'hydra-head/engine' if defined?(Rails)
+  def self.add_routes(router, options = {})
+    Deprecation.warn HydraHead, "add_routes has been removed." # remove this warning in hydra-head 8
+  end
 end
 

data/lib/hydra-head/version.rb

@@ -1,4 +1,3 @@
 module HydraHead
-  VERSION = "8.2.0"
+  VERSION = "9.0.0.beta1"
 end
-

data/spec/controllers/catalog_controller_spec.rb

@@ -10,14 +10,6 @@ describe CatalogController do
     expect(controller).to be_an_instance_of CatalogController
   end
 
-  describe "configuration" do
-    let(:config) { CatalogController.blacklight_config }
-    describe "search_builder_class" do
-      subject {config.search_builder_class }
-      it { is_expected.to eq Hydra::SearchBuilder }
-    end
-  end
-
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
     it "should map {:controller=>'catalog', :action=>'index'} to GET /catalog" do
@@ -56,6 +48,12 @@ describe CatalogController do
   end
 
   describe "filters" do
+    describe "index" do
+      it "should trigger enforce_index_permissions" do
+        expect(controller).to receive(:add_access_controls_to_solr_params)
+        get :index
+      end
+    end
     describe "show" do
       it "should trigger enforce_show_permissions" do
         allow(controller).to receive(:current_user).and_return(nil)

data/spec/controllers/downloads_controller_spec.rb

@@ -18,26 +18,30 @@ describe DownloadsController do
   describe "with a file" do
     before do
       class ContentHolder < ActiveFedora::Base
+        include Hydra::ModelMethods
         include Hydra::AccessControls::Permissions
-        has_file_datastream 'thumbnail'
+        contains 'thumbnail'
       end
       @user = User.new.tap {|u| u.email = 'email@example.com'; u.password = 'password'; u.save}
-      @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')
-      @obj.add_file_datastream("It's a stream", :dsid=>'descMetadata', :mimeType => 'text/plain')
-      @obj.read_users = [@user.user_key]
-      @obj.save!
     end
+    let(:obj) do
+      ContentHolder.new.tap do |obj|
+        obj.add_file_datastream('fizz', dsid: 'buzz', mime_type: 'image/png', original_name: 'buzz.png')
+        obj.add_file_datastream('foobarfoobarfoobar', dsid: 'content', mime_type: 'image/png', original_name: 'world.png')
+        obj.add_file_datastream("It's a stream", dsid: 'descMetadata', mime_type: 'text/plain', original_name: 'metadata.xml')
+        obj.read_users = [@user.user_key]
+        obj.save!
+      end
+    end
+
     after do
-      @obj.destroy
+      obj.destroy
       Object.send(:remove_const, :ContentHolder)
     end 
     context "when not logged in" do
       context "when a specific datastream is requested" do
         it "should redirect to the root path and display an error" do
-          get "show", id: @obj.pid, datastream_id: "descMetadata"
+          get :show, id: obj, datastream_id: "descMetadata"
           expect(response).to redirect_to new_user_session_path
           expect(flash[:alert]).to eq "You are not authorized to access this page."
         end
@@ -50,7 +54,7 @@ describe DownloadsController do
       end
       context "when a specific datastream is requested" do
         it "should redirect to the root path and display an error" do
-          get "show", id: @obj.pid, datastream_id: "descMetadata"
+          get :show, id: obj, datastream_id: "descMetadata"
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq "You are not authorized to access this page."
         end
@@ -65,16 +69,16 @@ describe DownloadsController do
       describe "#show" do
         it "should default to returning default download configured by object" do
           allow(ContentHolder).to receive(:default_content_ds).and_return('buzz')
-          get "show", :id => @obj.pid
-          expect(response).to be_success
+          get :show, id: obj
+          expect(response).to be_successful
           expect(response.headers['Content-Type']).to eq "image/png"
-          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"buzz.png\""
           expect(response.body).to eq 'fizz'
         end
         it "should default to returning default download configured by controller" do
           expect(DownloadsController.default_content_dsid).to eq "content"
-          get "show", :id => @obj.pid
-          expect(response).to be_success
+          get :show, id: obj
+          expect(response).to be_successful
           expect(response.headers['Content-Type']).to eq "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
@@ -83,63 +87,53 @@ describe DownloadsController do
         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"
+              get :show, id: obj, datastream_id: "thumbnail"
               expect(response).to be_not_found
             end
           end
           context "and it exists" do
             it "should return it" do
-              get "show", :id => @obj.pid, :datastream_id => "descMetadata"
-              expect(response).to be_success
+              get :show, id: obj, datastream_id: "descMetadata"
+              expect(response).to be_successful
               expect(response.headers['Content-Type']).to eq "text/plain"
-              expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+              expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"metadata.xml\""
               expect(response.body).to eq "It's a stream"
             end
           end
         end
         it "should support setting disposition to inline" do
-          get "show", :id => @obj.pid, :disposition => "inline"
-          expect(response).to be_success
+          get :show, id: obj, :disposition => "inline"
+          expect(response).to be_successful
           expect(response.headers['Content-Type']).to eq "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
         it "should allow you to specify filename for download" do
-          get "show", :id => @obj.pid, "filename" => "my%20dog.png"
-          expect(response).to be_success
+          get :show, id: obj, "filename" => "my%20dog.png"
+          expect(response).to be_successful
           expect(response.headers['Content-Type']).to eq "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"my%20dog.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
       end
       describe "stream" do
+        let(:parent) { ActiveFedora::Base.new(id: '1234') }
+
         before do
-          stub_response = double
-          allow(stub_response).to receive(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
-          stub_repo = double
-          allow(stub_repo).to receive(:datastream_dissemination).and_yield(stub_response)
-          stub_ds = ActiveFedora::Datastream.new
-          allow(stub_ds).to receive(:repository).and_return(stub_repo)
-          allow(stub_ds).to receive(:mimeType).and_return('video/webm')
-          allow(stub_ds).to receive(:dsSize).and_return(16)
-          allow(stub_ds).to receive(:dsid).and_return('webm')
-          allow(stub_ds).to receive(:new?).and_return(false)
-          allow(stub_ds).to receive(:pid).and_return('changeme:test')
-          stub_file = double('stub object', datastreams: {'webm' => stub_ds}, pid:'changeme:test', label: "MyVideo.webm")
-          expect(ActiveFedora::Base).to receive(:load_instance_from_solr).with('changeme:test').and_return(stub_file)
-          allow(controller).to receive(:authorize!).with(:download, stub_ds).and_return(true)
-          allow(controller).to receive(:log_download)
+          parent.add_file_datastream('one1two2threfour', dsid: 'webm', mime_type: 'video/webm', original_name: 'MyVideo.webm')
+          parent.save!
+          expect(controller).to receive(:authorize!).with(:download, instance_of(ActiveFedora::File)).and_return(true)
         end
         it "head request" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
-          head :show, id: 'changeme:test', datastream_id: 'webm'
+          head :show, id: parent, datastream_id: 'webm'
           expect(response.headers['Content-Length']).to eq 16
           expect(response.headers['Accept-Ranges']).to eq 'bytes'
           expect(response.headers['Content-Type']).to eq 'video/webm'
         end
         it "should send the whole thing" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
-          get :show, id: 'changeme:test', datastream_id: 'webm'
+          get :show, id: '1234', datastream_id: 'webm'
           expect(response.body).to eq 'one1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
           expect(response.headers["Content-Length"]).to eq '16'
@@ -149,20 +143,20 @@ describe DownloadsController do
           expect(response.status).to eq 206
         end
         it "should send the whole thing when the range is open ended" do
-          request.env["Range"] = 'bytes=0-'
-          get :show, id: 'changeme:test', datastream_id: 'webm'
+          request.env["HTTP_RANGE"] = 'bytes=0-'
+          get :show, id: '1234', datastream_id: 'webm'
           expect(response.body).to eq 'one1two2threfour'
         end
         it "should get a range not starting at the beginning" do
           request.env["HTTP_RANGE"] = 'bytes=3-15'
-          get :show, id: 'changeme:test', datastream_id: 'webm'
+          get :show, id: '1234', datastream_id: 'webm'
           expect(response.body).to eq '1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
           expect(response.headers["Content-Length"]).to eq '13'
         end
         it "should get a range not ending at the end" do
           request.env["HTTP_RANGE"] = 'bytes=4-11'
-          get :show, id: 'changeme:test', datastream_id: 'webm'
+          get :show, id: '1234', datastream_id: 'webm'
           expect(response.body).to eq 'two2thre'
           expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
           expect(response.headers["Content-Length"]).to eq '8'
@@ -181,10 +175,9 @@ describe DownloadsController do
       end
       it "should use the custom param value to retrieve the asset" do
         allow(controller).to receive(:asset_param_key).and_return(:object_id)
-        get "show", :object_id => @obj.pid
+        get :show, object_id: obj
         expect(response).to be_successful
       end
     end
-
   end
 end