mods 0.0.19 → 0.0.20

data/lib/mods/marc_relator_codes.rb

@@ -1,4 +1,4 @@
-# Represents the Marc Relator Codes mapped to Relators, from http://www.loc.gov/marc/relators/relacode.html
+# Represents the Marc Relator Codes mapped to Relators, from http://www.loc.gov/marc/relators/relacode.html 2012-12
 #  key - Marc Relator code
 #  value - Marc Relator term
 MARC_RELATOR = {

data/lib/mods/nom_terminology.rb

@@ -414,7 +414,15 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
-          n.topic :path => 'm:topic' do |n1|
+          n.cartographics :path => 'm:cartographics' do |n1|
+            n1.scale :path => 'm:scale'
+            n1.projection :path => 'm:projection'
+            n1.coordinates :path => 'm:coordinates'
+            Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
+              n1.send elname, :path => "m:#{elname}"
+            }
+          end
+          n.genre :path => 'm:genre' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
@@ -424,18 +432,31 @@ module Mods
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.temporal :path => 'm:temporal' do |n1|
+          n.geographicCode :path => 'm:geographicCode' do |gc|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              gc.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
-            # date attributes as attributes
-            Mods::DATE_ATTRIBS.each { |attr_name|
-              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            # convenience method
+            gc.translated_value :path => '.', :accessor => lambda { |gc_node| 
+              code_val ||= gc_node.text
+              xval = nil
+              if code_val
+                case gc_node.authority
+                  when 'marcgac'
+                    xval = MARC_GEOGRAPHIC_AREA[code_val]
+                  when 'marccountry'
+                    xval = MARC_COUNTRY[code_val]
+                end
+              end
+              xval
             }
           end
-          n.titleInfo :path => 'm:titleInfo' do |t1|
+          n.hierarchicalGeographic :path => 'm:hierarchicalGeographic' do |n1|
+            Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
+              n1.send elname, :path => "m:#{elname}"
+            }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
           # Note:  'name' is used by Nokogiri
@@ -447,33 +468,26 @@ module Mods
           n.personal_name :path => 'm:name[@type="personal"]'
           n.corporate_name :path => 'm:name[@type="corporate"]'
           n.conference_name :path => 'm:name[@type="conference"]'
-          n.geographicCode :path => 'm:geographicCode' do |g|
+          n.occupation :path => 'm:occupation' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              g.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.genre :path => 'm:genre' do |n1|
+          n.temporal :path => 'm:temporal' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
-          end
-          n.hierarchicalGeographic :path => 'm:hierarchicalGeographic' do |n1|
-            Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
-              n1.send elname, :path => "m:#{elname}"
-            }
-            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+            # date attributes as attributes
+            Mods::DATE_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.cartographics :path => 'm:cartographics' do |n1|
-            n1.scale :path => 'm:scale'
-            n1.projection :path => 'm:projection'
-            n1.coordinates :path => 'm:coordinates'
-            Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
-              n1.send elname, :path => "m:#{elname}"
+          n.titleInfo :path => 'm:titleInfo' do |t1|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.occupation :path => 'm:occupation' do |n1|
+          n.topic :path => 'm:topic' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
@@ -954,9 +968,12 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
-          n.topic :path => 'topic' do |n1|
-            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          n.cartographics :path => 'cartographics' do |n1|
+            n1.scale :path => 'scale'
+            n1.projection :path => 'projection'
+            n1.coordinates :path => 'coordinates'
+            Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
+              n1.send elname, :path => "#{elname}"
             }
           end
           n.geographic :path => 'geographic' do |n1|
@@ -964,18 +981,36 @@ module Mods
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.temporal :path => 'temporal' do |n1|
+          n.genre :path => 'genre' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
-            # date attributes as attributes
-            Mods::DATE_ATTRIBS.each { |attr_name|
-              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          end
+          n.geographicCode :path => 'geographicCode' do |gc|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              gc.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+            # convenience method
+            gc.translated_value :path => '.', :accessor => lambda { |gc_node| 
+              code_val ||= gc_node.text
+              xval = nil
+              if code_val
+                case gc_node.authority
+                  when 'marcgac'
+                    xval = MARC_GEOGRAPHIC_AREA[code_val]
+                  when 'marccountry'
+                    xval = MARC_COUNTRY[code_val]
+                end
+              end
+              xval
             }
           end
-          n.titleInfo :path => 'titleInfo' do |t1|
+          n.hierarchicalGeographic :path => 'hierarchicalGeographic' do |n1|
+            Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
+              n1.send elname, :path => "#{elname}"
+            }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
           # Note:  'name' is used by Nokogiri
@@ -987,33 +1022,26 @@ module Mods
           n.personal_name :path => 'name[@type="personal"]'
           n.corporate_name :path => 'name[@type="corporate"]'
           n.conference_name :path => 'name[@type="conference"]'
-          n.geographicCode :path => 'geographicCode' do |g|
+          n.occupation :path => 'occupation' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              g.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.genre :path => 'genre' do |n1|
+          n.temporal :path => 'temporal' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
-          end
-          n.hierarchicalGeographic :path => 'hierarchicalGeographic' do |n1|
-            Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
-              n1.send elname, :path => "#{elname}"
-            }
-            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+            # date attributes as attributes
+            Mods::DATE_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.cartographics :path => 'cartographics' do |n1|
-            n1.scale :path => 'scale'
-            n1.projection :path => 'projection'
-            n1.coordinates :path => 'coordinates'
-            Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
-              n1.send elname, :path => "#{elname}"
+          n.titleInfo :path => 'titleInfo' do |t1|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.occupation :path => 'occupation' do |n1|
+          n.topic :path => 'topic' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }

data/lib/mods/record.rb

@@ -65,38 +65,9 @@ module Mods
     # @param [String] sep - the separator string to insert between multiple values
     # @return [String] a String representing the value(s) or nil.
     def term_value messages, sep = ' '
-      case messages
-        when Symbol
-          nodes = send(messages)
-        when String
-          nodes = send(messages.to_sym)
-        when Array
-          obj = self
-          messages.each { |msg|
-            if msg.is_a? Symbol
-              obj = obj.send(msg)
-            elsif msg.is_a? String
-              obj = obj.send(msg.to_sym)
-            else
-              raise ArgumentError, "term_value called with Array containing unrecognized class: #{msg.class}, #{messages.inspect}", caller
-            end
-          }
-          nodes = obj
-        else
-          raise ArgumentError, "term_value called with unrecognized argument class: #{messages.class}", caller
-      end
-
-      val = ''
-      if nodes
-        nodes.each { |n| 
-          val << sep + n.text unless n.text.empty?
-        }
-      end
-      val.sub!(sep, '')
-      return nil if val.empty?
-      val
-    rescue NoMethodError
-      raise ArgumentError, "term_value called with unknown argument: #{messages.inspect}", caller
+      vals = term_values messages
+      return nil if !vals
+      val = vals.join sep
     end
 
     # get the values for the terms, as an Array. If there are no values, the result will be nil.

data/lib/mods/version.rb

@@ -1,4 +1,4 @@
 module Mods
   # this is the Ruby Gem version
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/record_spec.rb

@@ -119,13 +119,13 @@ describe "Mods::Record" do
         @mods_rec.term_value(:note, ' -|-').should == 'mult1 -|-mult2'
       end
       it "should raise an error for an unrecognized message symbol" do
-        expect { @mods_rec.term_value(:not_there) }.to raise_error(ArgumentError, "term_value called with unknown argument: :not_there")
+        expect { @mods_rec.term_value(:not_there) }.to raise_error(ArgumentError, "term_values called with unknown argument: :not_there")
       end
       it "should raise an error if the argument is an Array containing non-symbols" do
-        expect { @mods_rec.term_value([:subject, @mods_rec.subject]) }.to raise_error(ArgumentError, /term_value called with Array containing unrecognized class:.*NodeSet.*/)
+        expect { @mods_rec.term_value([:subject, @mods_rec.subject]) }.to raise_error(ArgumentError, /term_values called with Array containing unrecognized class:.*NodeSet.*/)
       end
       it "should raise an error if the argument isn't a Symbol or an Array" do
-        expect { @mods_rec.term_value(@mods_rec.subject) }.to raise_error(ArgumentError, /term_value called with unrecognized argument class:.*NodeSet.*/)
+        expect { @mods_rec.term_value(@mods_rec.subject) }.to raise_error(ArgumentError, /term_values called with unrecognized argument class:.*NodeSet.*/)
       end
     end
 

data/spec/subject_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe "Mods <subject> Element" do
@@ -22,10 +24,6 @@ describe "Mods <subject> Element" do
     pending "to be implemented"
   end
   
-  it "should translate the geographicCodes" do
-    pending "to be implemented"
-  end
-  
   context "subterms for <name> child elements of <subject> element" do
     before(:all) do
       @both_types_sub = @mods_rec.from_str("<mods #{@ns_decl}><subject>
@@ -276,7 +274,29 @@ describe "Mods <subject> Element" do
           @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='fake'>f------</geographicCode></subject></mods>")
           pending "to be implemented"
           expect { @mods_rec.subject.geographicCode.authority }.to raise_error(/no idea/)
-        end    
+        end 
+        context "translated_value convenience method" do
+          it "should be the translation of the code if it is a marcgac code" do
+            @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>")
+            @mods_rec.subject.geographicCode.translated_value.should == ["Estonia"]
+          end
+          it "should be the translation of the code if it is a marccountry code" do
+            @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='marccountry'>mg</geographicCode></subject></mods>")
+            @mods_rec.subject.geographicCode.translated_value.should == ["Madagascar"]
+          end
+          it "should be nil if the code is invalid" do
+            @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>zzz</geographicCode></subject></mods>")
+            @mods_rec.subject.geographicCode.translated_value.size.should == 0
+          end
+          it "should be nil if we don't have a translation for the authority" do
+            @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='iso3166'>zzz</geographicCode></subject></mods>")
+            @mods_rec.subject.geographicCode.translated_value.size.should == 0
+          end
+          it "should work with non-ascii characters" do
+            @mods_rec.from_str("<mods #{@ns_decl}><subject><geographicCode authority='marccountry'>co</geographicCode></subject></mods>")
+            @mods_rec.subject.geographicCode.translated_value.should == ["Curaçao"]
+          end
+        end
       end # <geographicCode>
 
       context "<titleInfo> child element" do
@@ -600,7 +620,29 @@ describe "Mods <subject> Element" do
           @mods_rec.from_str("<mods><subject><geographicCode authority='fake'>f------</geographicCode></subject></mods>", false)
           pending "to be implemented"
           expect { @mods_rec.subject.geographicCode.authority }.to raise_error(/no idea/)
-        end    
+        end
+        context "translated_value convenience method" do
+          it "should be the translation of the code if it is a marcgac code" do
+            @mods_rec.from_str("<mods><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>", false)
+            @mods_rec.subject.geographicCode.translated_value.should == ["Estonia"]
+          end
+          it "should be the translation of the code if it is a marccountry code" do
+            @mods_rec.from_str("<mods><subject><geographicCode authority='marccountry'>mg</geographicCode></subject></mods>", false)
+            @mods_rec.subject.geographicCode.translated_value.should == ["Madagascar"]
+          end
+          it "should be empty if the code is invalid" do
+            @mods_rec.from_str("<mods><subject><geographicCode authority='marcgac'>zzz</geographicCode></subject></mods>", false)
+            @mods_rec.subject.geographicCode.translated_value.size.should == 0
+          end
+          it "should be empty if we don't have a translation for the authority" do
+            @mods_rec.from_str("<mods><subject><geographicCode authority='iso3166'>zzz</geographicCode></subject></mods>", false)
+            @mods_rec.subject.geographicCode.translated_value.size.should == 0
+          end
+          it "should work with non-ascii characters" do
+            @mods_rec.from_str("<mods><subject><geographicCode authority='marccountry'>co</geographicCode></subject></mods>", false)
+            @mods_rec.subject.geographicCode.translated_value.should == ["Curaçao"]
+          end
+        end
       end # <geographicCode>
 
       context "<titleInfo> child element" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -193,6 +193,8 @@ files:
 - Rakefile
 - lib/mods.rb
 - lib/mods/constants.rb
+- lib/mods/marc_country_codes.rb
+- lib/mods/marc_geo_area_codes.rb
 - lib/mods/marc_relator_codes.rb
 - lib/mods/name.rb
 - lib/mods/nom_terminology.rb
@@ -230,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -103128391758447050
+      hash: 2201065419699116164
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -103128391758447050
+      hash: 2201065419699116164
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24