discovery-indexer 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7839ece7ccc93abe604fbc2e88c7735da73e3593
-  data.tar.gz: 5713715eac6372293c4e7c50cf4169b3566c873e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDQ4YTI0MTZjODIzZWI4Y2QwZDY0MjVlMDExNDk4MmViZTJlMzU0NA==
+  data.tar.gz: !binary |-
+    YzU3ZjE0YTlhNGE5M2MzYzI1NzE3ZDc0YjdlMTI2OTFhNTcyZWI5NQ==
 SHA512:
-  metadata.gz: 980c089b86b8dc005f92e858e3a2eec5f64cbad358510432241928db201fd452511581f71aa57b42d2f124d143f9e43c344ce4072f49568629801a1da31e55d5
-  data.tar.gz: ded188f8a0d2b06c3702c89070af6000c7d943fb98f3ce35d3cf4189a708acfcc5ce69de8fb213128490dd6927ed47589d5dc5203b6d2bf387425c701636af08
+  metadata.gz: !binary |-
+    ZWEwOGJiZjNkMjI1YmI2ZmExNDBhYzVhMWY0MWNhM2Y2NDhjZWI3YTJiZmNm
+    MWNhMjlkNjUzYmIyNmNhYTkzNjI5NzJiZGM5NDM2MDQwMjhmYzYwNTU5YzYw
+    NGFkMzBiZjA1YjBhNGI4OWNlMjc3YjczY2RlZjA2MWIzMTA1ODQ=
+  data.tar.gz: !binary |-
+    ZGM0YmI3MDM1OWJlMzQxN2FjMmM1ZjYxZTUxNDMwNjRjYmEyMTkyY2IyMDI3
+    YzdmY2M5OWEwNWM4MDMwNzMyMGIwY2IwZDc5ZDUxMTE1MzA0ZmM5ODRlODFi
+    NDNlODVmODg0YTJmMjRmNWQwMTZlNGRlNTYxNTk2OTdmZjhkODc=

data/lib/reader/purlxml_model.rb

@@ -79,7 +79,11 @@ module DiscoveryIndexer
       # @!attribute [rw] use_and_reproduction
       # @return [String] the use and reproduction statement from rights metadata
       attr_accessor :use_and_reproduction
-      
+
+      # @!attribute [rw] source_id
+      # @return [String] the sourceid from identity metadata
+      attr_accessor :source_id
+            
     end
   end
 end

data/lib/reader/purlxml_parser_strict.rb

@@ -31,6 +31,7 @@ module DiscoveryIndexer
         purlxml_model.label             = parse_label()
         purlxml_model.copyright         = parse_copyright()
         purlxml_model.use_and_reproduction = parse_use_and_reproduction()
+        purlxml_model.source_id  = parse_sourceid()
         return purlxml_model
       end
       
@@ -169,17 +170,17 @@ module DiscoveryIndexer
           ids
         end
       end
-      
+
+      def parse_sourceid
+        get_value(@purlxml_ng_doc.css('//identityMetadata/sourceId'))
+      end
+            
       def parse_copyright
-        node=@purlxml_ng_doc.css('//rightsMetadata/copyright/human[type="copyright"]')
-        copyright_text = node.first.content if node && node.first
-        return copyright_text
+        get_value(@purlxml_ng_doc.css('//rightsMetadata/copyright/human[type="copyright"]'))
       end
   
       def parse_use_and_reproduction
-        node=@purlxml_ng_doc.css('//rightsMetadata/use/human[type="useAndReproduction"]')
-        use_text = node.first.content if node && node.first
-        return use_text
+        get_value(@purlxml_ng_doc.css('//rightsMetadata/use/human[type="useAndReproduction"]'))
       end
       
       # the @id attribute of resource/file elements, including extension
@@ -198,27 +199,23 @@ module DiscoveryIndexer
       
       # @return catkey value from the DOR identity_metadata, or nil if there is no catkey
       def parse_catkey
-        catkey = nil
-        node = @purlxml_ng_doc.xpath("/publicObject/identityMetadata/otherId[@name='catkey']") 
-        catkey = node.first.content if node && node.first
-        return catkey
+        get_value(@purlxml_ng_doc.xpath("/publicObject/identityMetadata/otherId[@name='catkey']"))
       end
 
       # @return barcode value from the DOR identity_metadata, or nil if there is no barcode
       def parse_barcode
-        barcode = nil
-        node = @purlxml_ng_doc.xpath("/publicObject/identityMetadata/otherId[@name='barcode']")
-        barcode = node.first.content if node && node.first
-        return barcode
+        get_value(@purlxml_ng_doc.xpath("/publicObject/identityMetadata/otherId[@name='barcode']"))
       end
 
       # @return objectLabel value from the DOR identity_metadata, or nil if there is no barcode
       def parse_label
-        label = nil
-        node = @purlxml_ng_doc.xpath("/publicObject/identityMetadata/objectLabel")
-        label = node.first.content if node && node.first
-        return label
+        get_value(@purlxml_ng_doc.xpath("/publicObject/identityMetadata/objectLabel"))
       end
+      
+      def get_value(node)
+        (node && node.first) ? node.first.content : nil 
+      end
+      
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DiscoveryIndexer
-    VERSION = '0.4'
+    VERSION = '0.5'
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: discovery-indexer
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Ahmed AlSum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stanford-mods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This library manages the core operations for the discovery indexing such
@@ -140,7 +140,6 @@ files:
 - lib/reader/purlxml_parser.rb
 - lib/reader/purlxml_parser_strict.rb
 - lib/reader/purlxml_reader.rb
-- lib/utilities/extract_sub_targets.rb
 - lib/version.rb
 - lib/writer/solr_client.rb
 - lib/writer/solr_writer.rb
@@ -154,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Shared library for the basic discovery indexing operation for Stanford DLSS.

data/lib/utilities/extract_sub_targets.rb

@@ -1,13 +0,0 @@
-module DiscoveryIndexer
-  module Utilities
-    class ExtractSubTargets
-      
-      def self.by_name target_name, release_tags
-        if release_tags.keys.include?(target_name) then
-          return release_tags[target_name]
-        end
-      end
-      
-    end
-  end
-end