hydra-core 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45efd1b20cb587da16107c9eeb2436585a995f9
-  data.tar.gz: f1b62768dd6b99194fd25f93fec69133ef385105
+  metadata.gz: 9a1cd5a8276ad78953ef0a08e5986ac669ce209d
+  data.tar.gz: f7584c638f094da3f0ff9a12d0c1985d71944b9d
 SHA512:
-  metadata.gz: 8f60542cd2c982d5f8ba893c32a9109db4ba9b260814e71f172737d64d876ee1b459d2de3c072e9c76a0e044243717f200b8d6e9452d8489d9396f3a752c7df3
-  data.tar.gz: 48a8abfa67c87d042828a936d7948beea5b3d5f263516fc2da008a71a6e39ee874b35aadbcc558be35e8bfb2e91b7da4937b974a3b4caf9cf8a796bb54701763
+  metadata.gz: da165812253d2b6adf23da94c47e731b3743a99308144536973e67f3104b901d100f50c637d4494b2a68efdd166ba0f1d6fbcbb9082edceb26aa3bd4d58aa5a4
+  data.tar.gz: 4b600ca2367362e556d66bbe2a6eb468c60e88a2a11cfb062a1f9ebddce26789448dda465f96baba25a9b9e1fc36b6e09b5b977114ad2144f1e382faa27ef36a

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/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "10.0.0"
+  VERSION = "10.0.1"
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.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: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,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
@@ -185,6 +186,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