mods 0.0.8 → 0.0.9

data/README.rdoc

@@ -37,6 +37,7 @@ TODO: Write usage instructions here
 
 == Releases
 
+0.0.9 implement from_nk_node as way to load record object
 0.0.8 implement relatedItem and attributes on all simple top level elements
 0.0.7 implement part
 0.0.6 implement recordInfo, fix to work under jruby

data/lib/mods/reader.rb

@@ -29,6 +29,14 @@ module Mods
       @mods_ng_xml
     end
     
+    # @param node (Nokogiri::XML::Node) - Nokogiri::XML::Node that is the top level element of a mods record
+    # @return a Nokogiri::XML::Document object
+    def from_nk_node(node)
+      @mods_ng_xml = Nokogiri::XML(node.to_s)
+      normalize_mods
+      @mods_ng_xml
+    end
+    
     # Whatever we get, normalize it into a Nokogiri::XML::Document,
     # strip any elements enclosing the mods record
     def normalize_mods

data/lib/mods/record.rb

@@ -45,6 +45,18 @@ module Mods
       end
     end
 
+    # convenience method to call Mods::Reader.new.from_nk_node and to nom
+    # @param ns_aware true if the XML parsing should be strict about using namespaces.  Default is false
+    # @param node (Nokogiri::XML::Node) - Nokogiri::XML::Node that is the top level element of a mods record
+    def from_nk_node(node, ns_aware = false)
+      @mods_ng_xml = Mods::Reader.new(ns_aware).from_nk_node(node)
+      if ns_aware
+        set_terminology_ns(@mods_ng_xml)
+      else
+        set_terminology_no_ns(@mods_ng_xml)
+      end
+    end
+
     # @return Array of Strings, each containing the text contents of <mods><titleInfo>   <nonSort> + ' ' + <title> elements
     #  but not including any titleInfo elements with type="alternative"
     def short_titles
@@ -66,7 +78,6 @@ module Mods
       @mods_ng_xml.title_info.sort_title.find { |n| !n.nil? }
     end
     
-    
     # use the displayForm of a personal name if present
     #   if no displayForm, try to make a string from family name and given name "family_name, given_name"
     #   otherwise, return all nameParts concatenated together
@@ -110,7 +121,7 @@ module Mods
                 result << ISO_639.find(v.strip).english_name
               end
             rescue => e
-              p "Couldn't find english name for #{code.text}"
+              p "Couldn't find english name for #{ct.text}"
               result << ct.text
             end
           else

data/lib/mods/version.rb

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

data/spec/name_spec.rb

@@ -135,7 +135,7 @@ describe "Mods <name> Element" do
   
   context "sort_author" do
     it "should do something" do
-      pending "sort_author to be implemented"
+      pending "sort_author to be implemented (choose creator if present ... )"
     end
   end
   

data/spec/origin_info_spec.rb

@@ -160,12 +160,12 @@ describe "Mods <originInfo> Element" do
     
   end
 
-  context "basic origin_info terminology pieces" do
+  context "basic <originInfo> terminology pieces" do
     before(:all) do
       @mods_rec.from_str(@form_and_extent)
     end
 
-    context "place child element" do
+    context "<place> child element" do
       before(:all) do
         @place_term_text = '<mods><originInfo><place><placeTerm type="text">Iran</placeTerm></place></originInfo></mods>'
         @place_term_plain_mult = '<mods><originInfo>
@@ -177,7 +177,7 @@ describe "Mods <originInfo> Element" do
         @yuck3 = '<mods><originInfo><place><placeTerm type="text">[s.l. : s.n.]</placeTerm></place></originInfo></mods>'
         @yuck4 = '<mods><originInfo><place><placeTerm type="text">[London]</placeTerm></place></originInfo></mods>'
       end
-      context "placeTerm child element" do
+      context "<placeTerm> child element" do
         it "should get element values" do
           vals = @mods_rec.from_str(@place_term_plain_mult).origin_info.place.placeTerm.map { |e| e.text}
           vals.size.should == 2
@@ -202,7 +202,7 @@ describe "Mods <originInfo> Element" do
       end # placeTerm
     end # place
       
-    context "publisher child element" do
+    context "<publisher> child element" do
       before(:all) do
         @ex = '<mods><originInfo><publisher>Olney</publisher></origin_info></mods>'
         @yuck1 = '<mods><originInfo><publisher>[s.n.]</publisher></originInfo></mods>'
@@ -220,7 +220,7 @@ describe "Mods <originInfo> Element" do
       end
     end
     
-    context "various date child elements" do
+    context "<xxxDate> child elements" do
       it "should recognize each element" do
         Mods::ORIGIN_INFO_DATE_ELEMENTS.each { |elname|
           @mods_rec.from_str("<mods><originInfo><#{elname}>date</#{elname}></originInfo></mods>")
@@ -274,14 +274,14 @@ describe "Mods <originInfo> Element" do
       it "should know the only valid values for qualifier attribute: approximate, inferred, questionable" do
         pending "to be implemented"
       end
-    end
+    end # <xxxDate> child elements
     
-    it "edition child element" do
+    it "<edition> child element" do
       xml = '<mods><originInfo><edition>7th ed.</edition></originInfo></mods>'
       @mods_rec.from_str(xml).origin_info.edition.map { |n| n.text }.should == ['7th ed.']
     end
     
-    context "issuance child element" do
+    context "<issuance> child element" do
       before(:all) do
         @ex = '<mods><originInfo><issuance>monographic</issuance></originInfo></mods>'
       end
@@ -293,7 +293,7 @@ describe "Mods <originInfo> Element" do
       end
     end
     
-    context "frequency child element" do
+    context "<frequency> child element" do
       before(:all) do
         xml = '<mods><originInfo><frequency authority="marcfrequency">Annual</frequency></originInfo></mods>'
         @origin_info = @mods_rec.from_str(xml).origin_info

data/spec/reader_spec.rb

@@ -20,6 +20,48 @@ describe "Mods::Reader" do
   it "from_url should turn the contents at the url into a Nokogiri::XML::Document object" do
     @from_url.class.should == Nokogiri::XML::Document
   end
+  
+  context "from_nk_node" do
+    before(:all) do
+      oai_resp = '<?xml version="1.0" encoding="UTF-8"?>
+      <OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/">
+      	<responseDate>2012-11-13T22:11:35Z</responseDate>
+      	<request>http://sul-lyberservices-prod.stanford.edu/sw-oai-provider/oai</request>
+      	<GetRecord>
+      		<record>
+      			<header>
+      				<identifier>oai:searchworks.stanford.edu/druid:mm848sz7984</identifier>
+      				<datestamp>2012-10-28T01:06:31Z</datestamp>
+      			</header>
+      			<metadata>
+      				<ns3:mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns3="http://www.loc.gov/mods/v3" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
+      					<ns3:titleInfo>
+      						<ns3:title>boo</ns3:title>
+      					</ns3:titleInfo>
+      				</ns3:mods>
+            </metadata>
+          </record>
+        </GetRecord>
+      </OAI-PMH>'
+      ng_xml = Nokogiri::XML(oai_resp)
+      @mods_node = ng_xml.xpath('//mods:mods', @ns_hash).first
+      @r = Mods::Reader.new
+      @mods_ng_doc = @r.from_nk_node(@mods_node)
+    end
+    it "should turn the Nokogiri::XML::Node into a Nokogiri::XML::Document object" do
+      @mods_ng_doc.should be_kind_of(Nokogiri::XML::Document)
+    end
+    it "should not care about namespace by default" do
+      @mods_ng_doc.xpath('/mods/titleInfo/title').text.should == "boo"
+    end
+    it "should be able to care about namespaces" do
+      @r.namespace_aware = true
+      @mods_ng_doc = @r.from_nk_node(@mods_node)
+      @mods_ng_doc.xpath('/mods:mods/mods:titleInfo/mods:title', @ns_hash).text.should == "boo"
+      @r.namespace_aware = false
+    end
+    
+  end
 
   context "namespace awareness" do
     it "should not care about namespace by default" do

data/spec/record_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe "Mods::Record" do
+  before(:all) do
+    @ns_hash = {'mods' => Mods::MODS_NS}
+  end
+
+  context "from_str" do
+    it "should be able to find element using NOM terminology" do
+      mods_ng_doc = Mods::Record.new.from_str('<mods><note>hi</note></mods>')
+      mods_ng_doc.note.map { |e| e.text } == "hi"
+    end
+  end
+  
+  context "from_nk_node" do
+    before(:all) do
+      oai_resp = '<?xml version="1.0" encoding="UTF-8"?>
+      <OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/">
+      	<responseDate>2012-11-13T22:11:35Z</responseDate>
+      	<request>http://sul-lyberservices-prod.stanford.edu/sw-oai-provider/oai</request>
+      	<GetRecord>
+      		<record>
+      			<header>
+      				<identifier>oai:searchworks.stanford.edu/druid:mm848sz7984</identifier>
+      				<datestamp>2012-10-28T01:06:31Z</datestamp>
+      			</header>
+      			<metadata>
+      				<ns3:mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns3="http://www.loc.gov/mods/v3" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
+      					<ns3:titleInfo>
+      						<ns3:title>boo</ns3:title>
+      					</ns3:titleInfo>
+      				</ns3:mods>
+            </metadata>
+          </record>
+        </GetRecord>
+      </OAI-PMH>'
+      ng_xml = Nokogiri::XML(oai_resp)
+      @mods_node = ng_xml.xpath('//mods:mods', @ns_hash).first
+    end
+    it "should be able to find element using NOM terminology" do
+      mods_ng_doc = Mods::Record.new.from_nk_node(@mods_node)
+      mods_ng_doc.title_info.title.map { |e| e.text } == "boo"
+    end
+  end
+
+end

data/spec/subject_spec.rb

@@ -104,10 +104,10 @@ describe "Mods <subject> Element" do
       @mult_pers_name_sub.personal_name.date.map { |e| e.text }.should include("1818-1878")
     end
     it "should do the appropriate thing with the role for the value of a name" do
-      pending "to be implemented"
+      pending "name objects to be implemented"
     end
     it "should do the appropriate thing with the date for the value of a name" do
-      pending "to be implemented"
+      pending "name objects to be implemented"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -194,6 +194,7 @@ files:
 - spec/physical_description_spec.rb
 - spec/reader_spec.rb
 - spec/record_info_spec.rb
+- spec/record_spec.rb
 - spec/related_item_spec.rb
 - spec/spec_helper.rb
 - spec/subject_spec.rb
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1659531354165299453
+      hash: -681303896929700435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1659531354165299453
+      hash: -681303896929700435
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -238,6 +239,7 @@ test_files:
 - spec/physical_description_spec.rb
 - spec/reader_spec.rb
 - spec/record_info_spec.rb
+- spec/record_spec.rb
 - spec/related_item_spec.rb
 - spec/spec_helper.rb
 - spec/subject_spec.rb