stanford-mods 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec8a7a5501522cd7e061ee8c78ad8e9155f09ee
-  data.tar.gz: 279acc503c49653d0edf63d86909fd7b3679efcc
+  metadata.gz: ad8829d81dcdd467e55484dbcad16b10ad129399
+  data.tar.gz: cdd05ca0ef149eb382efca02cb5b0a33e8656dd2
 SHA512:
-  metadata.gz: 7a2239d5219fffa8346568392897d2561f7a0c68307329fa4bdbe72dc5ad5d3f24b9aeb3b3fbc4b1085d26fdb19a0eedadd00c439aa93c1313a3726d3b216a18
-  data.tar.gz: b03a84ad3ae27ebd0b6222959afc534f2468169f1262659d74645107339b9bb21b6168a55c7252b032f000edb4b3c3e8862983adaf5c4475143c39b08899ea62
+  metadata.gz: 0afd49e19a7585bb2bc07b9409479aab2d458cb502d38a3aa356326cbc1bebcb5e7beac8ee0d075307274124826802ff8c6af97f4c7aa2cc8e75a1e349419bb4
+  data.tar.gz: 1eb35fb09de5c39ad6631dc5f8e2676d7aff58b83a10e170035cae7063d6a42432f0bd64a7b81c33392ab3ab3dae2579fea2bb1dd5f34148379c1c8e76686c32

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: rake
 rvm:
-  - ruby-head
   - 2.2.3  # spotlight
   - 2.2.0
   - 2.1.5
@@ -9,9 +8,12 @@ rvm:
   - 1.9.3  # argo, FRDA
   # we used to use jruby for merged DOR + MARC records, but no more ...
   - jruby-head
+  # we also test against ruby-head, which may be unstable.
+  - ruby-head
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - rvm: ruby-head
 
 notifications: false
 sudo: false

data/lib/stanford-mods.rb

@@ -3,6 +3,7 @@ require 'mods'
 require 'stanford-mods/name'
 require 'stanford-mods/searchworks'
 require 'stanford-mods/physical_location'
+require 'stanford-mods/geo_spatial'
 
 # Stanford specific wranglings of MODS metadata as an extension of the Mods::Record object
 module Stanford

data/lib/stanford-mods/geo_spatial.rb

@@ -0,0 +1,46 @@
+# encoding: UTF-8
+require 'logger'
+require 'mods'
+
+# NON-SearchWorks specific wranglings of MODS cartographics metadata
+module Stanford
+  module Mods
+
+    class Record < ::Mods::Record
+
+      def coordinates
+        Array(@mods_ng_xml.subject.cartographics.coordinates).map(&:text)
+      end
+
+      def point_bbox
+        coordinates.map do |n|
+          matches = n.match(/^\(([^)]+)\)\.?$/)
+          next unless matches
+          coord_to_bbox(matches[1])
+        end.compact
+      end
+
+      private
+
+      def coord_to_bbox(coord)
+        lng, lat = coord.split('/')
+
+        min_x, max_x = lng.split('--').map { |x| coord_to_decimal(x) }
+        max_y, min_y = lat.split('--').map { |y| coord_to_decimal(y) }
+        "#{min_x} #{min_y} #{max_x} #{max_y}"
+      end
+
+      def coord_to_decimal(point)
+        regex = /(?<dir>[NESW])\s*(?<deg>\d+)°(?:(?<sec>\d+)ʹ)?/
+        match = regex.match(point)
+        dec = 0
+
+        dec += match['deg'].to_i
+        dec += match['sec'].to_f / 60
+        dec = -1 * dec if match['dir'] == 'W' || match['dir'] == 'S'
+
+        dec
+      end
+    end # class Record
+  end # Module Mods
+end # Module Stanford

data/lib/stanford-mods/name.rb

@@ -45,22 +45,16 @@ module Stanford
         results
       end
 
-      COLLECTOR_ROLE_URI = 'http://id.loc.gov/vocabulary/relators/col'
-
       # @return Array of Strings, each containing the computed display value of a personal name
       #   except for the collector role (see mods gem nom_terminology for display value algorithm)
       # FIXME:  this is broken if there are multiple role codes and some of them are not marcrelator
       def non_collector_person_authors
         result = []
         @mods_ng_xml.personal_name.map do |n|
-          unless n.role.size == 0
-            n.role.each { |r|
-              unless (r.authority.include?('marcrelator') && r.value.include?('Collector')) ||
-                      r.roleTerm.valueURI.first == COLLECTOR_ROLE_URI
-                result << n.display_value_w_date
-              end
-            }
-          end
+          next if n.role.size.zero?
+          n.role.each { |r|
+            result << n.display_value_w_date unless includes_marc_relator_collector_role?(r)
+          }
         end
         result unless result.empty?
       end
@@ -70,18 +64,23 @@ module Stanford
       def collectors_w_dates
         result = []
         @mods_ng_xml.personal_name.each do |n|
-          unless n.role.size == 0
-            n.role.each { |r|
-              if (r.authority.include?('marcrelator') && r.value.include?('Collector')) ||
-                  r.roleTerm.valueURI.first == COLLECTOR_ROLE_URI
-                result << n.display_value_w_date
-              end
-            }
-          end
+          next if n.role.size.zero?
+          n.role.each { |r|
+            result << n.display_value_w_date if includes_marc_relator_collector_role?(r)
+          }
         end
         result unless result.empty?
       end
 
+      COLLECTOR_ROLE_URI = 'http://id.loc.gov/vocabulary/relators/col'
+
+      # @param Nokogiri::XML::Node role_node the role node from a parent name node
+      # @return true if there is a MARC relator collector role assigned
+      def includes_marc_relator_collector_role?(role_node)
+        (role_node.authority.include?('marcrelator') && role_node.value.include?('Collector')) ||
+        role_node.roleTerm.valueURI.first == COLLECTOR_ROLE_URI
+      end
+
     end # class Record
   end # Module Mods
 end # Module Stanford

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

data/spec/geo_spatial_spec.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Cartographic coordinates" do
+
+  let(:smods_rec) { Stanford::Mods::Record.new }
+  let(:no_coord)  do
+    <<-EOF
+      <mods xmlns="#{Mods::MODS_NS}">
+        <subject>
+          <cartographics>
+          <scale>Scale 1:500,000</scale>
+          <coordinates></coordinates>
+          </cartographics>
+        </subject>
+      </mods>
+    EOF
+  end
+  let(:with_coords)  do
+    <<-EOF
+      <mods xmlns="#{Mods::MODS_NS}">
+        <subject>
+          <cartographics>
+          <scale>Scale 1:500,000</scale>
+          <coordinates>(W16°--E28°/N13°--S15°).</coordinates>
+          </cartographics>
+        </subject>
+      </mods>
+    EOF
+  end
+
+  context "coordinates" do
+    it "returns empty array if no coordinates in the mods" do
+      smods_rec.from_str(no_coord)
+      expect(smods_rec.coordinates).to eq([""])
+    end
+    it "returns decimal representation of latitude and longitude" do
+      smods_rec.from_str(with_coords)
+      expect(smods_rec.coordinates).to eq(["(W16°--E28°/N13°--S15°)."])
+    end
+  end
+
+  context "point_bbox" do
+    it "returns empty array if no coordinates in the mods" do
+      smods_rec.from_str(no_coord)
+      expect(smods_rec.point_bbox).to eq([])
+    end
+    it "returns decimal representation of latitude and longitude" do
+      smods_rec.from_str(with_coords)
+      expect(smods_rec.point_bbox).to eq(["-16.0 -15.0 28.0 13.0"])
+    end
+  end
+
+end # describe Cartographic coordinates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -106,11 +106,13 @@ files:
 - Rakefile
 - config/mappings_hash.rb
 - lib/stanford-mods.rb
+- lib/stanford-mods/geo_spatial.rb
 - lib/stanford-mods/name.rb
 - lib/stanford-mods/physical_location.rb
 - lib/stanford-mods/searchworks.rb
 - lib/stanford-mods/searchworks_languages.rb
 - lib/stanford-mods/version.rb
+- spec/geo_spatial_spec.rb
 - spec/name_spec.rb
 - spec/physical_location_spec.rb
 - spec/searchworks_basic_spec.rb
@@ -146,6 +148,7 @@ signing_key:
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata
 test_files:
+- spec/geo_spatial_spec.rb
 - spec/name_spec.rb
 - spec/physical_location_spec.rb
 - spec/searchworks_basic_spec.rb