cul_hydra 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 278a5e4cbd947599bf3fcab719476475981db88f
-  data.tar.gz: 178a0207a26907b9a977da5bf131e08aa68f37d3
+  metadata.gz: 687ff9012903d9e29e55c2b15c816bd896156a14
+  data.tar.gz: 61f739da28a33b43cd025a7aec179285bef6735a
 SHA512:
-  metadata.gz: b381922cb044c11432d1cbea654d97981518d3be0ff77dd90a1a3c96723cf33542b6c34411763d18d1669aed93b55518f63e5267f7a8af8c017b9d0b47421e15
-  data.tar.gz: c5585389811409b5dfe274dc5ffc940fbe2e9693f54e3f76507b6bf44e855cf462b1244df8fe85ac6bdeb70751afbc48abdf85daa2851b5f86fc8087097fcaaf
+  metadata.gz: 174ffbf9d4fc63b6386fe3424b6bb794acdefedcebab328c17a3344cd10e07b941f9f2407a31aa01e48f24e292792d2daf00667e7e4553fea54b5f1b352981f3
+  data.tar.gz: c0fa12f53db47e8517c182912a43c39260807a77322d02ac586863fea5f4ad65d2d11741d91dae07c6d4b0e4db1acd742841f4ce72f847acf7d8b77cd271413b

data/app/models/generic_resource.rb

@@ -63,6 +63,9 @@ class GenericResource < ::ActiveFedora::Base
       end
     end
 
+    if (service_ds = self.service_datastream)
+      solr_doc['service_dslocation_ss'] = service_ds.dsLocation
+    end
     solr_doc["fulltext_tesim"] = []
     unless self.datastreams["fulltext"].nil?
       solr_doc["fulltext_tesim"].concat(solr_doc["title_display_ssm"]) unless solr_doc["title_display_ssm"].nil? or solr_doc["title_display_ssm"].length == 0
@@ -142,6 +145,23 @@ class GenericResource < ::ActiveFedora::Base
     end
   end
 
+  def service_datastream
+    # we have to 'manually' query the graph because rels_int doesn't support subject pattern matching
+    args = [:s, rels_int.to_predicate(:format_of), RDF::URI.new("#{internal_uri}/content")]
+    query = RDF::Query.new { |q| q << args }
+    candidates = query.execute(rels_int.graph).map(&:to_hash).map do |hash|
+      hash[:s]
+    end
+    args = [:s, rels_int.to_predicate(:rdf_type), RDF::URI.new("http://pcdm.org/use#ServiceFile")]
+    query = RDF::Query.new { |q| q << args }
+    candidates &= query.execute(rels_int.graph).map(&:to_hash).map do |hash|
+      hash[:s]
+    end
+    candidate_dsid = candidates.first && candidates.first.to_s.split('/')[-1]
+    return datastreams[candidate_dsid] if datastreams.keys.include? candidate_dsid
+    return nil
+  end
+
   def with_ds_resource(ds_id, fedora_content_filesystem_mounted=false, &block)
 
     ds = self.datastreams[ds_id]

data/config/locales/ldpd_hydra.en.yml

@@ -25,7 +25,7 @@ en:
         "Butler 75: Butler Library's 75th anniversary, 1934-2009" : "Butler 75"
         "Chamber of Commerce of New York" : "Chamber of Commerce"
         "Charles A. Platt's Italian Garden Photographs" : "Platt's Italian Garden Photographs"
-        "Children's Drawings of the Spanish Civil War (online exhibition)" : 'Spanish Civil War'
+        "Children's Drawings of the Spanish Civil War" : 'Spanish Civil War'
         'Chinese paper gods' : 'Chinese Paper Gods'
         'Community Service Society Photographs' : 'Community Service Society'
         "Core Curriculum: Contemporary Civilization" : "Core Curriculum: Contemporary Civilization"
@@ -50,7 +50,6 @@ en:
         "Reading of Books and the Reading of Literature" : "Reading of Books"
         'Russian Imperial Corps of Pages' : 'Russian Corps of Pages'
         'The Papers of John Jay' : 'Jay Papers'
-        "The People in the Books: Hebraica and Judaica Manuscripts from Columbia University Libraries" : "People in the Books"
         "Type to Print: The Book & The Type Specimen Book" : "Type to Print"
         "Varsity Show: a Columbia Tradition" : "Varsity Show: a Columbia Tradition"
     long:
@@ -95,7 +94,7 @@ en:
         "Butler 75: Butler Library's 75th anniversary, 1934-2009" : "Butler 75: Butler Library's 75th anniversary, 1934-2009"
         "Chamber of Commerce of New York" : "Chamber of Commerce of New York"
         "Charles A. Platt's Italian Garden Photographs" : "Charles A. Platt's Italian Garden Photographs"
-        "Children's Drawings of the Spanish Civil War (online exhibition)" : "Children's Drawings of the Spanish Civil War"
+        "Children's Drawings of the Spanish Civil War" : "Children's Drawings of the Spanish Civil War"
         'Chinese paper gods' : 'Chinese Paper Gods'
         'Community Service Society Photographs' : 'Community Service Society Photographs'
         "Core Curriculum: Contemporary Civilization" : "Core Curriculum: Contemporary Civilization"
@@ -120,6 +119,5 @@ en:
         "Reading of Books and the Reading of Literature" : "Reading of Books and the Reading of Literature"
         'Russian Imperial Corps of Pages' : 'Russian Imperial Corps of Pages'
         'The Papers of John Jay' : 'Papers of John Jay'
-        "The People in the Books: Hebraica and Judaica Manuscripts from Columbia University Libraries" : "People in the Books: Hebraica and Judaica Manuscripts from Columbia University Libraries"
         "Type to Print: The Book & The Type Specimen Book" : "Type to Print: The Book & The Type Specimen Book"
         "Varsity Show: a Columbia Tradition" : "Varsity Show"

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.3.10'
+    VERSION = '1.3.11'
     def self.version
       VERSION
     end

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.3.9'
+    VERSION = '1.3.10'
     def self.version
       VERSION
     end

data/lib/tasks/cul_hydra_dev.rake

@@ -34,6 +34,7 @@ namespace :cul_hydra do
     ENV['environment'] = "test"
     #Rake::Task["active_fedora:configure_jetty"].invoke
     jetty_params = Jettywrapper.load_config
+    Rake::Task["jetty:clean"].invoke
     error = Jettywrapper.wrap(jetty_params) do
       Rake::Task["cul_hydra:cmodel:reload_all"].invoke
       Rake::Task['cul_hydra:coverage'].invoke

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -179,6 +179,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -542,7 +556,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -550,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps