mods 0.0.14 → 0.0.15

data/lib/mods/reader.rb

@@ -3,13 +3,13 @@
 module Mods
   class Reader
     
-    DEFAULT_NS_AWARE = false
+    DEFAULT_NS_AWARE = true
 
     # true if the XML parsing should be strict about using namespaces. 
     attr_accessor :namespace_aware
     attr_reader :mods_ng_xml
     
-    # @param ns_aware true if the XML parsing should be strict about using namespaces.  Default is false
+    # @param ns_aware true if the XML parsing should be strict about using namespaces.  Default is true
     def initialize(ns_aware = DEFAULT_NS_AWARE)
       @namespace_aware = ns_aware
     end
@@ -34,7 +34,7 @@ module Mods
     # @param node (Nokogiri::XML::Node) - Nokogiri::XML::Node that is the top level element of a mods record
     # @return Nokogiri::XML::Document
     def from_nk_node(node)
-      @mods_ng_xml = Nokogiri::XML(node.to_s)
+      @mods_ng_xml = Nokogiri::XML(node.to_s, nil, node.document.encoding)
       normalize_mods
       @mods_ng_xml
     end

data/lib/mods/record.rb

@@ -22,9 +22,9 @@ module Mods
     end
 
     # convenience method to call Mods::Reader.new.from_str and to nom
-    # @param ns_aware true if the XML parsing should be strict about using namespaces.  Default is false
+    # @param ns_aware true if the XML parsing should be strict about using namespaces.  Default is true
     # @param str - a string containing mods xml
-    def from_str(str, ns_aware = false)
+    def from_str(str, ns_aware = true)
       @mods_ng_xml = Mods::Reader.new(ns_aware).from_str(str)
       if ns_aware
         set_terminology_ns(@mods_ng_xml)
@@ -34,9 +34,9 @@ module Mods
     end
 
     # convenience method to call Mods::Reader.new.from_url and to nom
-    # @param namespace_aware true if the XML parsing should be strict about using namespaces.  Default is false
+    # @param namespace_aware true if the XML parsing should be strict about using namespaces.  Default is true
     # @param url (String) - url that has mods xml as its content
-    def from_url(url, namespace_aware = false)
+    def from_url(url, namespace_aware = true)
       @mods_ng_xml = Mods::Reader.new(ns_aware).from_url(url)
       if ns_aware
         set_terminology_ns(@mods_ng_xml)
@@ -46,9 +46,9 @@ module Mods
     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 ns_aware true if the XML parsing should be strict about using namespaces.  Default is true
     # @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)
+    def from_nk_node(node, ns_aware = true)
       @mods_ng_xml = Mods::Reader.new(ns_aware).from_nk_node(node)
       if ns_aware
         set_terminology_ns(@mods_ng_xml)
@@ -142,7 +142,6 @@ module Mods
       result.uniq
     end
 
-
     def method_missing method_name, *args
       if mods_ng_xml.respond_to?(method_name)
         mods_ng_xml.send(method_name, *args)

data/lib/mods/version.rb

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

data/spec/language_spec.rb

@@ -3,89 +3,116 @@ require 'spec_helper'
 describe "Mods <language> Element" do
   before(:all) do
     @mods_rec = Mods::Record.new
-    @simple = '<mods><language>Greek</language></mods>'
-    @simple_ln = @mods_rec.from_str(@simple).language
-    @iso639_2b_code = '<mods><language><languageTerm authority="iso639-2b" type="code">fre</languageTerm></language></mods>'
-    @iso639_2b_code_ln = @mods_rec.from_str(@iso639_2b_code).language
-    @iso639_2b_text = '<mods><language><languageTerm authority="iso639-2b" type="text">English</languageTerm></language></mods>'
-    @iso639_2b_text_ln = @mods_rec.from_str(@iso639_2b_text).language
-    @mult_codes = '<mods><language><languageTerm authority="iso639-2b" type="code">per ara, dut</languageTerm></language></mods>'
-    @mult_codes_ln = @mods_rec.from_str(@mult_codes).language
-    mult_code_terms = '<mods><language><languageTerm authority="iso639-2b" type="code">spa</languageTerm><languageTerm authority="iso639-2b" type="code">dut</languageTerm></language></mods>'
-    @mult_code_terms = @mods_rec.from_str(mult_code_terms).language
-    mult_text_terms = '<mods><language><languageTerm authority="iso639-2b" type="text">Chinese</languageTerm><languageTerm authority="iso639-2b" type="text">Spanish</languageTerm></language></mods>'
-    @mult_text_terms = @mods_rec.from_str(mult_text_terms).language
-    @ex_array = [@simple_ln, @iso639_2b_code_ln, @iso639_2b_text_ln, @mult_codes_ln, @mult_code_terms, @mult_text_terms]
   end
 
   context "basic <language> terminology pieces" do
-    before(:all) do
-      @mods_rec.from_str(@iso639_2b_code)
-    end
-    it "should be a NodeSet" do
-      @ex_array.each { |t| t.should be_an_instance_of(Nokogiri::XML::NodeSet) }
-    end
-    it "should have as many members as there are <language> elements in the xml" do
-      @ex_array.each { |t| t.size.should == 1 }
-    end
     
-    context "<languageTerm> child element" do
-      it "should understand languageTerm.type_at attribute" do
-        @iso639_2b_code_ln.languageTerm.type_at.should == ["code"]
+    context "namespace aware" do
+      before(:all) do
+        @ns_decl = "xmlns='#{Mods::MODS_NS}'"
+        @iso639_2b_code = "<mods #{@ns_decl}><language><languageTerm authority='iso639-2b' type='code'>fre</languageTerm></language></mods>"
+        @iso639_2b_code_ln = @mods_rec.from_str(@iso639_2b_code).language
+        mult_code_terms = "<mods #{@ns_decl}><language><languageTerm authority='iso639-2b' type='code'>spa</languageTerm><languageTerm authority='iso639-2b' type='code'>dut</languageTerm></language></mods>"
+        @mult_code_terms = @mods_rec.from_str(mult_code_terms).language
+        mult_text_terms = "<mods #{@ns_decl}><language><languageTerm authority='iso639-2b' type='text'>Chinese</languageTerm><languageTerm authority='iso639-2b' type='text'>Spanish</languageTerm></language></mods>"
+        @mult_text_terms = @mods_rec.from_str(mult_text_terms).language
+        @ex_array = [@iso639_2b_code_ln, @mult_code_terms, @mult_text_terms]
       end
-      it "should understand languageTerm.authority attribute" do
-        @iso639_2b_code_ln.languageTerm.authority.should == ["iso639-2b"]
+      it "should be a NodeSet" do
+        @ex_array.each { |t| t.should be_an_instance_of(Nokogiri::XML::NodeSet) }
       end
-      it "should understand languageTerm value" do
-        @iso639_2b_code_ln.languageTerm.text.should == "fre"
-        @iso639_2b_code_ln.languageTerm.size.should == 1
+      it "should have as many members as there are <language> elements in the xml" do
+        @ex_array.each { |t| t.size.should == 1 }
       end
-      
-      it "should recognize all authority attributes" do
-        Mods::AUTHORITY_ATTRIBS.each { |a|
-          @mods_rec.from_str("<mods><language><languageTerm #{a}='attr_val'>zzz</languageTerm></language></mods>")
-          @mods_rec.language.languageTerm.send(a.to_sym).should == ['attr_val']
-        }
+
+      context "<languageTerm> child element" do
+        it "should understand languageTerm.type_at attribute" do
+          @iso639_2b_code_ln.languageTerm.type_at.should == ["code"]
+        end
+        it "should understand languageTerm.authority attribute" do
+          @iso639_2b_code_ln.languageTerm.authority.should == ["iso639-2b"]
+        end
+        it "should understand languageTerm value" do
+          @iso639_2b_code_ln.languageTerm.text.should == "fre"
+          @iso639_2b_code_ln.languageTerm.size.should == 1
+        end
+
+        it "should recognize all authority attributes" do
+          Mods::AUTHORITY_ATTRIBS.each { |a|
+            @mods_rec.from_str("<mods #{@ns_decl}><language><languageTerm #{a}='attr_val'>zzz</languageTerm></language></mods>")
+            @mods_rec.language.languageTerm.send(a.to_sym).should == ['attr_val']
+          }
+        end
+      end # <languageTerm> 
+
+      it "should get one language.code_term for each languageTerm element with a type attribute of 'code'" do
+        @iso639_2b_code_ln.code_term.size.should == 1
+        @iso639_2b_code_ln.code_term.text.should == "fre"
+        @mult_code_terms.code_term.size.should == 2
+        @mult_code_terms.code_term.first.text.should include("spa")
+        @mult_code_terms.code_term[1].text.should == "dut"
       end
-    end # <languageTerm> 
+      it "should get one language.text_term for each languageTerm element with a type attribute of 'text'" do
+        @mult_text_terms.text_term.size.should == 2
+        @mult_text_terms.text_term.first.text.should include("Chinese")
+        @mult_text_terms.text_term[1].text.should == "Spanish"
+      end
+    end # namespace_aware
+    
     
-    it "should get one language.code_term for each languageTerm element with a type attribute of 'code'" do
-      @iso639_2b_code_ln.code_term.size.should == 1
-      @iso639_2b_code_ln.code_term.text.should == "fre"
-      @mult_code_terms.code_term.size.should == 2
-      @mult_code_terms.code_term.first.text.should include("spa")
-      @mult_code_terms.code_term[1].text.should == "dut"
-    end
-    it "should get one language.text_term for each languageTerm element with a type attribute of 'text'" do
-      @mult_text_terms.text_term.size.should == 2
-      @mult_text_terms.text_term.first.text.should include("Chinese")
-      @mult_text_terms.text_term[1].text.should == "Spanish"
-    end
+    context "NOT namespace aware" do
+      before(:all) do
+        @iso639_2b_code = "<mods><language><languageTerm authority='iso639-2b' type='code'>fre</languageTerm></language></mods>"
+        @iso639_2b_code_ln = @mods_rec.from_str(@iso639_2b_code, false).language
+        mult_code_terms = "<mods><language><languageTerm authority='iso639-2b' type='code'>spa</languageTerm><languageTerm authority='iso639-2b' type='code'>dut</languageTerm></language></mods>"
+        @mult_code_terms = @mods_rec.from_str(mult_code_terms, false).language
+        mult_text_terms = "<mods><language><languageTerm authority='iso639-2b' type='text'>Chinese</languageTerm><languageTerm authority='iso639-2b' type='text'>Spanish</languageTerm></language></mods>"
+        @mult_text_terms = @mods_rec.from_str(mult_text_terms, false).language
+        @ex_array = [@iso639_2b_code_ln, @mult_code_terms, @mult_text_terms]
+      end
+      it "should be a NodeSet" do
+        @ex_array.each { |t| t.should be_an_instance_of(Nokogiri::XML::NodeSet) }
+      end
+      it "should have as many members as there are <language> elements in the xml" do
+        @ex_array.each { |t| t.size.should == 1 }
+      end
+
+      context "<languageTerm> child element" do
+        it "should understand languageTerm.type_at attribute" do
+          @iso639_2b_code_ln.languageTerm.type_at.should == ["code"]
+        end
+        it "should understand languageTerm.authority attribute" do
+          @iso639_2b_code_ln.languageTerm.authority.should == ["iso639-2b"]
+        end
+        it "should understand languageTerm value" do
+          @iso639_2b_code_ln.languageTerm.text.should == "fre"
+          @iso639_2b_code_ln.languageTerm.size.should == 1
+        end
+
+        it "should recognize all authority attributes" do
+          Mods::AUTHORITY_ATTRIBS.each { |a|
+            @mods_rec.from_str("<mods><language><languageTerm #{a}='attr_val'>zzz</languageTerm></language></mods>", false)
+            @mods_rec.language.languageTerm.send(a.to_sym).should == ['attr_val']
+          }
+        end
+      end # <languageTerm> 
+
+      it "should get one language.code_term for each languageTerm element with a type attribute of 'code'" do
+        @iso639_2b_code_ln.code_term.size.should == 1
+        @iso639_2b_code_ln.code_term.text.should == "fre"
+        @mult_code_terms.code_term.size.should == 2
+        @mult_code_terms.code_term.first.text.should include("spa")
+        @mult_code_terms.code_term[1].text.should == "dut"
+      end
+      it "should get one language.text_term for each languageTerm element with a type attribute of 'text'" do
+        @mult_text_terms.text_term.size.should == 2
+        @mult_text_terms.text_term.first.text.should include("Chinese")
+        @mult_text_terms.text_term[1].text.should == "Spanish"
+      end
+    end # NOT namespace_aware
+
   end # basic <language> terminology pieces
   
-  context "Mods::Record.languages convenience method" do
-    
-    it "should translate iso639-2b codes to English" do
-      @mods_rec.from_str(@iso639_2b_code)
-      @mods_rec.languages.should == ["French"]
-    end
-    
-    it "should pass thru language values that are already text (not code)" do
-      @mods_rec.from_str(@iso639_2b_text)
-      @mods_rec.languages.should == ["English"]
-    end
-    
-    it "should keep values that are not inside <languageTerm> elements" do
-      @mods_rec.from_str(@simple)
-      @mods_rec.languages.should == ["Greek"]
-    end
-    
-    it "should create a separate value for each language in a comma, space, or | separated list " do
-      @mods_rec.from_str(@mult_codes)
-      @mods_rec.languages.should include("Arabic")
-      @mods_rec.languages.should include("Persian")
-      @mods_rec.languages.should include("Dutch; Flemish")
-    end
-  end
+  # note that Mods::Record.languages tests are in record_spec
   
 end

data/spec/location_spec.rb

@@ -3,143 +3,293 @@ require 'spec_helper'
 describe "Mods <location> Element" do
   before(:all) do
     @mods_rec = Mods::Record.new
-    @url_and_phys = '<mods><location>
-                <url displayLabel="Digital collection of 46 images available online" usage="primary display">http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
-              </location><location>
-                <physicalLocation>Department of Special Collections, Stanford University Libraries, Stanford, CA 94305.</physicalLocation>
-              </location></mods>'
-    # from http://www.loc.gov/standards/mods/v3/mods-userguide-elements.html !!
-    #  sublocation is not allowed directly under location
-    @incorrect = '<mods><location>
-                    	<physicalLocation>Library of Congress </physicalLocation>
-                    	<sublocation>Prints and Photographs Division Washington, D.C. 20540 USA</sublocation>
-                    	<shelfLocator>DAG no. 1410</shelfLocator>
-                  </location></mods>'
   end
 
   context "basic location terminology pieces" do
     
-    context "physicalLocation child element" do
+    context "WITH namespaces" do
       before(:all) do
-        @phys_loc_only = '<mods><location><physicalLocation>here</physicalLocation></location></mods>'
-        @phys_loc_authority = '<mods><location><physicalLocation authority="marcorg">MnRM</physicalLocation></location></mods>'
+        @ns_decl = "xmlns='#{Mods::MODS_NS}'"
+        @url_and_phys = "<mods #{@ns_decl}><location>
+                    <url displayLabel='Digital collection of 46 images available online' usage='primary display'>http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
+                  </location><location>
+                    <physicalLocation>Department of Special Collections, Stanford University Libraries, Stanford, CA 94305.</physicalLocation>
+                  </location></mods>"
+        # from http://www.loc.gov/standards/mods/v3/mods-userguide-elements.html !!
+        #  sublocation is not allowed directly under location
+        @incorrect = "<mods #{@ns_decl}><location>
+                        	<physicalLocation>Library of Congress </physicalLocation>
+                        	<sublocation>Prints and Photographs Division Washington, D.C. 20540 USA</sublocation>
+                        	<shelfLocator>DAG no. 1410</shelfLocator>
+                      </location></mods>"
       end
-      it "should have access to text value of element" do
-        @mods_rec.from_str(@phys_loc_only)
-        @mods_rec.location.physicalLocation.text.should == "here"
-        @mods_rec.from_str(@phys_loc_authority)
-        @mods_rec.location.physicalLocation.map { |n| n.text }.should == ["MnRM"]
+      
+      context "physicalLocation child element" do
+        before(:all) do
+          @phys_loc_only = "<mods #{@ns_decl}><location><physicalLocation>here</physicalLocation></location></mods>"
+          @phys_loc_authority = "<mods #{@ns_decl}><location><physicalLocation authority='marcorg'>MnRM</physicalLocation></location></mods>"
+        end
+        it "should have access to text value of element" do
+          @mods_rec.from_str(@phys_loc_only)
+          @mods_rec.location.physicalLocation.text.should == "here"
+          @mods_rec.from_str(@phys_loc_authority)
+          @mods_rec.location.physicalLocation.map { |n| n.text }.should == ["MnRM"]
+        end
+        it "should recognize authority attribute" do
+          @mods_rec.from_str(@phys_loc_authority)
+          @mods_rec.location.physicalLocation.authority.should == ["marcorg"]
+        end
+        it "should recognize displayLabel attribute" do
+          @mods_rec.from_str("<mods #{@ns_decl}><location><physicalLocation displayLabel='Correspondence'>some address</physicalLocation></location></mods>")
+          @mods_rec.location.physicalLocation.displayLabel.should == ["Correspondence"]
+        end      
       end
-      it "should recognize authority attribute" do
-        @mods_rec.from_str(@phys_loc_authority)
-        @mods_rec.location.physicalLocation.authority.should == ["marcorg"]
+
+      it "shelfLocator child element" do
+        shelf_loc = "<mods #{@ns_decl}><location>
+                        	<physicalLocation>Library of Congress </physicalLocation>
+                        	<shelfLocator>DAG no. 1410</shelfLocator>
+                      </location></mods>"
+        @mods_rec.from_str(shelf_loc)
+        @mods_rec.location.shelfLocator.map { |n| n.text }.should == ["DAG no. 1410"]
       end
-      it "should recognize displayLabel attribute" do
-        @mods_rec.from_str('<mods><location><physicalLocation displayLabel="Correspondence">some address</physicalLocation></location></mods>')
-        @mods_rec.location.physicalLocation.displayLabel.should == ["Correspondence"]
-      end      
-    end
-    
-    it "shelfLocator child element" do
-      shelf_loc = '<mods><location>
-                      	<physicalLocation>Library of Congress </physicalLocation>
-                      	<shelfLocator>DAG no. 1410</shelfLocator>
-                    </location></mods>'
-      @mods_rec.from_str(shelf_loc)
-      @mods_rec.location.shelfLocator.map { |n| n.text }.should == ["DAG no. 1410"]
-    end
 
-    context "url child element" do
-      before(:all) do
-        @empty_loc_url = '<mods><location><url/></location></mods>'
-        @mult_flavor_loc_urls = '<mods><location>
-                  	<url access="preview">http://preview.org</url>
-                  	<url access="object in context">http://context.org</url>
-                  	<url access="raw object">http://object.org</url>
-                </location></mods>'
+      context "url child element" do
+        before(:all) do
+          @empty_loc_url = "<mods #{@ns_decl}><location><url/></location></mods>"
+          @mult_flavor_loc_urls = "<mods #{@ns_decl}><location>
+                    	<url access='preview'>http://preview.org</url>
+                    	<url access='object in context'>http://context.org</url>
+                    	<url access='raw object'>http://object.org</url>
+                  </location></mods>"
+        end
+        it "should have access to text value of element" do
+          urls = @mods_rec.from_str(@mult_flavor_loc_urls).location.url.map { |e| e.text }
+          urls.size.should == 3
+          urls.should include("http://preview.org")
+          urls.should include("http://context.org")
+          urls.should include("http://object.org")
+        end
+        context "attributes" do
+          before(:all) do
+            @url_attribs = "<mods #{@ns_decl}><location>
+                        <url displayLabel='Digital collection of 46 images available online' usage='primary display'>http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
+                      </location></mods>"
+          end
+          it "should recognize displayLabel attribute" do
+            @mods_rec.from_str(@url_attribs).location.url.displayLabel.should == ["Digital collection of 46 images available online"]
+          end
+          it "should recognize access attribute" do
+            vals = @mods_rec.from_str(@mult_flavor_loc_urls).location.url.access
+            vals.size.should == 3
+            vals.should include("preview")
+            vals.should include("object in context")
+            vals.should include("raw object")
+          end
+          it "should recognize usage attribute" do
+            @mods_rec.from_str(@url_attribs).location.url.usage.should == ["primary display"]
+          end
+          it "should recognize note attribute" do
+            @mods_rec.from_str("<mods #{@ns_decl}><location><url note='something'>http://somewhere.org</url></location></mods>")
+            @mods_rec.location.url.note.should == ["something"]
+          end
+          it "should recognize dateLastAccessed attribute" do
+            @mods_rec.from_str("<mods #{@ns_decl}><location><url dateLastAccessed='something'>http://somewhere.org</url></location></mods>")
+            @mods_rec.location.url.dateLastAccessed.should == ["something"]
+          end
+        end # attributes
+        it "should have array with empty string for single empty url element" do
+          @mods_rec.from_str(@empty_loc_url).location.url.map { |n| n.text }.should == [""]
+        end
+      end # url child element
+
+      it "holdingSimple child element" do
+        xml = "<mods #{@ns_decl}><location>
+          	<physicalLocation authority='marcorg'>MnRM</physicalLocation>
+          	<holdingSimple>
+          	  	<copyInformation>
+          	  	  	<sublocation>Patient reading room</sublocation>
+          	  	  	<shelfLocator>QH511.A1J68</shelfLocator>
+          	  	  	<enumerationAndChronology unitType='1'> v.1-v.8 1970-1976</enumerationAndChronology>
+          	  	</copyInformation>
+          	</holdingSimple></location></mods>"
+        @mods_rec.from_str(xml).location.holdingSimple.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @mods_rec.from_str(xml).location.holdingSimple.first.should be_an_instance_of(Nokogiri::XML::Element)
       end
-      it "should have access to text value of element" do
-        urls = @mods_rec.from_str(@mult_flavor_loc_urls).location.url.map { |e| e.text }
-        urls.size.should == 3
-        urls.should include("http://preview.org")
-        urls.should include("http://context.org")
-        urls.should include("http://object.org")
+      it "holdingComplex child element" do
+        xml = "<mods #{@ns_decl}>
+        <location>
+        <physicalLocation>Menlo Park Public Library</physicalLocation> 	 
+          	<holdingExternal> 	 
+          	<holding xmlns:iso20775='info:ofi/fmt:xml:xsd:iso20775' xsi:schemaLocation='info:ofi/fmt:xml:xsd:iso20775 http://www.loc.gov/standards/iso20775/N130_ISOholdings_v6_1.xsd'> 	 
+          	  	<institutionIdentifier> 	  	 
+          	  	<value>JRF</value> 	  	 
+          	  	<typeOrSource> 	  	 
+          	  	  	<pointer>http://worldcat.org/registry/institutions/</pointer> 	 
+          	  	</typeOrSource> 	  	 
+          	  	</institutionIdentifier> 	  	 
+          	  	  	<physicalLocation>Menlo Park Public Library</physicalLocation> 	  	 
+          	  	  	<physicalAddress> 	  	  	 
+          	  	  	<text>Menlo Park, CA 94025 United States </text> 	  	 
+          	  	  	  	</physicalAddress> 	  	 
+          	  	  	  	  	<electronicAddress> 	  	 
+          	  	  	  	  	<text>http://www.worldcat.org/wcpa/oclc/15550774? page=frame&amp;url=%3D%3FUTF-8%3FB%FaHR0cDovL2NhdGFsb2cucGxzaW5mby5vcmcvc2VhcmNoL2kwMTk1MDM4NjMw%3F%3D&amp;title=Menlo+Park+Public+Library&amp;linktype=opac&amp;detail=JRF%3AMenlo+Park+Public+Library%3APublic&amp;app=wcapi&amp;id=OCL-OCLC+Staff+use</text>
+          	  	  	  	  	</electronicAddress> 	  	  	 
+          	  	  	  	  	<holdingSimple> 	  	  	 
+          	  	  	  	  	  	<copiesSummary> 	  	  	 
+          	  	  	  	  	  	  	<copiesCount>1</copiesCount> 	  	  	 
+          	  	  	  	  	  	</copiesSummary> 	  	  	 
+          	  	  	  	</holdingSimple> 	  	  	 
+          	  	</holding> 	  	  	 
+          	  	  	  	</holdingExternal>
+            </mods>"
+        @mods_rec.from_str(xml).location.holdingExternal.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @mods_rec.from_str(xml).location.holdingExternal.first.should be_an_instance_of(Nokogiri::XML::Element)
       end
-      context "attributes" do
+
+    end # WITH namespaces
+    
+    context "WITHOUT namespaces" do
+      before(:all) do
+        @url_and_phys = '<mods><location>
+                    <url displayLabel="Digital collection of 46 images available online" usage="primary display">http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
+                  </location><location>
+                    <physicalLocation>Department of Special Collections, Stanford University Libraries, Stanford, CA 94305.</physicalLocation>
+                  </location></mods>'
+        # from http://www.loc.gov/standards/mods/v3/mods-userguide-elements.html !!
+        #  sublocation is not allowed directly under location
+        @incorrect = '<mods><location>
+                        	<physicalLocation>Library of Congress </physicalLocation>
+                        	<sublocation>Prints and Photographs Division Washington, D.C. 20540 USA</sublocation>
+                        	<shelfLocator>DAG no. 1410</shelfLocator>
+                      </location></mods>'
+      end
+      
+      context "physicalLocation child element" do
         before(:all) do
-          @url_attribs = '<mods><location>
-                      <url displayLabel="Digital collection of 46 images available online" usage="primary display">http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
-                    </location></mods>'
+          @phys_loc_only = '<mods><location><physicalLocation>here</physicalLocation></location></mods>'
+          @phys_loc_authority = '<mods><location><physicalLocation authority="marcorg">MnRM</physicalLocation></location></mods>'
         end
-        it "should recognize displayLabel attribute" do
-          @mods_rec.from_str(@url_attribs).location.url.displayLabel.should == ["Digital collection of 46 images available online"]
+        it "should have access to text value of element" do
+          @mods_rec.from_str(@phys_loc_only, false)
+          @mods_rec.location.physicalLocation.text.should == "here"
+          @mods_rec.from_str(@phys_loc_authority, false)
+          @mods_rec.location.physicalLocation.map { |n| n.text }.should == ["MnRM"]
         end
-        it "should recognize access attribute" do
-          vals = @mods_rec.from_str(@mult_flavor_loc_urls).location.url.access
-          vals.size.should == 3
-          vals.should include("preview")
-          vals.should include("object in context")
-          vals.should include("raw object")
+        it "should recognize authority attribute" do
+          @mods_rec.from_str(@phys_loc_authority, false)
+          @mods_rec.location.physicalLocation.authority.should == ["marcorg"]
         end
-        it "should recognize usage attribute" do
-          @mods_rec.from_str(@url_attribs).location.url.usage.should == ["primary display"]
+        it "should recognize displayLabel attribute" do
+          @mods_rec.from_str('<mods><location><physicalLocation displayLabel="Correspondence">some address</physicalLocation></location></mods>', false)
+          @mods_rec.location.physicalLocation.displayLabel.should == ["Correspondence"]
+        end      
+      end
+
+      it "shelfLocator child element" do
+        shelf_loc = '<mods><location>
+                        	<physicalLocation>Library of Congress </physicalLocation>
+                        	<shelfLocator>DAG no. 1410</shelfLocator>
+                      </location></mods>'
+        @mods_rec.from_str(shelf_loc, false)
+        @mods_rec.location.shelfLocator.map { |n| n.text }.should == ["DAG no. 1410"]
+      end
+
+      context "url child element" do
+        before(:all) do
+          @empty_loc_url = '<mods><location><url/></location></mods>'
+          @mult_flavor_loc_urls = '<mods><location>
+                    	<url access="preview">http://preview.org</url>
+                    	<url access="object in context">http://context.org</url>
+                    	<url access="raw object">http://object.org</url>
+                  </location></mods>'
         end
-        it "should recognize note attribute" do
-          @mods_rec.from_str('<mods><location><url note="something">http://somewhere.org</url></location></mods>')
-          @mods_rec.location.url.note.should == ["something"]
+        it "should have access to text value of element" do
+          urls = @mods_rec.from_str(@mult_flavor_loc_urls, false).location.url.map { |e| e.text }
+          urls.size.should == 3
+          urls.should include("http://preview.org")
+          urls.should include("http://context.org")
+          urls.should include("http://object.org")
         end
-        it "should recognize dateLastAccessed attribute" do
-          @mods_rec.from_str('<mods><location><url dateLastAccessed="something">http://somewhere.org</url></location></mods>')
-          @mods_rec.location.url.dateLastAccessed.should == ["something"]
+        context "attributes" do
+          before(:all) do
+            @url_attribs = '<mods><location>
+                        <url displayLabel="Digital collection of 46 images available online" usage="primary display">http://searchworks.stanford.edu/?f%5Bcollection%5D%5B%5D=The+Reid+W.+Dennis+Collection+of+California+Lithographs&amp;view=gallery</url>
+                      </location></mods>'
+          end
+          it "should recognize displayLabel attribute" do
+            @mods_rec.from_str(@url_attribs, false).location.url.displayLabel.should == ["Digital collection of 46 images available online"]
+          end
+          it "should recognize access attribute" do
+            vals = @mods_rec.from_str(@mult_flavor_loc_urls, false).location.url.access
+            vals.size.should == 3
+            vals.should include("preview")
+            vals.should include("object in context")
+            vals.should include("raw object")
+          end
+          it "should recognize usage attribute" do
+            @mods_rec.from_str(@url_attribs, false).location.url.usage.should == ["primary display"]
+          end
+          it "should recognize note attribute" do
+            @mods_rec.from_str('<mods><location><url note="something">http://somewhere.org</url></location></mods>', false)
+            @mods_rec.location.url.note.should == ["something"]
+          end
+          it "should recognize dateLastAccessed attribute" do
+            @mods_rec.from_str('<mods><location><url dateLastAccessed="something">http://somewhere.org</url></location></mods>', false)
+            @mods_rec.location.url.dateLastAccessed.should == ["something"]
+          end
+        end # attributes
+        it "should have array with empty string for single empty url element" do
+          @mods_rec.from_str(@empty_loc_url, false).location.url.map { |n| n.text }.should == [""]
         end
-      end # attributes
-      it "should have array with empty string for single empty url element" do
-        @mods_rec.from_str(@empty_loc_url).location.url.map { |n| n.text }.should == [""]
+      end # url child element
+
+      it "holdingSimple child element" do
+        xml = '<mods><location>
+          	<physicalLocation authority="marcorg">MnRM</physicalLocation>
+          	<holdingSimple>
+          	  	<copyInformation>
+          	  	  	<sublocation>Patient reading room</sublocation>
+          	  	  	<shelfLocator>QH511.A1J68</shelfLocator>
+          	  	  	<enumerationAndChronology unitType="1"> v.1-v.8 1970-1976</enumerationAndChronology>
+          	  	</copyInformation>
+          	</holdingSimple></location></mods>'
+        @mods_rec.from_str(xml, false).location.holdingSimple.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @mods_rec.from_str(xml, false).location.holdingSimple.first.should be_an_instance_of(Nokogiri::XML::Element)
       end
-    end # url child element
-    
-    it "holdingSimple child element" do
-      xml = '<mods><location>
-        	<physicalLocation authority="marcorg">MnRM</physicalLocation>
-        	<holdingSimple>
-        	  	<copyInformation>
-        	  	  	<sublocation>Patient reading room</sublocation>
-        	  	  	<shelfLocator>QH511.A1J68</shelfLocator>
-        	  	  	<enumerationAndChronology unitType="1"> v.1-v.8 1970-1976</enumerationAndChronology>
-        	  	</copyInformation>
-        	</holdingSimple></location></mods>'
-      @mods_rec.from_str(xml).location.holdingSimple.should be_an_instance_of(Nokogiri::XML::NodeSet)
-      @mods_rec.from_str(xml).location.holdingSimple.first.should be_an_instance_of(Nokogiri::XML::Element)
-    end
-    it "holdingComplex child element" do
-      xml = '<mods>
-      <location>
-      <physicalLocation>Menlo Park Public Library</physicalLocation> 	 
-        	<holdingExternal> 	 
-        	<holding xmlns:iso20775="info:ofi/fmt:xml:xsd:iso20775" xsi:schemaLocation="info:ofi/fmt:xml:xsd:iso20775 http://www.loc.gov/standards/iso20775/N130_ISOholdings_v6_1.xsd"> 	 
-        	  	<institutionIdentifier> 	  	 
-        	  	<value>JRF</value> 	  	 
-        	  	<typeOrSource> 	  	 
-        	  	  	<pointer>http://worldcat.org/registry/institutions/</pointer> 	 
-        	  	</typeOrSource> 	  	 
-        	  	</institutionIdentifier> 	  	 
-        	  	  	<physicalLocation>Menlo Park Public Library</physicalLocation> 	  	 
-        	  	  	<physicalAddress> 	  	  	 
-        	  	  	<text>Menlo Park, CA 94025 United States </text> 	  	 
-        	  	  	  	</physicalAddress> 	  	 
-        	  	  	  	  	<electronicAddress> 	  	 
-        	  	  	  	  	<text>http://www.worldcat.org/wcpa/oclc/15550774? page=frame&amp;url=%3D%3FUTF-8%3FB%FaHR0cDovL2NhdGFsb2cucGxzaW5mby5vcmcvc2VhcmNoL2kwMTk1MDM4NjMw%3F%3D&amp;title=Menlo+Park+Public+Library&amp;linktype=opac&amp;detail=JRF%3AMenlo+Park+Public+Library%3APublic&amp;app=wcapi&amp;id=OCL-OCLC+Staff+use</text>
-        	  	  	  	  	</electronicAddress> 	  	  	 
-        	  	  	  	  	<holdingSimple> 	  	  	 
-        	  	  	  	  	  	<copiesSummary> 	  	  	 
-        	  	  	  	  	  	  	<copiesCount>1</copiesCount> 	  	  	 
-        	  	  	  	  	  	</copiesSummary> 	  	  	 
-        	  	  	  	</holdingSimple> 	  	  	 
-        	  	</holding> 	  	  	 
-        	  	  	  	</holdingExternal>
-          </mods>'
-      @mods_rec.from_str(xml).location.holdingExternal.should be_an_instance_of(Nokogiri::XML::NodeSet)
-      @mods_rec.from_str(xml).location.holdingExternal.first.should be_an_instance_of(Nokogiri::XML::Element)
-    end
+      it "holdingComplex child element" do
+        xml = '<mods>
+        <location>
+        <physicalLocation>Menlo Park Public Library</physicalLocation> 	 
+          	<holdingExternal> 	 
+          	<holding xmlns:iso20775="info:ofi/fmt:xml:xsd:iso20775" xsi:schemaLocation="info:ofi/fmt:xml:xsd:iso20775 http://www.loc.gov/standards/iso20775/N130_ISOholdings_v6_1.xsd"> 	 
+          	  	<institutionIdentifier> 	  	 
+          	  	<value>JRF</value> 	  	 
+          	  	<typeOrSource> 	  	 
+          	  	  	<pointer>http://worldcat.org/registry/institutions/</pointer> 	 
+          	  	</typeOrSource> 	  	 
+          	  	</institutionIdentifier> 	  	 
+          	  	  	<physicalLocation>Menlo Park Public Library</physicalLocation> 	  	 
+          	  	  	<physicalAddress> 	  	  	 
+          	  	  	<text>Menlo Park, CA 94025 United States </text> 	  	 
+          	  	  	  	</physicalAddress> 	  	 
+          	  	  	  	  	<electronicAddress> 	  	 
+          	  	  	  	  	<text>http://www.worldcat.org/wcpa/oclc/15550774? page=frame&amp;url=%3D%3FUTF-8%3FB%FaHR0cDovL2NhdGFsb2cucGxzaW5mby5vcmcvc2VhcmNoL2kwMTk1MDM4NjMw%3F%3D&amp;title=Menlo+Park+Public+Library&amp;linktype=opac&amp;detail=JRF%3AMenlo+Park+Public+Library%3APublic&amp;app=wcapi&amp;id=OCL-OCLC+Staff+use</text>
+          	  	  	  	  	</electronicAddress> 	  	  	 
+          	  	  	  	  	<holdingSimple> 	  	  	 
+          	  	  	  	  	  	<copiesSummary> 	  	  	 
+          	  	  	  	  	  	  	<copiesCount>1</copiesCount> 	  	  	 
+          	  	  	  	  	  	</copiesSummary> 	  	  	 
+          	  	  	  	</holdingSimple> 	  	  	 
+          	  	</holding> 	  	  	 
+          	  	  	  	</holdingExternal>
+            </mods>'
+        @mods_rec.from_str(xml, false).location.holdingExternal.should be_an_instance_of(Nokogiri::XML::NodeSet)
+        @mods_rec.from_str(xml, false).location.holdingExternal.first.should be_an_instance_of(Nokogiri::XML::Element)
+      end
+
+    end # WITHOUT namespaces
+
   end
+
 end