mods 0.0.13 → 0.0.14

data/README.rdoc

@@ -37,7 +37,8 @@ TODO: Write usage instructions here
 
 == Releases
 
-(0.0.14 make namespace aware processing the default)
+(0.0.15 make namespace aware processing the default)
+0.0.14 don't lose xml encoding in reader.normalize_mods under jruby
 0.0.13 really really fix removal of xsi:schemaLocation in jruby
 0.0.12 fix failing jruby test
 0.0.11 fix remove xsi:schemaLocation attribute from mods element when not using namespaces

data/lib/mods/reader.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Mods
   class Reader
     
@@ -13,15 +15,15 @@ module Mods
     end
     
     # @param str - a string containing mods xml
-    # @return a Nokogiri::XML::Document object
+    # @return Nokogiri::XML::Document
     def from_str(str)
-      @mods_ng_xml = Nokogiri::XML(str)
+      @mods_ng_xml = Nokogiri::XML(str, nil, str.encoding.to_s)
       normalize_mods
       @mods_ng_xml
     end
   
     # @param url (String) - url that has mods xml as its content
-    # @return a Nokogiri::XML::Document object
+    # @return Nokogiri::XML::Document
     def from_url(url, encoding = nil, options = Nokogiri::XML::ParseOptions::DEFAULT_XML)
       require 'open-uri'
       @mods_ng_xml = Nokogiri::XML(open(url).read)
@@ -30,7 +32,7 @@ module Mods
     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
+    # @return Nokogiri::XML::Document
     def from_nk_node(node)
       @mods_ng_xml = Nokogiri::XML(node.to_s)
       normalize_mods
@@ -48,8 +50,8 @@ module Mods
         end
         # doing weird re-reading of xml for jruby, which gets confused by its own cache
         #   using pedantic is helpful for debugging
-#        @mods_ng_xml = Nokogiri::XML(@mods_ng_xml.to_s, nil, nil, Nokogiri::XML::ParseOptions::PEDANTIC)
-        @mods_ng_xml = Nokogiri::XML(@mods_ng_xml.to_s)
+#        @mods_ng_xml = Nokogiri::XML(@mods_ng_xml.to_s, nil, @mods_ng_xml.encoding, Nokogiri::XML::ParseOptions::PEDANTIC)
+        @mods_ng_xml = Nokogiri::XML(@mods_ng_xml.to_s, nil, @mods_ng_xml.encoding)
       end
     end
     

data/lib/mods/record.rb

@@ -14,7 +14,7 @@ module Mods
     
     ATTRIBUTES = ['id', 'version']
 
-    # @param (String) what to use when combining a title and subtitle, e.g. 
+    # @param (String) title_delimiter what to use when combining a title and subtitle, e.g. 
     #  for title "MODS" and subtitle "Metadata Odious Delimited Stuff" and delimiter " : "
     #  we get "MODS : Metadata Odious Delimited Stuff"
     def initialize(title_delimiter = Mods::TitleInfo::DEFAULT_TITLE_DELIM)
@@ -34,7 +34,7 @@ module Mods
     end
 
     # convenience method to call Mods::Reader.new.from_url and to nom
-    # @param ns_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 false
     # @param url (String) - url that has mods xml as its content
     def from_url(url, namespace_aware = false)
       @mods_ng_xml = Mods::Reader.new(ns_aware).from_url(url)

data/lib/mods/version.rb

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

data/spec/location_spec.rb

@@ -18,9 +18,6 @@ describe "Mods <location> Element" do
   end
 
   context "basic location terminology pieces" do
-    before(:all) do
-      @mods_rec.from_str(@form_and_extent)
-    end
     
     context "physicalLocation child element" do
       before(:all) do

data/spec/origin_info_spec.rb

@@ -161,9 +161,6 @@ describe "Mods <originInfo> Element" do
   end
 
   context "basic <originInfo> terminology pieces" do
-    before(:all) do
-      @mods_rec.from_str(@form_and_extent)
-    end
 
     context "<place> child element" do
       before(:all) do

data/spec/reader_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe "Mods::Reader" do
@@ -21,6 +23,21 @@ describe "Mods::Reader" do
     @from_url.class.should == Nokogiri::XML::Document
   end
   
+  context "normalizing mods" do
+    it "should not lose UTF-8 encoding" do
+      utf_mods = '<?xml version="1.0" encoding="UTF-8"?>
+                  <mods:mods xmlns:mods="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3"
+                  xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd">
+                  <mods:name authority="local" type="personal">
+                  <mods:namePart>Gravé par Denise Macquart.</mods:namePart>
+                  </mods:name>
+                  </mods:mods>'
+      reader = Mods::Reader.new.from_str(utf_mods)
+      reader.encoding.should eql("UTF-8")
+    end
+  end
+  
   context "from_nk_node" do
     before(:all) do
       oai_resp = '<?xml version="1.0" encoding="UTF-8"?>

metadata

@@ -1,163 +1,180 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  prerelease:
+  version: 0.0.14
 platform: ruby
 authors:
 - Naomi Dushay
 - Bess Sadler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nom-xml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: iso-639
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-description: Parse MODS (Metadata Object Description Schema) records.  More information
-  about MODS can be found at http://www.loc.gov/standards/mods/
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+description: Parse MODS (Metadata Object Description Schema) records.  More information about MODS can be found at http://www.loc.gov/standards/mods/
 email:
 - ndushay AT stanford.edu
 - bess AT stanford.edu
@@ -202,32 +219,34 @@ files:
 - spec/top_level_elmnts_simple_spec.rb
 homepage: https://github.com/sul-dlss/mods
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1378644879324237983
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1378644879324237983
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Parse MODS (Metadata Object Description Schema) records.
 test_files:
@@ -245,4 +264,4 @@ test_files:
 - spec/subject_spec.rb
 - spec/title_spec.rb
 - spec/top_level_elmnts_simple_spec.rb
-has_rdoc: 
+has_rdoc: