cul_hydra 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f266d6762f6bf8a2ce0d8c498a2fa414ac775d
-  data.tar.gz: b307b9f693f468d48c3b503332b9df090428cf40
+  metadata.gz: da3844f4364d4f0488fcce5399fbbbef4f49e49a
+  data.tar.gz: 140f4053fb595b0ac8711f6cf917264c6e158568
 SHA512:
-  metadata.gz: 9a7d2446ef89b32a22d2e14945fb104fff5be8c1cd12562ab7e128fa90c5e09708c72a0a9d198ac37fa8b833f21cd8e972f383a267614de38b8337de5e5c5d6a
-  data.tar.gz: 3a1a0fb360f335f9138abbc0827b0339347023405980536002515ddfcf4496c4866d2eddef81eee782e03b6151c515e77e04cff13c4c48b30d4e34cb3e634f5b
+  metadata.gz: e7cf3163f61825251ed71f15e55d0b1315c9367e8501bd2a6ed596e3b19f49956d9e8c8cbe27366fd8c6679f6c43cc3ad7e9021de99089d1c78855f14ac438f0
+  data.tar.gz: 24194475e9a29a3d8c3445fbf9a7babfcd9b970af7a16105d2056748cc90f1d05b64eb41c0d69b732ffc537a04c52222d981005a3090b07f07e73fcdf1c5e551

data/app/models/generic_resource.rb

@@ -36,16 +36,6 @@ class GenericResource < ::ActiveFedora::Base
     "FILE ASSET"
   end
 
-  def thumbnail_info
-    thumb = relsint.relationships(datastreams['content'],:foaf_thumb).first
-    if thumb
-      t_dsid = thumb.object.to_s.split('/')[-1]
-      return {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content",:mime=>datastreams[t_dsid].mimeType}
-    else
-      return {:url=>image_url("cul_hydra/crystal/file.png"),:mime=>'image/png'}
-    end
-  end
-
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super
 
@@ -139,7 +129,14 @@ class GenericResource < ::ActiveFedora::Base
   end
 
   def zooming?
-    (zr = rels_int.relationships(datastreams['content'], :foaf_zooming) and not zr.first.blank?)
+    content = datastreams['content']
+    return false unless content
+    zr = rels_int.relationships(content, :foaf_zooming)
+    if (zr && zr.first)
+      return !zr.first.blank?
+    else
+      false
+    end
   end
 
   def with_ds_resource(ds_id, fedora_content_filesystem_mounted=false, &block)

data/fixtures/spec/CUL_MODS/mods-date-created-range.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <mods xmlns='http://www.loc.gov/mods/v3' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd' version='3.4'>
 <originInfo>
-  <dateCreated encoding='w3cdtf' keyDate='yes' point='start'>1801</dateCreated>
-  <dateCreated encoding='w3cdtf' point='end'>1802</dateCreated>
+  <dateCreated encoding='iso8601' keyDate='yes' point='start'>1801</dateCreated>
+  <dateCreated encoding='iso8601' point='end'>1802</dateCreated>
 </originInfo>
 </mods>

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -4,6 +4,7 @@ module Cul::Hydra::Solrizer
     include Solrizer::DefaultDescriptors::Normal
 
     MODS_NS = {'mods'=>'http://www.loc.gov/mods/v3'}
+    ORIGIN_INFO_DATES = ["dateCreated", "dateIssued", "dateOther"]
 
     module ClassMethods
       def value_mapper(maps=nil)
@@ -28,16 +29,19 @@ module Cul::Hydra::Solrizer
         n_t.gsub!(/\s+/, ' ')
         # pull off paired punctuation, and any leading punctuation
         if strip_punctuation
+          # strip brackets
           n_t = n_t.sub(/^\((.*)\)$/, "\\1")
           n_t = n_t.sub(/^\{(.*)\}$/, "\\1")
           n_t = n_t.sub(/^\[(.*)\]$/, "\\1")
+          n_t = n_t.sub(/^<(.*)>$/, "\\1")
+          # strip quotes
           n_t = n_t.sub(/^"(.*)"$/, "\\1")
           n_t = n_t.sub(/^'(.*)'$/, "\\1")
-          n_t = n_t.sub(/^<(.*)>$/, "\\1")
-          #n_t = n_t.sub(/^\p{Ps}(.*)\p{Pe}/u, "\\1")
+          is_negative_number = n_t =~ /^-\d+$/
           n_t = n_t.sub(/^[[:punct:]]+/, '')
           # this may have 'created' leading/trailing space, so strip
           n_t.strip!
+          n_t = '-' + n_t if is_negative_number
         end
         n_t
       end
@@ -193,18 +197,34 @@ module Cul::Hydra::Solrizer
 
     def textual_dates(node=mods)
       dates = []
-      node.xpath("./mods:originInfo/mods:dateCreated[not(@keyDate) and not(@point) and not(@w3cdtf)]", MODS_NS).collect do |n|
-        dates << ModsFieldable.normalize(n.text, true)
-      end
-      node.xpath("./mods:originInfo/mods:dateIssued[not(@keyDate) and not(@point) and not(@w3cdtf)]", MODS_NS).collect do |n|
-        dates << ModsFieldable.normalize(n.text, true)
-      end
-      node.xpath("./mods:originInfo/mods:dateOther[not(@keyDate) and not(@point) and not(@w3cdtf)]", MODS_NS).collect do |n|
-        dates << ModsFieldable.normalize(n.text, true)
+      ORIGIN_INFO_DATES.each do |element|
+        node.xpath("./mods:originInfo/mods:#{element}[not(@keyDate) and not(@point) and not(@encoding)]", MODS_NS).collect do |n|
+          dates << ModsFieldable.normalize(n.text, true)
+        end
       end
       return dates
     end
 
+    def key_date_range(node=mods)
+      dates = []
+      encodings = ['w3cdtf','iso8601']
+      ORIGIN_INFO_DATES.each do |element|
+        encodings.each do |encoding|
+          xpath = "./mods:originInfo/mods:#{element}[(@keyDate) and (@encoding = '#{encoding}')]"
+          node.xpath(xpath, MODS_NS).collect do |n|
+            range = [ModsFieldable.normalize(n.text, true)]
+            if n['point'] != 'end'
+              n.xpath("../mods:#{element}[(@encoding = '#{encoding}' and @point = 'end')]", MODS_NS).each do |ep|
+                range << ModsFieldable.normalize(ep.text, true)
+              end
+            end
+            dates << range
+          end
+        end
+      end
+      return dates.first || dates
+    end
+
     def date_range_to_textual_date(start_year, end_year)
       start_year = start_year.to_i.to_s # Remove zero-padding if present
       end_year = end_year.to_i.to_s # Remove zero-padding if present
@@ -386,24 +406,9 @@ module Cul::Hydra::Solrizer
       end
 
       # Create convenient start and end date values based on one of the many possible originInfo/dateX elements.
-      possible_start_date_fields = ['origin_info_date_issued_ssm', 'origin_info_date_issued_start_ssm', 'origin_info_date_created_ssm', 'origin_info_date_created_start_ssm', 'origin_info_date_other_ssm', 'origin_info_date_other_start_ssm']
-      possible_end_date_fields = ['origin_info_date_issued_end_ssm', 'origin_info_date_created_end_ssm', 'origin_info_date_other_end_ssm']
-      start_date = nil
-      end_date = nil
+      start_date, end_date = key_date_range
       start_year = nil
       end_year = nil
-      possible_start_date_fields.each{|key|
-        if solr_doc.has_key?(key)
-            start_date = solr_doc[key][0]
-          break
-        end
-      }
-      possible_end_date_fields.each{|key|
-        if solr_doc.has_key?(key)
-            end_date = solr_doc[key][0]
-          break
-        end
-      }
 
       if start_date.present?
 

data/lib/cul_hydra/version.rb

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

data/lib/tasks/cul_hydra_dev.rake

@@ -1,7 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'fedora-3.7-with-risearch'
+JETTY_ZIP_BASENAME = 'fedora-3.8.1-with-risearch'
 Jettywrapper.url = "https://github.com/cul/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :cul_hydra do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -99,16 +99,16 @@ dependencies:
   name: active_fedora_relsint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: cul_image_props
   requirement: !ruby/object:Gem::Requirement
@@ -352,14 +352,11 @@ files:
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
 - bin/rails
-- config/fedora.yml
 - config/jetty.yml
 - config/locales/ldpd_hydra.en.yml
 - config/predicate_mappings.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
-- config/subs.yml
 - fixtures/cmodels/ldpd_ADLMetadata.xml
 - fixtures/cmodels/ldpd_AESMetadata.xml
 - fixtures/cmodels/ldpd_BagAggregator.xml
@@ -484,7 +481,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
@@ -511,7 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps

data/config/fedora.yml

@@ -1,17 +0,0 @@
-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"
-  
-production:
-  :user: fedoraAdmin
-  :password: f+BULUS*^
-  :url: http://alcott.cul.columbia.edu:8080/fedora
-  :time_zone: "America/New_York"

data/config/solr.yml

@@ -1,8 +0,0 @@
-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

data/config/subs.yml

@@ -1,17 +0,0 @@
-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"
-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"

data/lib/cul_hydra/version.rb~

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