hydra-core 10.0.2 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf418108dc7ef2c999d462beae784993deb8ba34
-  data.tar.gz: 61515d84bc43ad0505fa3e4f37c8fd3ac234a8e5
+  metadata.gz: e4db5c43e5a0ac63927d082d58980a9402cdc1c4
+  data.tar.gz: d9e0725aa00fd1bb341b600ffc122b4f93b1a039
 SHA512:
-  metadata.gz: a3cd4250ef891b4bfa604bc4ec328422e6eafe6dfa4ffea3f927136aa29903c90a4e9e2e977d34ada15763a5e3bdde51c924793e57ff9b9b7bb30c099cb21255
-  data.tar.gz: 4eb5809a001a4f8a892c159e19f6851b40136520b4ab3c2c1e3eed918426a8fe04f9def02d0460dae1d0814dc93dc2d941d71e502905245d010ab77083a1b3d3
+  metadata.gz: f69bc9d11bd079d550c3023483e1e5a86304ff4712bd3d8b6dfc3945c064fb2ec0241447bef34baeee249be3ecfff3a54657208aa4993fb0fe0f216918e26d0e
+  data.tar.gz: 6ece1d5e44c0b69031b669de69b0821ef54804cdd1016890e97a2e8a79e0222d14928bcc5744ff7f8ed243fe8c29b6c9ba2e67c4835027144b5524079d5de3ff

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

@@ -87,8 +87,7 @@ module Hydra
       # render an HTTP HEAD response
       def content_head
         response.headers['Content-Length'] = file.size
-        response.headers['Content-Type'] = file.mime_type
-        head :ok
+        head :ok, content_type: file.mime_type
       end
 
       # render an HTTP Range response

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -10,12 +10,17 @@ module Hydra
     # @param [String, Array] display_type a value suggestive of a partial
     # @return [String] the name of the partial to render
     # @example
-    #   type_field_to_partial_name(["info:fedora/hull-cModel:genericContent"])
+    #   type_field_to_partial_name(["GenericContent"])
     #   => 'generic_content'
-    #   type_field_to_partial_name(["info:fedora/hull-cModel:text.pdf"])
+    #   type_field_to_partial_name(["text.pdf"])
     #   => 'text_pdf'
     def type_field_to_partial_name(document, display_type)
-      Array(display_type).first.gsub(/^[^\/]+\/[^:]+:/,"").gsub("-","_").underscore.parameterize("_")
+      str = Array(display_type).join(' '.freeze).underscore
+      if Rails.version >= '5.0.0'
+        str.parameterize(separator: '_'.freeze)
+      else
+        str.parameterize('_'.freeze)
+      end
     end
   end
 end

data/hydra-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency "rails", '~> 4.0'
+  gem.add_dependency "railties", '>= 4.0.0', '< 6'
   gem.add_dependency 'hydra-access-controls', version
 
   gem.add_development_dependency 'sqlite3', '~> 1.3'

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "10.0.2"
+  VERSION = "10.1.0"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -96,8 +96,8 @@ describe CatalogController do
           end
           it "should convert it" do
             graph = RDF::Graph.new << RDF::Reader.for(:ntriples).new(response.body)
-            title_statement = graph.query([nil, RDF::DC.title, nil]).first
-            related_statement = graph.query([nil, RDF::DC.isReferencedBy, nil]).first
+            title_statement = graph.query([nil, RDF::Vocab::DC.title, nil]).first
+            related_statement = graph.query([nil, RDF::Vocab::DC.isReferencedBy, nil]).first
             expect(title_statement.subject).to eq RDF::URI("http://hydra.box/catalog/#{asset.id}")
             expect(related_statement.object).to eq RDF::URI("http://hydra.box/catalog/#{related.id}")
           end

data/spec/controllers/downloads_controller_spec.rb

@@ -74,7 +74,7 @@ describe DownloadsController do
           allow(ContentHolder).to receive(:default_file_path).and_return('buzz')
           get :show, id: obj
           expect(response).to be_successful
-          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"buzz.png\""
           expect(response.body).to eq 'fizz'
         end
@@ -83,7 +83,7 @@ describe DownloadsController do
           expect(DownloadsController.default_file_path).to eq "content"
           get :show, id: obj
           expect(response).to be_successful
-          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
@@ -99,7 +99,7 @@ describe DownloadsController do
             it "should return it" do
               get :show, id: obj, file: "descMetadata"
               expect(response).to be_successful
-              expect(response.headers['Content-Type']).to eq "text/plain"
+              expect(response.headers['Content-Type']).to start_with "text/plain"
               expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"metadata.xml\""
               expect(response.body).to eq "It's a stream"
             end
@@ -108,14 +108,14 @@ describe DownloadsController do
         it "should support setting disposition to inline" do
           get :show, id: obj, :disposition => "inline"
           expect(response).to be_successful
-          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers['Content-Type']).to start_with "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, "filename" => "my%20dog.png"
           expect(response).to be_successful
-          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"my%20dog.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
@@ -128,37 +128,42 @@ describe DownloadsController do
           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: parent, file: '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'
+          expect(response.headers['Content-Type']).to start_with 'video/webm'
         end
-        it "should send the whole thing" do
+
+        it "sends the whole thing" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
           get :show, id: '1234', file: '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'
           expect(response.headers['Accept-Ranges']).to eq 'bytes'
-          expect(response.headers['Content-Type']).to eq "video/webm"
+          expect(response.headers['Content-Type']).to start_with "video/webm"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"MyVideo.webm\""
           expect(response.status).to eq 206
         end
-        it "should send the whole thing when the range is open ended" do
+
+        it "sends the whole thing when the range is open ended" do
           request.env["HTTP_RANGE"] = 'bytes=0-'
           get :show, id: '1234', file: 'webm'
           expect(response.body).to eq 'one1two2threfour'
         end
-        it "should get a range not starting at the beginning" do
+
+        it "gets a range not starting at the beginning" do
           request.env["HTTP_RANGE"] = 'bytes=3-15'
           get :show, id: '1234', file: '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
+
+        it "gets a range not ending at the end" do
           request.env["HTTP_RANGE"] = 'bytes=4-11'
           get :show, id: '1234', file: 'webm'
           expect(response.body).to eq 'two2thre'

data/spec/helpers/blacklight_helper_spec.rb

@@ -14,20 +14,20 @@ describe BlacklightHelper do
       allow(helper).to receive(:blacklight_config).and_return(config)
     end
 
-    it "should lop off everything before the first colin after the slash" do
-      expect(helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"])).to eq "presentation"
-      expect(helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"])).to eq "generic_content"
+    it "changes camel case to underscored lowercase" do
+      expect(helper.document_partial_name('has_model_s' => ["Presentation"])).to eq "presentation"
+      expect(helper.document_partial_name('has_model_s' => ["GenericContent"])).to eq "generic_content"
     end
 
     context "with a single valued field" do
-      let(:field_name) { 'active_fedora_model_ssi' }
+      let(:field_name) { 'has_model_s' }
       it "should support single valued fields" do
-        expect(helper.document_partial_name('active_fedora_model_ssi' => "Chicken")).to eq "chicken"
+        expect(helper.document_partial_name('has_model_s' => "Chicken")).to eq "chicken"
       end
     end
 
-    it "should handle periods" do
-      expect(helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:text.PDF"])).to eq "text_pdf"
+    it "handles periods" do
+      expect(helper.document_partial_name('has_model_s' => ["text.PDF"])).to eq "text_pdf"
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ ActiveFedora::Base.logger = Logger.new(STDOUT)
 
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.1.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: hydra-access-controls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 10.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +158,6 @@ files:
 - spec/support/db/migrate/20111101221803_create_searches.rb
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
 homepage: http://projecthydra.org
@@ -198,7 +203,5 @@ test_files:
 - spec/support/db/migrate/20111101221803_create_searches.rb
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
-has_rdoc: 

data/spec/test_app_templates/Gemfile.extra

@@ -1,6 +0,0 @@
-gem 'rspec-rails', '~> 3.1', group: :test
-gem 'rspec-its'
-gem 'byebug' unless ENV['CI']
-
-gem 'rails', ENV.fetch('RAILS_VERSION', '4.2.6')
-gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '6.0.0')