hydra-core 10.0.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45efd1b20cb587da16107c9eeb2436585a995f9
-  data.tar.gz: f1b62768dd6b99194fd25f93fec69133ef385105
+  metadata.gz: 450a93f7a813de8c1c95a0cbee13bf603532155b
+  data.tar.gz: f24ba34d77864a069f95356f16a28d9b08f16303
 SHA512:
-  metadata.gz: 8f60542cd2c982d5f8ba893c32a9109db4ba9b260814e71f172737d64d876ee1b459d2de3c072e9c76a0e044243717f200b8d6e9452d8489d9396f3a752c7df3
-  data.tar.gz: 48a8abfa67c87d042828a936d7948beea5b3d5f263516fc2da008a71a6e39ee874b35aadbcc558be35e8bfb2e91b7da4937b974a3b4caf9cf8a796bb54701763
+  metadata.gz: 43931f2320aaf1cdc7019514fd250c2873823dd5b9eddc49388f2d553b19eae93194a6098321cd96baab9dd321c0bf219134f350124655d81d89539a89a71e33
+  data.tar.gz: a5f574df3e697acd7a361229b077932d8377f393ec60fc86695cb70075c556435be34930947cb3d93ca1c60d2a6d19fc1f22b7def83cb4f1c01a3ab8d2c0a7e8

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

@@ -5,7 +5,7 @@ module Hydra
 
       included do
         include Hydra::Controller::ControllerBehavior
-        before_filter :authorize_download!
+        before_action :authorize_download!
       end
 
       # Responds to http requests to show the file
@@ -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/app/models/hydra/content_negotiation/clean_graph_repository.rb

@@ -2,14 +2,18 @@ module Hydra::ContentNegotiation
   # CleanGraphRepository has a #find interface which returns a graph for use
   # with content negotiation.
   class CleanGraphRepository
-    attr_reader :connection
-    def initialize(connection)
+    attr_reader :connection, :replacer
+    # @param [#get] connection the connection to fedora
+    # @param [#call] replacer a function that is called with id and graph and returns a string representation of the new uri.
+    def initialize(connection, replacer = Hydra.config.id_to_resource_uri)
       @connection = connection
+      @replacer = replacer
     end
 
     def find(id)
       ReplacingGraphFinder.new(
-        GraphFinder.new(connection, id)
+        GraphFinder.new(connection, id),
+        replacer
       ).graph
     end
   end

data/app/models/hydra/content_negotiation/fedora_uri_replacer.rb

@@ -1,9 +1,13 @@
 module Hydra::ContentNegotiation
   # Replaces Fedora URIs in a graph with a Hydra-configured alternative.
   class FedoraUriReplacer
-    def initialize(fedora_base_uri, graph)
+    # @param [String] fedora_base_uri the internal Fedora base uri
+    # @param [RDF::Graph] graph the original graph that needs URIs replaced
+    # @param [#call] replacer a function that is called with id and graph and returns a string representation of the new uri.
+    def initialize(fedora_base_uri, graph, replacer)
       @fedora_base_uri = fedora_base_uri
       @graph = graph
+      @replacer = replacer
     end
 
     def run
@@ -12,11 +16,11 @@ module Hydra::ContentNegotiation
 
     private
 
-    attr_reader :fedora_base_uri, :graph
+    attr_reader :fedora_base_uri, :graph, :replacer
 
     def replace_uri(uri)
       id = ActiveFedora::Base.uri_to_id(uri)
-      RDF::URI(Hydra.config.id_to_resource_uri.call(id, graph))
+      RDF::URI(replacer.call(id, graph))
     end
 
     def replaced_objects

data/app/models/hydra/content_negotiation/replacing_graph_finder.rb

@@ -2,6 +2,13 @@ module Hydra::ContentNegotiation
   # Decorator for Finder which replaces Fedora subjects in the graph with a 
   # configured URI
   class ReplacingGraphFinder < SimpleDelegator
+
+    attr_reader :replacer
+    def initialize(graph_finder, replacer)
+      super(graph_finder)
+      @replacer = replacer
+    end
+
     def graph
       graph_replacer.run
     end
@@ -9,11 +16,13 @@ module Hydra::ContentNegotiation
     private
 
     def graph_replacer
-      ::Hydra::ContentNegotiation::FedoraUriReplacer.new(base_uri, __getobj__.graph)
+      ::Hydra::ContentNegotiation::FedoraUriReplacer.new(base_uri,
+                                                         __getobj__.graph,
+                                                         replacer)
     end
 
     def base_uri
-      @base_uri ||= uri.gsub(/#{id}$/,'')
+      @base_uri ||= ActiveFedora.fedora.host + ActiveFedora.fedora.base_path
     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/generators/hydra/templates/catalog_controller.rb

@@ -4,8 +4,8 @@ require 'blacklight/catalog'
 class CatalogController < ApplicationController
 
   include Hydra::Catalog
-  # These before_filters apply the hydra access controls
-  before_filter :enforce_show_permissions, only: :show
+  # This filter applies the hydra access controls
+  before_action :enforce_show_permissions, only: :show
 
   configure_blacklight do |config|
     ## Class for sending and receiving requests from a search index

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "10.0.0"
+  VERSION = "10.2.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/models/content_negotiation/replacing_graph_finder_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe Hydra::ContentNegotiation::ReplacingGraphFinder do
+  let(:graph) { double }
+  let(:finder) { double(graph: graph,
+                        uri: 'http://127.0.0.1:8986/rest/test/28/01/ph/00/2801ph009',
+                        id: '2801ph009') }
+  let(:replacer) { double }
+  subject { described_class.new finder, replacer }
+
+  describe "graph" do
+    it "has the correct base url" do
+      expect(Hydra::ContentNegotiation::FedoraUriReplacer).to receive(:new)
+      .with(ending_with("/rest/test"), graph, replacer)
+       .and_return(double(run: nil))
+
+      subject.graph
+    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.0
+  version: 10.2.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-06-08 00:00:00.000000000 Z
+date: 2016-08-17 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.0
+        version: 10.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +146,7 @@ files:
 - spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
+- spec/models/content_negotiation/replacing_graph_finder_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
@@ -151,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
@@ -185,6 +191,7 @@ test_files:
 - spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
+- spec/models/content_negotiation/replacing_graph_finder_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
@@ -196,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')