mods 0.0.9 → 0.0.10

data/README.rdoc

@@ -37,6 +37,7 @@ TODO: Write usage instructions here
 
 == Releases
 
+0.0.10 remove xsi:schemaLocation attribute from mods element when not using namespaces
 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

data/Rakefile

@@ -29,7 +29,7 @@ end
 
 # Use yard to build docs
 begin
-  project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
+  project_root = File.expand_path(File.dirname(__FILE__))
   doc_dest_dir = File.join(project_root, 'doc')
 
   YARD::Rake::YardocTask.new(:doc) do |yt|

data/lib/mods/nom_terminology.rb

@@ -318,38 +318,38 @@ module Mods
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
-          n.topic :path => 'topic' do |n|
+          n.topic :path => 'topic' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.geographic :path => 'geographic' do |n|
+          n.geographic :path => 'geographic' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.temporal :path => 'temporal' do |n|
+          n.temporal :path => 'temporal' do |n1|
             # date attributes as elements
             Mods::DATE_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "#{attr_name}"
+              n1.send attr_name, :path => "#{attr_name}"
             }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
             # date attributes as attributes
             Mods::DATE_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.titleInfo :path => 'titleInfo' do |t|
+          n.titleInfo :path => 'titleInfo' do |t1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              t.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
           # Note:  'name' is used by Nokogiri
-          n.name_el :path => 'name' do |t|
+          n.name_el :path => 'name' do |t1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              t.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
           n.personal_name :path => 'name[@type="personal"]'
@@ -360,30 +360,30 @@ module Mods
               g.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.genre :path => 'genre' do |n|
+          n.genre :path => 'genre' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.hierarchicalGeographic :path => 'hierarchicalGeographic' do |n|
+          n.hierarchicalGeographic :path => 'hierarchicalGeographic' do |n1|
             Mods::Subject::HIER_GEO_CHILD_ELEMENTS.each { |elname|
-              n.send elname, :path => "#{elname}"
+              n1.send elname, :path => "#{elname}"
             }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.cartographics :path => 'cartographics' do |n|
-            n.scale :path => 'scale'
-            n.projection :path => 'projection'
-            n.coordinates :path => 'coordinates'
+          n.cartographics :path => 'cartographics' do |n1|
+            n1.scale :path => 'scale'
+            n1.projection :path => 'projection'
+            n1.coordinates :path => 'coordinates'
             Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
-              n.send elname, :path => "#{elname}"
+              n1.send elname, :path => "#{elname}"
             }
           end
-          n.occupation :path => 'occupation' do |n|
+          n.occupation :path => 'occupation' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
-              n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
+              n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
         end # t.subject

data/lib/mods/reader.rb

@@ -42,6 +42,8 @@ module Mods
     def normalize_mods
       if !@namespace_aware
         @mods_ng_xml.remove_namespaces!
+        # xsi:schemaLocation attribute will cause problems in JRuby
+        @mods_ng_xml.root.remove_attribute('schemaLocation') if @mods_ng_xml.has_attribute?('schemaLocation')
         # doing weird re-reading of xml for jruby, which gets confused by its own cache
         @mods_ng_xml = Nokogiri::XML(@mods_ng_xml.to_s)
       end

data/lib/mods/version.rb

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

data/spec/reader_spec.rb

@@ -84,6 +84,18 @@ describe "Mods::Reader" do
       my_from_str_wrong_ns.xpath('/mods:mods/mods:note', @ns_hash).text.should_not == "hi"
       my_from_str_wrong_ns.xpath('/mods/note').text.should_not == "hi"
     end
+    
+    it "should remove xsi:schemaLocation attribute from mods element if removing namespaces" do
+      str = '<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:note>be very frightened</ns3:note></ns3:mods>'
+			ng_xml = Nokogiri::XML(str)
+			ng_xml.root.has_attribute?('schemaLocation').should == true
+			r = Mods::Reader.new
+      r.namespace_aware = true
+      r.from_nk_node(ng_xml)
+      r.mods_ng_xml.has_attribute?('schemaLocation').should == false
+      r.mods_ng_xml.has_attribute?('xsi:schemaLocation').should == false
+    end
   end
   
   it "should do something useful when it gets unparseable XML" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -681303896929700435
+      hash: -2366641569606885765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -681303896929700435
+      hash: -2366641569606885765
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24