mods 0.0.21 → 0.0.22

data/README.rdoc

@@ -38,6 +38,8 @@ TODO: Write usage instructions here
 
 == Releases
 
+* <b>0.0.22</b> add displayLabel and lang attributes to every element
+* <b>0.0.21</b> Check for the possibility that name_node.display_value is nil
 * <b>0.0.20</b> added translated_value convenience method to geographicCode  (mods.subject.geographicCode.translated_value)
 * <b>0.0.19</b> term_values and term_value method added to Record object
 * <b>0.0.18</b> <subject><temporal> cannot have subelements

data/lib/mods/name.rb

@@ -5,7 +5,7 @@ module Mods
     CHILD_ELEMENTS = ['namePart', 'displayForm', 'affiliation', 'role', 'description']
         
     # attributes on name node
-    ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + ['type', 'displayLabel', 'usage', 'altRepGroup', 'nameTitleGroup']
+    ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + Mods::LANG_ATTRIBS + ['type', 'displayLabel', 'usage', 'altRepGroup', 'nameTitleGroup']
 
     # valid values for type attribute on name node <name type="val"/>
     TYPES = ['personal', 'corporate', 'conference', 'family']

data/lib/mods/nom_terminology.rb

@@ -2,7 +2,9 @@ module Mods
   
   # from:  http://www.loc.gov/standards/mods/v3/mods-userguide-generalapp.html
   
-  LANG_ATTRIBS = ['lang', 'xml:lang', 'script', 'transliteration']
+  # FIXME: didn't figure out a good way to deal with namespaced attribute for non-namespaced terminology
+#  LANG_ATTRIBS = ['lang', 'xml:lang', 'script', 'transliteration']
+  LANG_ATTRIBS = ['lang', 'script', 'transliteration']
   
   LINKING_ATTRIBS = ['xlink', 'ID']
 
@@ -34,6 +36,9 @@ module Mods
         t._abstract :path => '//m:abstract' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # ACCESS_CONDITION -----------------------------------------------------------------------
@@ -41,6 +46,9 @@ module Mods
         t._accessCondition :path => '//m:accessCondition' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # CLASSIFICATION -------------------------------------------------------------------------
@@ -51,6 +59,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end        
 
         # EXTENSION ------------------------------------------------------------------------------
@@ -68,6 +79,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # IDENTIIER ------------------------------------------------------------------------------
@@ -76,11 +90,20 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.invalid :path => '@invalid', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # LANGUAGE -------------------------------------------------------------------------------
         t.language :path => '/m:mods/m:language'
         t._language :path => '//m:language' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.languageTerm :path => 'm:languageTerm'
           n.code_term :path => 'm:languageTerm[@type="code"]'
           n.text_term :path => 'm:languageTerm[@type="text"]'
@@ -96,6 +119,12 @@ module Mods
         # LOCATION -------------------------------------------------------------------------------
         t.location :path => '/m:mods/m:location'
         t._location :path => '//m:location' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.physicalLocation :path => 'm:physicalLocation' do |e|
             e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
@@ -247,11 +276,20 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # ORIGIN_INFO --------------------------------------------------------------------------
         t.origin_info :path => '/m:mods/m:originInfo'
         t._origin_info :path => '//m:originInfo' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.place :path => 'm:place' do |e|
             e.placeTerm :path => 'm:placeTerm' do |ee|
               ee.type_at :path => '@type', :accessor => lambda { |a| a.text }
@@ -287,6 +325,10 @@ module Mods
           n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
           n.order :path => '@order', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
           # child elements
           n.detail :path => 'm:detail' do |e|
             # attributes
@@ -320,6 +362,12 @@ module Mods
         # PHYSICAL_DESCRIPTION -------------------------------------------------------------------
         t.physical_description :path => '/m:mods/m:physicalDescription'
         t._physical_description :path => '//m:physicalDescription' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.digitalOrigin :path => 'm:digitalOrigin'
           n.extent :path => 'm:extent'
           n.form :path => 'm:form' do |f|
@@ -412,9 +460,15 @@ module Mods
         # SUBJECT -----------------------------------------------------------------------------
         t.subject :path => '/m:mods/m:subject'
         t._subject :path => '//m:subject' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.cartographics :path => 'm:cartographics' do |n1|
             n1.scale :path => 'm:scale'
             n1.projection :path => 'm:projection'
@@ -501,6 +555,9 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.shareable :path => '@shareable', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # TARGET_AUDIENCE -----------------------------------------------------------------------
@@ -510,6 +567,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # TITLE_INFO ----------------------------------------------------------------------------
@@ -589,6 +649,9 @@ module Mods
         t._abstract :path => '//abstract' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # ACCESS_CONDITION -----------------------------------------------------------------------
@@ -596,6 +659,9 @@ module Mods
         t._accessCondition :path => '//accessCondition' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # CLASSIFICATION -------------------------------------------------------------------------
@@ -606,6 +672,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end        
 
         # EXTENSION ------------------------------------------------------------------------------
@@ -623,6 +692,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # IDENTIIER ------------------------------------------------------------------------------
@@ -631,11 +703,20 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.invalid :path => '@invalid', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # LANGUAGE -------------------------------------------------------------------------------
         t.language :path => '/mods/language'
         t._language :path => '//language' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.languageTerm :path => 'languageTerm'
           n.code_term :path => 'languageTerm[@type="code"]'
           n.text_term :path => 'languageTerm[@type="text"]'
@@ -651,6 +732,12 @@ module Mods
         # LOCATION -------------------------------------------------------------------------------
         t.location :path => '/mods/location'
         t._location :path => '//location' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.physicalLocation :path => 'physicalLocation' do |e|
             e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
@@ -801,11 +888,20 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # ORIGIN_INFO --------------------------------------------------------------------------
         t.origin_info :path => '/mods/originInfo'
         t._origin_info :path => '//originInfo' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.place :path => 'place' do |e|
             e.placeTerm :path => 'placeTerm' do |ee|
               ee.type_at :path => '@type', :accessor => lambda { |a| a.text }
@@ -841,6 +937,10 @@ module Mods
           n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
           n.order :path => '@order', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
           # child elements
           n.detail :path => 'detail' do |e|
             # attributes
@@ -874,6 +974,12 @@ module Mods
         # PHYSICAL_DESCRIPTION -------------------------------------------------------------------
         t.physical_description :path => '/mods/physicalDescription'
         t._physical_description :path => '//physicalDescription' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.digitalOrigin :path => 'digitalOrigin'
           n.extent :path => 'extent'
           n.form :path => 'form' do |f|
@@ -966,9 +1072,15 @@ module Mods
         # SUBJECT -----------------------------------------------------------------------------
         t.subject :path => '/mods/subject'
         t._subject :path => '//subject' do |n|
+          # attributes
+          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          # child elements
           n.cartographics :path => 'cartographics' do |n1|
             n1.scale :path => 'scale'
             n1.projection :path => 'projection'
@@ -1055,6 +1167,9 @@ module Mods
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.shareable :path => '@shareable', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # TARGET_AUDIENCE -----------------------------------------------------------------------
@@ -1064,6 +1179,9 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
+          Mods::LANG_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
         end
 
         # TITLE_INFO ----------------------------------------------------------------------------

data/lib/mods/title_info.rb

@@ -5,7 +5,7 @@ module Mods
     CHILD_ELEMENTS = ['title', 'subTitle', 'partNumber', 'partName', 'nonSort']
         
     # attributes on titleInfo node
-    ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + ['type', 'displayLabel', 'supplied', 'usage', 'altRepGroup', 'nameTitleGroup']
+    ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + Mods::LANG_ATTRIBS + ['type', 'displayLabel', 'supplied', 'usage', 'altRepGroup', 'nameTitleGroup']
 
     # valid values for type attribute on titleInfo node <titleInfo type="val">
     TYPES = ['abbreviated', 'translated', 'alternative', 'uniform']

data/lib/mods/version.rb

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

data/spec/record_spec.rb

@@ -112,21 +112,9 @@ describe "Mods::Record" do
       it "should work with an Array of messages passed as the argument" do
         @mods_rec.term_value([:subject, 'topic']).should == 'topic1 topic2 topic3'
       end
-      it "should work with a String passed as the argument" do
-        @mods_rec.term_value('abstract').should == 'single'
-      end
       it "should take a separator argument" 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_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_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_values called with unrecognized argument class:.*NodeSet.*/)
-      end
     end
 
     context "term_values (multiple values)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3106764460292902756
+      hash: 2304160584269815561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3106764460292902756
+      hash: 2304160584269815561
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24