hydra-core 9.1.4 → 9.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ff56b294572d8de6e686ecb7e4c274fdcaf252
-  data.tar.gz: fd967b9d4e4fc4b3b10cad811fbd0c347d1f3d0f
+  metadata.gz: d6e3435905f64b4bf6e27a51cb61fc02330ca0d3
+  data.tar.gz: c7f0cdd9f12a3c861fbcb63dbe3fdae1cd7b3f71
 SHA512:
-  metadata.gz: 2289b345f076b1842c84c960886e13b13c2da1cf74484a22dc759bd260363989afc3d9eeb4de308cac7e653a5a54114cc3d8d3c5aa2c80a7f59ff0ef1370946f
-  data.tar.gz: 36834aa5e956262eaa42975fdacae63a149a01b19644b604fccb5ea296f553d5f3f59b78fcc86f1c0290775db8f4c5900e81c7806b42f6cd3222c70d029d3af0
+  metadata.gz: e18e4a744f432ede748ae76b03322dd8c5cfea4b45bd94e71aac04139a2e5f337269e5fad6da231d8d62a57f8ec35ef1418e5eedde85637a97f83cb35f36907b
+  data.tar.gz: 28d836045c044883875bc362278a8fdea7f5453503c327cfb0ab30e02e466ee34529135f0415b61b737c72c2b06d7159009ea4b7309ee7b5c5777016461e7dd9

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

@@ -25,12 +25,12 @@ module Hydra::Controller::ControllerBehavior
   # Override this method if you wish to customize the way access is denied
   def deny_access(exception)
     if exception.action == :edit
-      redirect_to({ action: 'show' }, alert: exception.message)
+      redirect_to(main_app.url_for(action: 'show'), alert: exception.message)
     elsif current_user and current_user.persisted?
-      redirect_to root_path, alert: exception.message
+      redirect_to main_app.root_path, alert: exception.message
     else
       session['user_return_to'.freeze] = request.url
-      redirect_to new_user_session_path, alert: exception.message
+      redirect_to main_app.new_user_session_path, alert: exception.message
     end
   end
 

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

@@ -0,0 +1,35 @@
+module Hydra
+  module ContentNegotiation
+    def self.extended(document)
+      document.will_export_as(:nt, "application/n-triples")
+      document.will_export_as(:jsonld, "application/json")
+      document.will_export_as(:ttl, "text/turtle")
+    end
+
+    def export_as_nt
+      clean_graph.dump(:ntriples)
+    end
+
+    def export_as_jsonld
+      clean_graph.dump(:jsonld, :standard_prefixes => true)
+    end
+
+    def export_as_ttl
+      clean_graph.dump(:ttl)
+    end
+
+    private
+
+    def clean_graph
+      @clean_graph ||= clean_graph_repository.find(id)
+    end
+
+    def clean_graph_repository
+      CleanGraphRepository.new(connection)
+    end
+
+    def connection
+      ActiveFedora.fedora.clean_connection
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+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)
+      @connection = connection
+    end
+
+    def find(id)
+      ReplacingGraphFinder.new(
+        GraphFinder.new(connection, id)
+      ).graph
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Hydra::ContentNegotiation
+  # Replaces Fedora URIs in a graph with a Hydra-configured alternative.
+  class FedoraUriReplacer
+    def initialize(fedora_base_uri, graph)
+      @fedora_base_uri = fedora_base_uri
+      @graph = graph
+    end
+
+    def run
+      RDF::Graph.new.insert(*replaced_objects)
+    end
+
+    private
+
+    attr_reader :fedora_base_uri, :graph
+
+    def replace_uri(uri)
+      id = ActiveFedora::Base.uri_to_id(uri)
+      RDF::URI(Hydra.config.id_to_resource_uri.call(id))
+    end
+
+    def replaced_objects
+      replaced_subjects.map do |statement|
+        if fedora_uri?(statement.object)
+          RDF::Statement.from([statement.subject, statement.predicate, replace_uri(statement.object)])
+        else
+          statement
+        end
+      end
+    end
+
+    def fedora_uri?(subject)
+      subject.to_s.start_with?(fedora_base_uri.to_s)
+    end
+
+    def replaced_subjects
+      graph.each_statement.to_a.map do |s|
+        if fedora_uri?(s.subject)
+          RDF::Statement.from([replace_uri(s.subject), s.predicate, s.object])
+        else
+          s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Hydra::ContentNegotiation
+  # Finds a graph given a connection and ID.
+  class GraphFinder
+    attr_reader :connection, :id
+    def initialize(connection, id)
+      @connection = connection
+      @id = id
+    end
+
+    def graph
+      connection.get(uri).graph
+    end
+
+    def uri
+      ActiveFedora::Base.id_to_uri(id)
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Hydra::ContentNegotiation
+  # Decorator for Finder which replaces Fedora subjects in the graph with a 
+  # configured URI
+  class ReplacingGraphFinder < SimpleDelegator
+    def graph
+      graph_replacer.run
+    end
+
+    private
+
+    def graph_replacer
+      ::Hydra::ContentNegotiation::FedoraUriReplacer.new(base_uri, __getobj__.graph)
+    end
+
+    def base_uri
+      @base_uri ||= uri.gsub(/#{id}$/,'')
+    end
+  end
+end

data/hydra-core.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rails", '~> 4.0'
   gem.add_dependency 'hydra-access-controls', version
   gem.add_dependency 'jettywrapper', '>= 2.0.0'
+  gem.add_dependency 'active-fedora', '~> 9.1'
 
   gem.add_development_dependency 'sqlite3', '~> 1.3'
   gem.add_development_dependency 'yard', '~> 0.8.7'

data/lib/generators/hydra/head_generator.rb

@@ -76,6 +76,25 @@ module Hydra
       copy_file 'config/blacklight.yml', force: true
     end
 
+    def create_conneg_configuration
+      file_path = "config/initializers/mime_types.rb"
+      inject_into_file file_path, :before => /\Z/  do
+        "\nMime::Type.register \"application/n-triples\", :nt" + 
+        "\nMime::Type.register \"application/json\", :jsonld" +
+        "\nMime::Type.register \"text/turtle\", :ttl"
+      end
+    end
+
+    def inject_solr_document_conneg
+      file_path = "app/models/solr_document.rb"
+      if File.exists?(file_path)
+        inject_into_file file_path, :before => /end\Z/ do
+          "\n  # Do content negotiation for AF models. \n" + 
+          "\n  use_extension( Hydra::ContentNegotiation )\n"
+        end
+      end
+    end
+
     # Add Hydra behaviors to the user model
     def inject_hydra_user_behavior
       file_path = "app/models/#{model_name.underscore}.rb"

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.1.4"
+  VERSION = "9.2.0.rc1"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -55,6 +55,70 @@ describe CatalogController do
     end
   end
 
+  describe "content negotiation" do
+    describe "show" do
+      before do
+        allow(controller).to receive(:enforce_show_permissions)
+      end
+      context "with no asset" do
+        it "should return a not found response code" do
+          get 'show', :id => "test", :format => :nt
+
+          expect(response).to be_not_found
+        end
+      end
+      context "with an asset" do
+        let(:type) { RDF::URI("http://example.org/example") }
+        let(:related_uri) { related.rdf_subject }
+        let(:asset) do
+          ActiveFedora::Base.create do |g|
+            g.resource << [g.rdf_subject, RDF::DC.title, "Test Title"]
+            g.resource << [g.rdf_subject, RDF.type, type]
+            g.resource << [g.rdf_subject, RDF::DC.isReferencedBy, related_uri]
+          end
+        end
+        let(:related) do
+          ActiveFedora::Base.create
+        end
+        it "should be able to negotiate jsonld" do
+          get 'show', :id => asset.id, :format => :jsonld
+
+          expect(response).to be_success
+          graph = RDF::Reader.for(:jsonld).new(response.body)
+          expect(graph.statements.to_a.length).to eq 3
+        end
+        it "should be able to negotiate ttl" do
+          get 'show', :id => asset.id, :format => :ttl
+          
+          expect(response).to be_success
+          graph = RDF::Reader.for(:ttl).new(response.body)
+          expect(graph.statements.to_a.length).to eq 3
+        end
+        it "should return an n-triples graph with just the content put in" do
+          get 'show', :id => asset.id, :format => :nt
+
+          graph = RDF::Reader.for(:ntriples).new(response.body)
+          statements = graph.statements.to_a
+          expect(statements.length).to eq 3
+          expect(statements.first.subject).to eq asset.rdf_subject
+        end
+        context "with a configured subject converter" do
+          before do
+            Hydra.config.id_to_resource_uri = lambda { |id| "http://hydra.box/catalog/#{id}" }
+            get 'show', :id => asset.id, :format => :nt
+          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
+            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
+        end
+      end
+    end
+  end
+
   describe "filters" do
     describe "show" do
       it "should trigger enforce_show_permissions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.1.4
+  version: 9.2.0.rc1
 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: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.4
+        version: 9.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.4
+        version: 9.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -127,9 +141,14 @@ files:
 - app/controllers/concerns/hydra/controller/search_builder.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
+- app/models/concerns/hydra/content_negotiation.rb
 - app/models/concerns/hydra/model_methods.rb
 - app/models/concerns/hydra/models.rb
 - app/models/concerns/hydra/solr.rb
+- app/models/hydra/content_negotiation/clean_graph_repository.rb
+- app/models/hydra/content_negotiation/fedora_uri_replacer.rb
+- app/models/hydra/content_negotiation/graph_finder.rb
+- app/models/hydra/content_negotiation/replacing_graph_finder.rb
 - app/models/hydra/datastream/properties.rb
 - app/search_builders/hydra/search_builder.rb
 - config/jetty.yml
@@ -189,12 +208,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)