mods 0.0.4 → 0.0.5

data/README.rdoc

@@ -37,6 +37,7 @@ TODO: Write usage instructions here
 
 == Releases
 
+0.0.5 implement subject, change a few constants
 0.0.4 implement language, location, origin_info, physical_description
 0.0.3 use nom-xml gem and make this more nokogiri-ish; implement name, title, and simple top level elements with no subelements
 0.0.2 Set up rake tasks, publishing rdoc, and continuous integration.

data/lib/mods.rb

@@ -1,9 +1,10 @@
 require 'mods/constants'
+require 'mods/nom_terminology'
 require 'mods/marc_relator_codes'
 require 'mods/name'
-require 'mods/nom_terminology'
 require 'mods/reader'
 require 'mods/record'
+require 'mods/subject'
 require 'mods/title_info'
 require 'mods/version'
 

data/lib/mods/name.rb

@@ -2,11 +2,10 @@ module Mods
 
   class Name
 
-    NS_HASH = {'m' => MODS_NS_V3}
-    SUBELEMENTS = ['namePart', 'displayForm', 'affiliation', 'role', 'description']
+    CHILD_ELEMENTS = ['namePart', 'displayForm', 'affiliation', 'role', 'description']
         
     # attributes on name node
-    ATTRIBUTES = ['type', 'authority', 'authorityURI', 'valueURI', 'displayLabel', 'usage', 'altRepGroup', 'nameTitleGroup']
+    ATTRIBUTES = Mods::AUTHORITY_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

@@ -1,5 +1,19 @@
 module Mods
   
+  # from:  http://www.loc.gov/standards/mods/v3/mods-userguide-generalapp.html
+  
+  LANG_ATTRIBS = ['lang', 'xml:lang', 'script', 'transliteration']
+  
+  LINKING_ATTRIBS = ['xlink', 'ID']
+
+  DATE_ATTRIBS = ['encoding', 'point', 'keyDate', 'qualifier']
+  ENCODING_ATTRIB_VALUES = ['w3cdtf', 'iso8601', 'marc']
+  POINT_ATTRIB_VALUES = ['start', 'end']
+  KEY_DATE_ATTRIB_VALUEs = ['yes']
+  QUALIFIER_ATTRIB_VALUES = ['approximate', 'inferred', 'questionable']
+  
+  AUTHORITY_ATTRIBS = ['authority', 'authorityURI', 'valueURI']
+
   class Record
     
     # set the NOM terminology;  do NOT use namespaces
@@ -18,15 +32,23 @@ module Mods
         # note - titleInfo can be a top level element or a sub-element of relatedItem 
         #   (<titleInfo> as subelement of <subject> is not part of the MODS namespace)
         
-        t.title_info :path => '/mods/titleInfo' do |n|
-          n.type_at :path => '@type'
+        t.title_info :path => '/mods/titleInfo'
+        
+        t._title_info :path => '//titleInfo' do |n|
+          Mods::TitleInfo::ATTRIBUTES.each { |attr_name|
+            if attr_name != 'type'
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            else
+              n.type_at :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            end
+          }          
           n.title :path => 'title'
           n.subTitle :path => 'subTitle'
           n.nonSort :path => 'nonSort'
           n.partNumber :path => 'partNumber'
           n.partName :path => 'partName'
           n.sort_title :path => '.', :accessor => lambda { |node| 
-            if node.type_at.text != "alternative" || (node.type_at.text == "alternative" && mods_ng_xml.xpath('/mods/titleInfo').size == 1)
+            if node.type_at != "alternative" || (node.type_at == "alternative" && mods_ng_xml.xpath('/mods/titleInfo').size == 1)
               node.title.text + (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" ) 
             end
           }
@@ -36,13 +58,13 @@ module Mods
              (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" ) 
           }
           n.short_title :path => '.', :accessor => lambda { |node|  
-            if node.type_at.text != "alternative"
+            if node.type_at != "alternative"
               (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) + 
               node.title.text
             end
           }
           n.alternative_title :path => '.', :accessor => lambda { |node|  
-            if node.type_at.text == "alternative"
+            if node.type_at == "alternative"
               (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) + 
               node.title.text
             end
@@ -57,8 +79,9 @@ module Mods
 
 
         # NAME ------------------------------------------------------------------------------------
+        t.plain_name :path => '/mods/name'
 
-        t.plain_name :path => '/mods/name' do |n|
+        t._plain_name :path => '//name' do |n|
           
           Mods::Name::ATTRIBUTES.each { |attr_name|
             if attr_name != 'type'
@@ -163,6 +186,77 @@ module Mods
           end
         end
         
+        # SUBJECT -----------------------------------------------------------------------------
+        t.subject :path => '/mods/subject' do |n|
+          Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+            n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+          }
+          n.topic :path => 'topic' do |n|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.geographic :path => 'geographic' do |n|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.temporal :path => 'temporal' do |n|
+            n.encoding :path => 'encoding'
+            n.point :path => 'point'
+            n.keyDate :path => 'keyDate'
+            n.qualifier :path => 'qualifier'
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+            Mods::DATE_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.titleInfo :path => 'titleInfo' do |t|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              t.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          # Note:  'name' is used by Nokogiri
+          n.name_ :path => 'name' do |t|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              t.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.geographicCode :path => 'geographicCode' do |g|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              g.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.genre :path => 'genre' do |n|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.hierarchicalGeographic :path => 'hierarchicalGeographic' do |n|
+            Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
+              n.send elname, :path => "#{elname}"
+            }
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+          n.cartographics :path => 'cartographics' do |n|
+            n.scale :path => 'scale'
+            n.projection :path => 'projection'
+            n.coordinates :path => 'coordinates'
+            Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
+              n.send elname, :path => "#{elname}"
+            }
+          end
+          n.occupation :path => 'occupation' do |n|
+            Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+            }
+          end
+        end
+        
       end # terminology
 
       mods_ng_xml.nom!

data/lib/mods/subject.rb

@@ -0,0 +1,18 @@
+module Mods
+
+  class Subject
+
+    CHILD_ELEMENTS = ['topic', 'geographic', 'temporal', 'titleInfo', 'name', 'genre', 'hierarchicalGeographic', 'cartographics', 'geographicCode', 'occupation']
+        
+    # attributes on subject node
+    ATTRIBUTES = Mods::LANG_ATTRIBS + Mods::LINKING_ATTRIBS + ['authority']
+    
+    HIER_GEO_CHILD_ELEMENTS = ['continent', 'country', 'province', 'region', 'state', 'territory', 'county', 'city', 'citySection', 'island', 'area', 'extraterrestrialArea']
+  
+    CARTOGRAPHICS_CHILD_ELEMENTS = ['coordinates', 'scale', 'projection']
+    
+    GEO_CODE_AUTHORITIES = ['marcgac, marccountry, iso3166']
+    
+  end
+  
+end

data/lib/mods/title_info.rb

@@ -1,19 +1,19 @@
 module Mods
-  # NAOMI_MUST_COMMENT_THIS_CLASS
+
   class TitleInfo
-#    attr_reader :ng_node
     
-    NS_HASH = {'m' => MODS_NS_V3}
-    SUBELEMENTS = ['title', 'subTitle', 'partNumber', 'partName', 'nonSort']
+    CHILD_ELEMENTS = ['title', 'subTitle', 'partNumber', 'partName', 'nonSort']
         
     # attributes on titleInfo node
-    ATTRIBUTES = ['type', 'authority', 'authorityURI', 'valueURI', 'displayLabel', 'supplied', 'usage', 'altRepGroup', 'nameTitleGroup']
+    ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + ['type', 'displayLabel', 'supplied', 'usage', 'altRepGroup', 'nameTitleGroup']
 
     # valid values for type attribute on titleInfo node <titleInfo type="val">
     TYPES = ['abbreviated', 'translated', 'alternative', 'uniform']
     
     DEFAULT_TITLE_DELIM = ' '
     
+#    attr_reader :ng_node
+
     # @param (Nokogiri::XML::Node) mods:titleInfo node
 #    def initialize(title_info_node)
 #      @ng_node = title_info_node

data/lib/mods/version.rb

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

data/spec/name_spec.rb

@@ -27,7 +27,7 @@ describe "Mods <name> Element" do
   context "personal name" do
     
     it "should recognize child elements" do
-      Mods::Name::SUBELEMENTS.reject{|e| e == "role"}.each { |e|
+      Mods::Name::CHILD_ELEMENTS.reject{|e| e == "role"}.each { |e|
         @mods_rec.from_str("<mods><name type='personal'><#{e}>oofda</#{e}></name></mods>")
         if e == 'description'
           @mods_rec.personal_name.description_el.text.should == 'oofda'
@@ -161,7 +161,7 @@ describe "Mods <name> Element" do
     end
     
     it "should recognize child elements" do
-      Mods::Name::SUBELEMENTS.reject{|e| e == "role" }.each { |e|
+      Mods::Name::CHILD_ELEMENTS.reject{|e| e == "role" }.each { |e|
         @mods_rec.from_str("<mods><name type='corporate'><#{e}>oofda</#{e}></name></mods>")
         if e == 'description'
           @mods_rec.corporate_name.description_el.text.should == 'oofda'
@@ -204,7 +204,7 @@ describe "Mods <name> Element" do
   context "(plain) <name> element terminology pieces" do
 
     it "should recognize child elements" do
-      Mods::Name::SUBELEMENTS.reject{|e| e == "role"}.each { |e|
+      Mods::Name::CHILD_ELEMENTS.reject{|e| e == "role"}.each { |e|
         @mods_rec.from_str("<mods><name><#{e}>oofda</#{e}></name></mods>")
         if e == 'description'
           @mods_rec.plain_name.description_el.text.should == 'oofda'
@@ -225,7 +225,7 @@ describe "Mods <name> Element" do
       }
     end
     
-    context "namePart subelement" do
+    context "namePart child element" do
       it "should recognize type attribute on namePart element" do
         Mods::Name::NAME_PART_TYPES.each { |t|  
           @mods_rec.from_str("<mods><name><namePart type='#{t}'>hi</namePart></name></mods>")
@@ -234,7 +234,7 @@ describe "Mods <name> Element" do
       end
     end
     
-    context "role subelement" do
+    context "role child element" do
       it "should get role type" do
         @mods_rec.from_str(@mods_w_pers_name_role)
         @mods_rec.plain_name.role.type_at.should == ["text"]

data/spec/subject_spec.rb

@@ -0,0 +1,440 @@
+require 'spec_helper'
+
+describe "Mods <subject> Element" do
+  before(:all) do
+    @mods_rec = Mods::Record.new
+  end
+
+  it "should do something intelligent with duplicate values" do
+    pending "to be implemented"
+  end
+
+  it "should do some date parsing of temporal element based on encoding" do
+    pending "to be implemented"
+  end
+  
+  it "authority designation on the <subject> element should trickle down to child elements" do
+    pending "to be implemented"
+  end
+  
+  it "should subject personal name dates should be cleaned up???" do
+    pending "to be implemented"
+  end
+  
+  it "should translate the geographicCodes" do
+    pending "to be implemented"
+  end
+
+  context "names" do
+    before(:all) do
+      @both_types = @mods_rec.from_str('<mods><subject>
+                   <name type="personal">
+                     <namePart>Bridgens, R.P</namePart>
+                   </name>
+                 </subject><subject authority="lcsh">
+                    <name type="corporate">
+                      <namePart>Britton &amp; Rey.</namePart>
+                    </name>
+                  </subject></mods>').subject.name
+      @pers_name = @mods_rec.from_str('<mods><subject>
+                  <name type="personal" authority="ingest">
+                      <namePart type="family">Edward VI , king of England, </namePart>
+                      <displayForm>Edward VI , king of England, 1537-1553</displayForm>
+                  </name></subject></mods>').subject.name
+      @mult_pers_name = @mods_rec.from_str('<mods><subject authority="lcsh">
+                   <name type="personal">
+                     <namePart>Baker, George H</namePart>
+                     <role>
+                       <roleTerm type="text">lithographer.</roleTerm>
+                     </role>
+                   </name>
+                 </subject><subject>
+                   <name type="personal">
+                     <namePart>Beach, Ghilion</namePart>
+                     <role>
+                       <roleTerm type="text">publisher.</roleTerm>
+                     </role>
+                   </name>
+                 </subject><subject>
+                   <name type="personal">
+                     <namePart>Bridgens, R.P</namePart>
+                   </name>
+                 </subject><subject authority="lcsh">
+                   <name type="personal">
+                     <namePart>Couts, Cave Johnson</namePart>
+                     <namePart type="date">1821-1874</namePart>
+                   </name>
+                 </subject><subject authority="lcsh">
+                   <name type="personal">
+                     <namePart>Kuchel, Charles Conrad</namePart>
+                     <namePart type="date">b. 1820</namePart>
+                   </name>
+                 </subject><subject authority="lcsh">
+                   <name type="personal">
+                     <namePart>Nahl, Charles Christian</namePart>
+                     <namePart type="date">1818-1878</namePart>
+                   </name>
+                 </subject><subject authority="lcsh">
+                   <name type="personal">
+                     <namePart>Swasey, W. F. (William F.)</namePart>
+                   </name></subject></mods>').subject.name
+      @mult_corp_name = @mods_rec.from_str('<mods><subject authority="lcsh">
+                   <name type="corporate">
+                     <namePart>Britton &amp; Rey.</namePart>
+                   </name>
+                 </subject><subject>
+                   <name type="corporate">
+                     <namePart>Gray (W. Vallance) &amp; C.B. Gifford,</namePart>
+                     <role>
+                       <roleTerm type="text">lithographers.</roleTerm>
+                     </role>
+                   </name></subject></mods>').subject.name
+    end
+    it "should be able to identify corporate names" do
+      pending "to be implemented"
+    end
+    it "should be able to identify personal names" do
+      pending "to be implemented"
+    end
+    it "should be able to identify roles associated with a name" do
+      pending "to be implemented"
+    end
+    it "should be able to identify dates associated with a name" do
+      pending "to be implemented"
+    end
+    it "should do the appropriate thing with the role for the value of a name" do
+      pending "to be implemented"
+    end
+    it "should do the appropriate thing with the date for the value of a name" do
+      pending "to be implemented"
+    end
+  end
+
+  context "basic subject terminology pieces" do
+    before(:all) do
+      @four_subjects = @mods_rec.from_str('<mods><subject authority="lcsh">
+           <geographic>San Francisco (Calif.)</geographic>
+           <topic>History</topic>
+           <genre>Pictorial works</genre>
+         </subject>
+         <subject authority="lcsh">
+           <geographic>San Diego (Calif.)</geographic>
+           <topic>History</topic>
+           <genre>Pictorial works</genre>
+         </subject>
+         <subject authority="lcsh">
+           <topic>History</topic>
+           <genre>Pictorial works</genre>
+         </subject>
+         <subject authority="lcsh">
+           <geographic>San Luis Rey (Calif.)</geographic>
+           <genre>Pictorial works</genre>
+         </subject></mods>').subject
+      @geo_code_subject = @mods_rec.from_str('<mods><subject>
+                <geographicCode authority="marcgac">f------</geographicCode></subject></mods>').subject
+      @lcsh_subject = @mods_rec.from_str('<mods><subject authority="lcsh">
+                <geographic>Africa</geographic>
+                <genre>Maps</genre>
+                <temporal>500-1400</temporal></subject></mods>').subject              
+    end
+    
+    it "should be a NodeSet" do
+      @four_subjects.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      @lcsh_subject.should be_an_instance_of(Nokogiri::XML::NodeSet)
+    end
+    it "should have as many members as there are <subject> elements in the xml" do
+      @four_subjects.size.should == 4
+      @lcsh_subject.size.should == 1
+    end
+    it "should recognize authority attribute on <subject> element" do
+      ['lcsh', 'ingest', 'lctgm'].each { |a| 
+        @mods_rec.from_str("<mods><subject authority='#{a}'><topic>Ruler, English.</topic></subject></mods>").subject.authority.should == [a]
+      }
+    end
+    
+    context "<topic> child element" do
+      before(:all) do
+        topic = '<mods><subject authority="lcsh"><topic>History</topic></subject></mods>'
+        @topic_simple = @mods_rec.from_str(topic).subject.topic
+        multi_topic = '<mods><subject>
+              <topic>California as an island--Maps--1662?</topic>
+              <topic>North America--Maps--To 1800</topic>
+              <topic>North America--Maps--1662?</topic>
+            </subject></mods>'
+        @multi_topic = @mods_rec.from_str(multi_topic).subject.topic
+      end
+      it "should be a NodeSet" do
+        @topic_simple.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @multi_topic.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "topic NodeSet should have as many Nodes as there are <topic> elements in the xml" do
+        @topic_simple.size.should == 1
+        @multi_topic.size.should == 3
+        @four_subjects.topic.size.should == 3
+        @geo_code_subject.topic.size.should == 0
+      end
+      it "text should get element value" do
+        @topic_simple.text.should == "History"
+        @multi_topic.text.should include("California as an island--Maps--1662?")
+        @multi_topic.text.should include("North America--Maps--To 1800")
+        @multi_topic.text.should include("North America--Maps--1662?")
+        @four_subjects.topic.text.should include("History")
+      end
+    end # <topic>
+    
+    context "<geographic> child element" do
+      it "should be a NodeSet" do
+        @four_subjects.geographic.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @lcsh_subject.geographic.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @geo_code_subject.geographic.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "geographic NodeSet should have as many Nodes as there are <geographic> elements in the xml" do
+        @four_subjects.geographic.size.should == 3
+        @lcsh_subject.geographic.size.should == 1
+        @geo_code_subject.geographic.size.should == 0
+      end
+      it "text should get element value" do
+        @four_subjects.geographic.text.should include("San Francisco (Calif.)")
+        @four_subjects.geographic.text.should include("San Diego (Calif.)")
+        @four_subjects.geographic.text.should include("San Luis Rey (Calif.)")
+      end
+      it "should not include <geographicCode> element" do
+        @geo_code_subject.geographic.size.should == 0
+      end
+    end # <geographic>
+    
+    context "<temporal> child element" do
+      before(:all) do
+        @temporal = @mods_rec.from_str('<mods><subject>
+                  <temporal encoding="iso8601">20010203T040506+0700</temporal>
+                  <!-- <temporal encoding="iso8601">197505</temporal> -->
+                </subject></mods>').subject.temporal        
+      end
+      
+      it "should recognize the date attributes" do
+        @temporal.encoding.should == ['iso8601']
+        Mods::DATE_ATTRIBS.each { |a| 
+          @mods_rec.from_str("<mods><subject><temporal #{a}='val'>now</temporal></subject></mods>").subject.temporal.send(a.to_sym).should == ['val']
+        }
+      end
+      it "should be a NodeSet" do
+        @lcsh_subject.temporal.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @temporal.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "temporal NodeSet should have as many Nodes as there are <temporal> elements in the xml" do
+        @lcsh_subject.temporal.size.should == 1
+        @temporal.size.should == 1
+      end
+      it "text should get element value" do
+        @lcsh_subject.temporal.map { |n| n.text }.should == ['500-1400']
+        @temporal.map { |n| n.text }.should == ['20010203T040506+0700']
+      end
+    end # <temporal>
+    
+    context "<genre> child element" do
+      it "should be a NodeSet" do
+        @lcsh_subject.genre.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @four_subjects.genre.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "genre NodeSet should have as many Nodes as there are <genre> elements in the xml" do
+        @lcsh_subject.genre.size.should == 1
+        @four_subjects.genre.size.should == 4
+      end
+      it "text should get element value" do
+        @lcsh_subject.genre.map { |n| n.text }.should == ['Maps']
+        @four_subjects.genre.map { |n| n.text }.should include("Pictorial works")
+      end
+    end # <genre>
+    
+    context "<geographicCode> child element" do
+      it "should be a NodeSet" do
+        @geo_code_subject.geographicCode.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "cartographics NodeSet should have as many Nodes as there are <geographicCode> elements in the xml" do
+        @geo_code_subject.geographicCode.size.should == 1
+      end
+      it "text should get element value" do
+        @geo_code_subject.geographicCode.map { |n| n.text }.should == ['f------']
+      end
+      it "should recognize authority attributes" do
+        Mods::AUTHORITY_ATTRIBS.each { |a|  
+          @mods_rec.from_str("<mods><subject><geographicCode #{a}='attr_val'>f------</geographicCode></subject></mods>")
+          @mods_rec.subject.geographicCode.send(a.to_sym).should == ['attr_val']
+        }
+      end
+      it "should recognize the sanctioned authorities" do
+        Mods::Subject::GEO_CODE_AUTHORITIES.each { |a|  
+          @mods_rec.from_str("<mods><subject><geographicCode authority='#{a}'>f------</geographicCode></subject></mods>")
+          @mods_rec.subject.geographicCode.authority.should == [a]
+        }
+      end
+      it "should not recognize unsanctioned authorities?" do
+        @mods_rec.from_str("<mods><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 # <geographicCode>
+    
+    context "<titleInfo> child element" do
+      before(:all) do
+        @title_info = @mods_rec.from_str('<mods><subject>
+          <titleInfo>
+            <nonSort>The</nonSort>
+            <title>Olympics</title>
+            <subTitle>a history</subTitle>
+          </titleInfo>
+        </subject></mods>').subject.titleInfo
+      end
+      it "should understand all attributes allowed on a <titleInfo> element" do
+        Mods::TitleInfo::ATTRIBUTES.each { |a|
+          ti = @mods_rec.from_str("<mods><subject><titleInfo #{a}='attr_val'>THE</titleInfo></subject></mods>").subject.titleInfo
+          if (a == 'type')
+            ti.type_at.should == ['attr_val']
+          else
+            ti.send(a.to_sym).should == ['attr_val']
+          end
+        }
+      end
+      it "should understand all immediate child elements allowed on a <titleInfo> element" do
+        Mods::TitleInfo::CHILD_ELEMENTS.each { |e|  
+          @mods_rec.from_str("<mods><subject><titleInfo><#{e}>el_val</#{e}></titleInfo></subject></mods>").subject.titleInfo.send(e.to_sym).text.should == 'el_val'
+        }
+        @title_info.nonSort.map {|n| n.text}.should == ["The"]
+      end
+      
+      it "should recognize authority attribute on the <titleInfo> element" do
+        @mods_rec.from_str('<mods><subject>
+          	<titleInfo type="uniform" authority="naf">
+          	  	<title>Missale Carnotense</title>
+          	</titleInfo></subject></mods>').subject.titleInfo.authority.should == ["naf"]
+      end
+    end # <titleInfo>
+    
+    context "<name> child element" do
+      it "should understand all attributes allowed on a <name> element" do
+        Mods::Name::ATTRIBUTES.each { |a|
+          name = @mods_rec.from_str("<mods><subject><name #{a}='attr_val'>Obadiah</name></subject></mods>").subject.name_
+          if (a == 'type')
+            name.type_at.should == ['attr_val']
+          else
+            name.send(a.to_sym).should == ['attr_val']
+          end
+        }
+      end
+      it "should understand all immediate child elements allowed on a <name> element" do
+        Mods::Name::CHILD_ELEMENTS.each { |e|  
+          name = @mods_rec.from_str("<mods><subject><name><#{e}>el_val</#{e}></name></subject></mods>").subject.name_
+          if (e == 'description')
+            name.description_el.text.should == 'el_val'
+          elsif (e != 'role')
+            name.send(e.to_sym).text.should == 'el_val'
+          end
+        }
+      end
+      it "should recognize authority attribute on the <name> element" do
+        @mods_rec.from_str('<mods><subject>
+           <name type="personal" authority="lcsh">
+             <namePart>Nahl, Charles Christian</namePart>
+             <namePart type="date">1818-1878</namePart>
+           </name></mods>').subject.name_.authority.should == ["lcsh"]
+      end
+    end # <name>
+     
+    context "<hiearchicalGeographic> child element" do
+      it "should recognize authority attributes" do
+        Mods::AUTHORITY_ATTRIBS.each { |a|  
+          @mods_rec.from_str("<mods><subject><hierarchicalGeographic #{a}='attr_val'><country>Albania</country></hierarchicalGeographic></subject></mods>")
+          @mods_rec.subject.hierarchicalGeographic.send(a.to_sym).should == ['attr_val']
+        }
+      end
+      it "should recognize allowed child elements" do
+        Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |e|  
+          @mods_rec.from_str("<mods><subject><hierarchicalGeographic><#{e}>el_val</#{e}></hierarchicalGeographic></subject></mods>")
+          @mods_rec.subject.hierarchicalGeographic.send(e.to_sym).text.should == 'el_val'
+        }
+        Mods::Subject::HIER_GEO_CHILD_ELEMENTS.size.should == 12
+      end
+    end # <hierarchicalGeographic>
+    
+    context "<cartographics> child element" do
+      before(:all) do
+        @carto_scale = @mods_rec.from_str('<mods><subject>
+                  <cartographics>
+                    <scale>[ca.1:90,000,000], [173</scale>
+                  </cartographics>
+                </subject></mods>').subject.cartographics
+        @carto_empties = @mods_rec.from_str('<mods><subject authority="">
+                   <cartographics>
+                     <scale/>
+                     <coordinates>W1730000 W0100000 N840000 N071000</coordinates>
+                     <projection/>
+                   </cartographics>
+                 </subject></mods>').subject.cartographics
+        @multi_carto = @mods_rec.from_str('<mods><subject>
+                    <cartographics>
+                       <coordinates>W0180000 E0510000 N370000 S350000</coordinates>
+                    </cartographics>
+                 </subject><subject>
+                    <cartographics>
+                       <scale>Scale [ca. 1:50,000,000]</scale>
+                    </cartographics>
+                    <cartographics>
+                       <coordinates>(W18&#xB0;--E51&#xB0;/N37&#xB0;--S35&#xB0;).</coordinates>
+                    </cartographics>
+                 </subject></mods>').subject.cartographics
+      end
+      it "should be a NodeSet" do
+        @carto_scale.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @carto_empties.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @multi_carto.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "cartographics NodeSet should have as many Nodes as there are <cartographics> elements in the xml" do
+        @carto_scale.size.should == 1
+        @carto_empties.size.should == 1
+        @multi_carto.size.should == 3
+      end
+      it "should recognize allowed child elements" do
+        Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |e|  
+          @mods_rec.from_str("<mods><subject><cartographics><#{e}>el_val</#{e}></cartographics></subject></mods>")
+          @mods_rec.subject.cartographics.send(e.to_sym).text.should == 'el_val'
+        }
+        Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.size.should == 3
+      end
+      it "should get the number of populated <coordinates> elements for coordinates term" do
+        @multi_carto.coordinates.size == 2
+      end
+      it "should be able to get the value of populated elements" do
+        @carto_scale.scale.map { |n| n.text }.should == ['[ca.1:90,000,000], [173']
+        @carto_empties.coordinates.map { |n| n.text }.should == ['W1730000 W0100000 N840000 N071000']
+      end
+      it "should get the empty string for empty elements?" do
+        @carto_empties.projection.map { |n| n.text }.should == ['']
+      end
+    end # <cartographics>
+    
+    context "<occupation> child element" do
+      before(:all) do
+        @occupation = @mods_rec.from_str('<mods><subject><occupation>Migrant laborers</occupation></mods>').subject.occupation
+      end
+      it "should be a NodeSet" do
+        @occupation.should be_an_instance_of(Nokogiri::XML::NodeSet)
+      end
+      it "occupation NodeSet should have as many Nodes as there are <occupation> elements in the xml" do
+        @occupation.size.should == 1
+      end
+      it "text should get element value" do
+        @occupation.map { |n| n.text }.should == ['Migrant laborers']
+      end
+      it "should recognize authority attributes" do
+        Mods::AUTHORITY_ATTRIBS.each { |a|  
+          @mods_rec.from_str("<mods><subject><occupation #{a}='attr_val'>Flunkie</occupation></subject></mods>")
+          @mods_rec.subject.occupation.send(a.to_sym).should == ['attr_val']
+        }
+      end
+      
+    end # <occupation>
+    
+    
+  end # basic subject terminology
+  
+end

data/spec/title_spec.rb

@@ -9,12 +9,12 @@ describe "Mods <titleInfo> element" do
   it "should recognize type attribute on titleInfo element" do
     Mods::TitleInfo::TYPES.each { |t|
       @mods_rec.from_str("<mods><titleInfo type='#{t}'>hi</titleInfo></mods>")
-      @mods_rec.title_info.type_at.text.should == t
+      @mods_rec.title_info.type_at.should == [t]
     }
   end
   
   it "should recognize subelements" do
-    Mods::TitleInfo::SUBELEMENTS.each { |e|
+    Mods::TitleInfo::CHILD_ELEMENTS.each { |e|
       @mods_rec.from_str("<mods><titleInfo><#{e}>oofda</#{e}></titleInfo></mods>")
       @mods_rec.title_info.send(e).text.should == 'oofda'
     }

data/spec/top_level_elmnts_simple_spec.rb

@@ -29,4 +29,11 @@ describe "Mods Top Level Elements that do not have Child Elements" do
     pending "need to implement ruby style version of (element/attribute) method names"
   end
   
+  it "<genre> element should recognize authority attributes" do
+    pending "to be implemented"
+    Mods::AUTHORITY_ATTRIBS.each { |a|  
+      @mods_rec.from_str("<mods><genre #{a}='attr_val'>Graphic Novels</genre></mods>").genre.send(a.to_sym).should == 'attr_val'
+    }
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -182,6 +182,7 @@ files:
 - lib/mods/nom_terminology.rb
 - lib/mods/reader.rb
 - lib/mods/record.rb
+- lib/mods/subject.rb
 - lib/mods/title_info.rb
 - lib/mods/version.rb
 - mods.gemspec
@@ -192,6 +193,7 @@ files:
 - spec/physical_description_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
+- spec/subject_spec.rb
 - spec/title_spec.rb
 - spec/top_level_elmnts_simple_spec.rb
 homepage: https://github.com/sul-dlss/mods
@@ -208,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1304587137062887266
+      hash: -2903168770934676746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1304587137062887266
+      hash: -2903168770934676746
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -232,6 +234,7 @@ test_files:
 - spec/physical_description_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
+- spec/subject_spec.rb
 - spec/title_spec.rb
 - spec/top_level_elmnts_simple_spec.rb
 has_rdoc: