cul_hydra 1.4.18 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abaad2cef667fc8e4f772a364ed61c4ea68836e
-  data.tar.gz: 14dd1fd4b8a69f2956f8c5d0cea7bf00b50c81bb
+  metadata.gz: 2baf2571dbbdc2d415c7a2933580386f87a4bfc9
+  data.tar.gz: e1aa15a6689b907d3d2100b1aefc8436617b5430
 SHA512:
-  metadata.gz: 88d55e63bec1afcd4a31470e4b2c5d45c8d4e1f56cca39fec0b846b89cb2e0a758352e4ae7f05f5696c96f7e8965ea8b4e614193b1689cfb4733e8897f694dce
-  data.tar.gz: 91305d4506ebb0f13e32916769df96058d0d360e2a5318910152044bf98fc90cb752600420aac59fa7034304772d58f5fabc709194d797a8418afe8bbd35669a
+  metadata.gz: 3f81d19b2bd3f9f5ec1f6c9ab94ac4dbd62ef034cfdbe1338e3a2195acb0626acff5c4853a4e668332e66ec0843752d7c1b41da3997121bc54ef7caed05b4690
+  data.tar.gz: 35554b9b11df6aa862370ea4d0b2f84f49516d15e6018d88bff4c2c17d68359bcca9e3649c9997d2548e37ebee8a88389af4c0b3df90907b7a0682759aaa4512

data/app/models/concept.rb

@@ -76,16 +76,6 @@ class Concept < GenericAggregator
     set_singular_rel(:restriction, val, true)
   end
   
-  # a representative image URI for this concept
-  # https://schema.org/image
-  def representative_image
-    get_singular_rel(:schema_image)
-  end
-
-  def representative_image=(val)
-    set_singular_rel(:schema_image, val)
-  end
-
   # a human readable URI segment for this concept
   # http://www.bbc.co.uk/ontologies/coreconcepts/slug
   def slug
@@ -116,30 +106,12 @@ class Concept < GenericAggregator
     set_singular_rel(:short_title, val, true)
   end
 
-  def get_singular_rel(predicate)
-    property = relationships(predicate).first
-    return nil unless property
-    return (property.kind_of? RDF::Literal) ? property.value : property
-  end
-
-  def set_singular_rel(predicate, value, literal=false)
-    raise "#{predicate} is a singular property" if value.respond_to? :each
-    clear_relationship(predicate)
-    add_relationship(predicate, value, literal) unless value.nil? || value.empty?
-  end
-
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super(solr_doc, opts)
     solr_doc[::ActiveFedora::SolrService.solr_name(:description_text, :displayable)] = description
     solr_doc
   end
-  class SingularRelValidator < ActiveModel::Validator
-    def validate(record)
-      [:abstract, :alternative, :restriction, :slug, :source, :schema_image].each do |rel|
-        record.errors[rel] << "#{rel} must have 0 or 1 values" unless record.relationships(rel).length < 2
-      end
-    end
-  end
 
-  validates_with SingularRelValidator
+  # validators built for [0..1] RELS properties
+  validates_with singular_rel_validator([:abstract, :alternative, :restriction, :slug, :source])
 end

data/app/models/concerns/cul/hydra/models/aggregator.rb

@@ -56,6 +56,17 @@ module Cul::Hydra::Models::Aggregator
     return thumb || {:asset=>"cul_hydra/crystal/file.png",:mime=>'image/png'}
   end
 
+  # a representative image URI for this object
+  # defined by the predicate https://schema.org/image
+  # @return [String, URI]
+  def representative_image
+    get_singular_rel(:schema_image)
+  end
+
+  def representative_image=(val)
+    set_singular_rel(:schema_image, val)
+  end
+
   private
   def thumb_from_struct(members)
     puts "thumb thumb_from_struct"

data/app/models/concerns/cul/hydra/models/common.rb

@@ -24,6 +24,23 @@ module Cul::Hydra::Models::Common
       end
       @rdf_types
     end
+    def singular_rel_validator(symbols = [])
+      r = Class.new(ActiveModel::Validator) do
+        def self.symbols=(symbols)
+          @symbols = symbols
+        end
+        def self.symbols
+          @symbols ||= []
+        end
+        def validate(record)
+          self.class.symbols.each do |rel|
+            record.errors[rel] << "#{rel} must have 0 or 1 values" unless record.relationships(rel).length < 2
+          end
+        end
+      end
+      r.symbols = symbols
+      r
+    end
   end
 
   def rdf_types!
@@ -163,11 +180,18 @@ module Cul::Hydra::Models::Common
     solr_doc
   end
 
+  # Return a representative file resource for the object
+  # @param force_use_of_non_pid_identifier [Boolean] switch to require use of application id in struct map parsing
+  # @return [GenericResource] a representative file resource
   # This method generally shouldn't be called with any parameters (unless we're doing testing)
   def get_representative_generic_resource(force_use_of_non_pid_identifier=false)
     return self if self.is_a?(GenericResource)
-    return nil unless self.is_a?(Cul::Hydra::Models::Aggregator) # Only Aggregators have struct metadata
 
+    # if there's an explicit assignment of representative image, return it
+    assigned_image = get_singular_rel(:schema_image)
+    return ActiveFedora::Base.find(assigned_image.split('/')[-1]) if assigned_image
+
+    return nil unless self.is_a?(Cul::Hydra::Models::Aggregator) # Only Aggregators have struct metadata
     # If we're here, then the object was not a Generic resource.
     # Try to get child info from a structMat datastream, and fall back to
     # the first :cul_member_of child if a structMap isn't present
@@ -233,6 +257,9 @@ module Cul::Hydra::Models::Common
         return nil
       end
     end
+  rescue ActiveFedora::ObjectNotFoundError
+    logger.warn "#{get_singular_rel(:schema_image)} not found in repository for #{self.pid}"
+    return nil
   end
 
   def update_datastream_attributes(params={}, opts={})
@@ -263,6 +290,18 @@ module Cul::Hydra::Models::Common
     {:asset=>("cul_hydra/crystal/kmultiple.png"),:mime_type=>"image/png"}
   end
 
+  def get_singular_rel(predicate)
+    property = relationships(predicate).first
+    return nil unless property
+    return (property.kind_of? RDF::Literal) ? property.value : property
+  end
+
+  def set_singular_rel(predicate, value, literal=false)
+    raise "#{predicate} is a singular property" if value.respond_to? :each
+    clear_relationship(predicate)
+    add_relationship(predicate, value, literal) unless value.nil? || value.empty?
+  end
+
   private
   def value_changed?(ds,pointer,values)
     if values.is_a? Hash

data/app/models/generic_aggregator.rb

@@ -72,4 +72,7 @@ class GenericAggregator < ::ActiveFedora::Base
       conn.commit
     end
   end
+
+  # validators built for [0..1] RELS properties
+  validates_with singular_rel_validator([:schema_image])
 end

data/config/fedora.yml

@@ -1,17 +1,26 @@
 development:
-  :user: fedoraAdmin
-  :password: fedoraAdmin
-  :url: http://localhost:8983/fedora-test
-  :time_zone: "America/New_York"
-
-test:
-  :user: fedoraAdmin
-  :password: fedoraAdmin
-  :url: http://localhost:8983/fedora-test
-  :time_zone: "America/New_York"
-  
+  user: fedoraAdmin
+  password: f+BULUS*^
+  url: http://repository.cul.columbia.edu:8080/fedora
+  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
+  time_zone: "America/New_York"
+test: &TEST  
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
+  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
+  time_zone: "America/New_York"
 production:
-  :user: fedoraAdmin
-  :password: f+BULUS*^
-  :url: http://alcott.cul.columbia.edu:8080/fedora
-  :time_zone: "America/New_York"
+  user: fedoraAdmin
+  password: f+BULUS*^
+  url: http://repository.cul.columbia.edu:8080/fedora
+  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
+  time_zone: "America/New_York"
+dcv_test:
+  user: fedoraAdmin
+  password: f+BULUS*^
+  url: http://repository.cul.columbia.edu:8080/fedora
+  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
+  time_zone: "America/New_York"
+cucumber:
+  <<: *TEST

data/config/solr.yml

@@ -1,8 +1,17 @@
+# This is a sample config file that does not have multiple solr instances. You will also need to be sure to
+# edit the fedora.yml file to match the solr URL for active-fedora. 
+#  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev
+test: &TEST
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+dcv_dev: &DEV
+  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
+  dcv_core: 'dcv_private_dev'
+dcv_test: &IFP
+  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
+  dcv_core: 'dcv_private_test'
+cucumber:
+  <<: *TEST
+production: &PROD
+  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_prod
 development:
-  url: http://localhost:8983/solr/test
-  
-test:
-  url: http://localhost:8983/solr/test
-  
-production:
-  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev
+  <<: *PROD

data/config/subs.yml

@@ -1,17 +1,10 @@
+old:
+  fedora_server: http://sayers.cul.columbia.edu:8080
+  php_server: http://bach.cul.columbia.edu/dev
+  djatoka_server: http://iris.cul.columbia.edu:8080
 development:
-  djatoka_server: "http://iris.cul.columbia.edu:8080"
-  fedora_server: "http://sayers.cul.columbia.edu:8080"
-  php_server: "http://bach.cul.columbia.edu/dev"
+  fedora_server: http://repository.cul.columbia.edu:8080
+  php_server: http://fedora-svc.cul.columbia.edu/dev
 test:
-  djatoka_server: "http://iris.cul.columbia.edu:8080"
-  fedora_server: "http://sayers.cul.columbia.edu:8080"
-  php_server: "http://bach.cul.columbia.edu/dev"
-production:
-  djatoka_server: "http://iris.cul.columbia.edu:8080"
-  fedora_server: "http://alcott.cul.columbia.edu:8080"
-  php_server: "http://bach.cul.columbia.edu"
-  
-hyacinth_prod:
-  djatoka_server: "http://iris.cul.columbia.edu:8080"
-  fedora_server: "http://alcott.cul.columbia.edu:8080"
-  php_server: "http://bach.cul.columbia.edu"
+  fedora_server: http://repository.cul.columbia.edu:8080
+  php_server: http://fedora-svc.cul.columbia.edu/dev

data/lib/cul_hydra/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.4.18
+  version: 1.5.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -532,7 +532,6 @@ files:
 - fixtures/spec/STRUCTMAP/structmap-unlabeled-seq.xml
 - fixtures/spec/STRUCTMAP/structmap-unordered-seq.xml
 - lib/cul_hydra.rb
-- lib/cul_hydra/#version.rb#
 - lib/cul_hydra/access_controls_enforcement.rb
 - lib/cul_hydra/controllers.rb
 - lib/cul_hydra/controllers/aggregates.rb
@@ -570,7 +569,6 @@ files:
 - lib/cul_hydra/solrizer/value_mapper.rb
 - lib/cul_hydra/solrizer_patch.rb
 - lib/cul_hydra/version.rb
-- lib/cul_hydra/version.rb~
 - lib/tasks/cmodel.rake
 - lib/tasks/cul_hydra_dev.rake
 - lib/tasks/index.rake
@@ -597,7 +595,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps

data/lib/cul_hydra/#version.rb#

@@ -1,8 +0,0 @@
-module Cul
-  module Hydra
-    VERSION = '1.4.16'
-    def self.version
-      VERSION
-    end
-  end
-end

data/lib/cul_hydra/version.rb~

@@ -1,8 +0,0 @@
-module Cul
-  module Hydra
-    VERSION = '1.4.17'
-    def self.version
-      VERSION
-    end
-  end
-end