cul_scv_hydra 0.4.3 → 0.5.0

data/lib/cul_scv_hydra/active_fedora/model/common.rb

@@ -194,11 +194,10 @@ module Common
     old_values.each_index {|ix| indexed_values[ix.to_s] = old_values[ix] }
     indexed_values.each {|k,v|
       new_val = values.delete(k)
-      puts "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
       logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
       changed ||= !(v.eql? new_val)
     }
-    puts "remaining values! #{values.inspect}" if values.length > 0
+    logger.debug "remaining values! #{values.inspect}" if values.length > 0
     changed || (values.length > 0)
   end
  

data/lib/cul_scv_hydra/active_fedora/model/resource.rb

@@ -40,27 +40,31 @@ module Resource
     if IMAGE_MIME_TYPES.include? mime
       blob.rewind
       # retrieve Nokogiri of image property RDF
-      image_prop_nodes = Cul::Image::Properties.identify(blob).nodeset
-      relsext = datastreams['RELS-EXT']
-      image_prop_nodes.each { |node|
-        if node["resource"]
-          is_literal = false
-          object = RDF::URI.new(node["resource"])
-        else
-          is_literal = true
-          object = RDF::Literal(node.text)
-        end
-        subject = RDF::URI(internal_uri)
-        predicate = RDF::URI("#{node.namespace.href}#{node.name}")
-        query = RDF::Query.new({ :subject => {predicate => :object}})
-        relationships(predicate).dup.each { |stmt|
-          relationships.delete(stmt)
+      image_properties = Cul::Image::Properties.identify(blob)
+      if image_properties
+        image_prop_nodes = image_properties.nodeset
+        puts image_properties.instance_variable_get(:@ng_xml).to_xml
+        relsext = datastreams['RELS-EXT']
+        image_prop_nodes.each { |node|
+          if node["resource"]
+            is_literal = false
+            object = RDF::URI.new(node["resource"])
+          else
+            is_literal = true
+            object = RDF::Literal(node.text)
+          end
+          subject = RDF::URI(internal_uri)
+          predicate = RDF::URI("#{node.namespace.href}#{node.name}")
+          query = RDF::Query.new({ :subject => {predicate => :object}})
+          relationships(predicate).dup.each { |stmt|
+            relationships.delete(stmt)
+          }
+          add_relationship(predicate,object, is_literal)
+          relationships_are_dirty=true
         }
-        add_relationship(predicate,object, is_literal)
-        relationships_are_dirty=true
-      }
-      # add mimetype to DC:format values
-      self.datastreams['DC'].update_values({[:format] => mime})
+        # add mimetype to DC:format values
+        self.datastreams['DC'].update_values({[:format] => mime})
+      end
     end
     blob.rewind
   end

data/lib/cul_scv_hydra/om/scv_mods_document.rb

@@ -15,10 +15,11 @@ module Om
       t.root(:path=>"mods",
              :xmlns=>"http://www.loc.gov/mods/v3",
              :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-4.xsd")
-      
+             
       t.main_title_info(:path=>'titleInfo', :index_as=>[:not_searchable], :attributes=>{:type=>:none}){
-        t.main_title(:path=>"title", :index_as=>[:displayable,:searchable, :sortable])
+        t.main_title(:path=>"title", :index_as=>[:not_searchable])
       }
+      t.title(:proxy=>[:mods, :main_title_info, :main_title], :index_as=>[:displayable, :searchable, :sortable])
       
       t.search_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){
         t.search_title(:path=>'title', :index_as=>[:searchable])
@@ -34,7 +35,6 @@ module Om
           t.lib_collection(:path=>'title', :index_as=>[:facetable, :displayable])
         }
       }
-      t.title(:proxy=>[:mods,:main_title_info,:main_title], :index_as=>[:displayable,:searchable, :sortable])
       t.lib_project(:proxy=>[:project,:project_title_info, :lib_project])
       t.lib_collection(:proxy=>[:collection,:collection_title_info, :lib_collection])
 # pattern matches

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.4.3'
+        VERSION = '0.5.0'
         def self.version
           VERSION
         end

metadata

@@ -1,265 +1,263 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cul_scv_hydra
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
 platform: ruby
-authors: 
+authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cul_image_props
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: blacklight
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: active-fedora
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rubydora
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rubydora
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 5
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hydra-mods
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 0
-        - 4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+- !ruby/object:Gem::Dependency
+  name: hydra-mods
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hydra-head
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: hydra-head
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: om
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: om
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: solrizer
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: solrizer
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 2
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 2
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: equivalent-xml
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rbx-require-relative
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
-        version: 0.0.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: rbx-require-relative
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection
+  Viewer
 email: armintor@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/cul_scv_hydra/access_controls_enforcement.rb
 - lib/cul_scv_hydra/active_fedora/model/aggregator.rb
 - lib/cul_scv_hydra/active_fedora/model/common.rb
@@ -313,36 +311,26 @@ files:
 - config/solr_value_maps.yml
 homepage: https://github.com/cul/cul_scv_hydra
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
 test_files: []
-