nori 1.0.3 → 1.1.0

data/.travis.yml

@@ -1,8 +1,10 @@
-script: "rake"
+script: "bundle exec rake"
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - ree
-  - rbx
-  - jruby
-  - ruby-head

data/CHANGELOG.md

@@ -1,8 +1,10 @@
-== 1.0.3 (2013-01-10)
+== 1.1.0 (2012-02-17)
 
-* Fix for remote code execution bug. For more in-depth information, read about the
-  recent [Rails hotfix](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/61bkgvnSGTQ).
-  Please make sure to upgrade now!
+* Improvement: Merged [pull request 9](https://github.com/rubiii/nori/pull/9) to
+  allow multiple configurations of Nori.
+
+* Fix: Merged [pull request 10](https://github.com/rubiii/nori/pull/10) to handle
+  date/time parsing errors. Fixes a couple of similar error reports.
 
 == 1.0.2 (2011-07-04)
 
@@ -60,7 +62,7 @@
 
 == 0.2.1 (2011-05-15)
 
-* Fix: Changed XML attributes converted to Hash keys to be prefixed with an @-sign.
+* Fix: Changed XML attributes converted to Hash keys to be prefixed with an @-sign.  
   This avoids problems with attributes and child nodes having the same name.
 
       <multiRef id="id1">

data/README.md

@@ -1,4 +1,4 @@
-Nori [![Build Status](http://travis-ci.org/rubiii/nori.png)](http://travis-ci.org/rubiii/nori)
+Nori [![Build Status](https://secure.travis-ci.org/rubiii/nori.png)](http://travis-ci.org/rubiii/nori)
 ====
 
 Really simple XML parsing ripped from Crack which ripped it from Merb.  

data/Rakefile

@@ -1,16 +1,12 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-
-require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
 desc "Benchmark Nori parsers"
 task :benchmark do
   require "benchmark/benchmark"
 end
 
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-c)
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new
 
 task :default => :spec
 task :test => :spec

data/lib/nori.rb

@@ -9,7 +9,7 @@ module Nori
   # Translates the given +xml+ to a Hash. Accepts an optional +parser+ to use.
   def parse(xml, parser = nil)
     return {} if xml.blank?
-    Parser.parse xml, parser
+    Parser.parse xml, parser, self
   end
 
   # Sets the +parser+ to use.

data/lib/nori/parser.rb

@@ -27,8 +27,8 @@ module Nori
 
     # Returns the parsed +xml+ using the parser to use. Raises an +ArgumentError+
     # unless the optional or default +parser+ exists.
-    def self.parse(xml, parser = nil)
-      load_parser(parser).parse xml
+    def self.parse(xml, parser = nil, nori = Nori)
+      load_parser(parser).parse(xml, nori)
     end
 
   private

data/lib/nori/parser/nokogiri.rb

@@ -9,13 +9,14 @@ module Nori
     module Nokogiri
 
       class Document < ::Nokogiri::XML::SAX::Document
+        attr_accessor :nori
 
         def stack
           @stack ||= []
         end
 
         def start_element(name, attrs = [])
-          stack.push Nori::XMLUtilityNode.new(name, Hash[*attrs.flatten])
+          stack.push Nori::XMLUtilityNode.new(nori, name, Hash[*attrs.flatten])
         end
 
         def end_element(name)
@@ -33,8 +34,11 @@ module Nori
 
       end
 
-      def self.parse(xml)
+      def self.parse(xml, nori)
+        return {} if xml.strip.empty?
+
         document = Document.new
+        document.nori = nori
         parser = ::Nokogiri::XML::SAX::Parser.new document
         parser.parse xml
         document.stack.length > 0 ? document.stack.pop.to_hash : {}

data/lib/nori/parser/rexml.rb

@@ -8,7 +8,7 @@ module Nori
     # REXML pull parser.
     module REXML
 
-      def self.parse(xml)
+      def self.parse(xml, nori)
         stack = []
         parser = ::REXML::Parsers::BaseParser.new(xml)
 
@@ -20,7 +20,7 @@ module Nori
           when :end_doctype, :start_doctype
             # do nothing
           when :start_element
-            stack.push Nori::XMLUtilityNode.new(event[1], event[2])
+            stack.push Nori::XMLUtilityNode.new(nori, event[1], event[2])
           when :end_element
             if stack.size > 1
               temp = stack.pop

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
 module Nori
 
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -52,20 +52,23 @@ module Nori
     self.typecasts["decimal"]       = lambda { |v| v.nil? ? nil : BigDecimal(v.to_s) }
     self.typecasts["double"]        = lambda { |v| v.nil? ? nil : v.to_f }
     self.typecasts["float"]         = lambda { |v| v.nil? ? nil : v.to_f }
+    self.typecasts["symbol"]        = lambda { |v| v.nil? ? nil : v.to_sym }
     self.typecasts["string"]        = lambda { |v| v.to_s }
+    self.typecasts["yaml"]          = lambda { |v| v.nil? ? nil : YAML.load(v) }
     self.typecasts["base64Binary"]  = lambda { |v| v.unpack('m').first }
 
     self.available_typecasts = self.typecasts.keys
 
-    def initialize(name, normalized_attributes = {})
+    def initialize(nori, name, normalized_attributes = {})
       # unnormalize attribute values
       attributes = Hash[* normalized_attributes.map do |key, value|
         [ key, unnormalize_xml_entities(value) ]
       end.flatten]
 
+      @nori = nori
       @name = name.tr("-", "_")
-      @name = @name.split(":").last if Nori.strip_namespaces?
-      @name = Nori.convert_tag(@name) if Nori.convert_tags?
+      @name = @name.split(":").last if @nori.strip_namespaces?
+      @name = @nori.convert_tag(@name) if @nori.convert_tags?
 
       # leave the type alone if we don't know what it is
       @type = self.class.available_typecasts.include?(attributes["type"]) ? attributes.delete("type") : attributes["type"]
@@ -92,7 +95,7 @@ module Nori
     end
 
     def prefixed_attribute_name(attribute)
-      Nori.convert_tags? ? Nori.convert_tag(attribute) : attribute
+      @nori.convert_tags? ? @nori.convert_tag(attribute) : attribute
     end
 
     def add_node(node)
@@ -110,7 +113,7 @@ module Nori
 
       if @text
         t = typecast_value unnormalize_xml_entities(inner_html)
-        t = advanced_typecasting(t) if t.is_a?(String) && Nori.advanced_typecasting?
+        t = advanced_typecasting(t) if t.is_a?(String) && @nori.advanced_typecasting?
 
         if t.is_a?(String)
           t = StringWithAttributes.new(t)
@@ -191,9 +194,9 @@ module Nori
       case split.first
         when "true"       then true
         when "false"      then false
-        when XS_DATE_TIME then DateTime.parse(value)
-        when XS_DATE      then Date.parse(value)
-        when XS_TIME      then Time.parse(value)
+        when XS_DATE_TIME then try_to_convert(value) {|x| DateTime.parse(x)}
+        when XS_DATE      then try_to_convert(value) {|x| Date.parse(x)}
+        when XS_TIME      then try_to_convert(value) {|x| Time.parse(x)}
         else                   value
       end
     end
@@ -227,6 +230,12 @@ module Nori
     def unnormalize_xml_entities value
       REXML::Text.unnormalize(value)
     end
+
+    def try_to_convert(value, &block)
+      block.call(value)
+    rescue ArgumentError
+      value
+    end
   end
 
 end

data/nori.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "nori"
 
+  s.add_development_dependency "rake",     "~> 0.8.7"
   s.add_development_dependency "nokogiri", ">= 1.4.0"
   s.add_development_dependency "rspec",    "~> 2.5.0"
   s.add_development_dependency "autotest"

data/spec/nori/nori_spec.rb

@@ -154,6 +154,12 @@ describe Nori do
           parse("<value>1955-04-18T11:22:33-05:00 is a dateTime</value>")["value"].should ==
             "1955-04-18T11:22:33-05:00 is a dateTime"
         end
+
+        ["00-00-00", "0000-00-00", "0000-00-00T00:00:00", "0569-23-0141", "DS2001-19-1312654773", "e6:53:01:00:ce:b4:06"].each do |date_string|
+          it "should not transform a String like '#{date_string}' to date or time" do
+            parse("<value>#{date_string}</value>")["value"].should == date_string
+          end
+        end
       end
 
       context "Parsing xml with text and attributes" do
@@ -367,8 +373,7 @@ describe Nori do
           'approved'   => nil,
           'written_on' => nil,
           'viewed_at'  => nil,
-          # don't execute arbitary YAML code
-          'content'    => { "@type" => "yaml" },
+          'content'    => nil,
           'parent_id'  => nil,
           'nil_true'   => nil,
           'namespaced' => nil
@@ -387,7 +392,7 @@ describe Nori do
             <replies-close-in type="integer">2592000000</replies-close-in>
             <written-on type="date">2003-07-16</written-on>
             <viewed-at type="datetime">2003-07-16T09:28:00+0000</viewed-at>
-            <content type="yaml">--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true</content>
+            <content type="yaml">--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true\n</content>
             <author-email-address>david@loudthinking.com</author-email-address>
             <parent-id></parent-id>
             <ad-revenue type="decimal">1.5</ad-revenue>
@@ -408,13 +413,12 @@ describe Nori do
           # Changed this line where the key is :message.  The yaml specifies this as a symbol, and who am I to change what you specify
           # The line in ActiveSupport is
           # 'content' => { 'message' => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
-          'content' => "--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true",
+          'content' => { :message => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
           'author_email_address' => "david@loudthinking.com",
           'parent_id' => nil,
           'ad_revenue' => BigDecimal("1.50"),
           'optimum_viewing_angle' => 135.0,
-          # don't create symbols from arbitary remote code
-          'resident' => "yes"
+          'resident' => :yes
         }
 
         parse(topic_xml)["topic"].each do |k,v|
@@ -634,6 +638,25 @@ describe Nori do
       end
 
     end
+
+    describe "using different nori" do
+      let(:parser) { parser }
+      let(:different_nori) do
+        module DifferentNori
+          extend Nori
+        end
+        DifferentNori.configure do |config|
+          config.convert_tags_to { |tag| tag.upcase }
+        end
+        DifferentNori
+      end
+
+      it "should transform with different nori" do
+        xml = "<SomeThing>xml</SomeThing>"
+        parse(xml).should == { "SomeThing" => "xml" }
+        different_nori.parse(xml, parser).should == { "SOMETHING" => "xml" }
+      end
+    end
   end
 
   def parse(xml)

data/spec/nori/parser_spec.rb

@@ -34,4 +34,21 @@ describe Nori::Parser do
     end
   end
 
+  describe ".parse with different nori" do
+    let(:other_nori) do
+      module OtherNori
+        extend Nori
+      end
+      OtherNori.configure do |config|
+        config.convert_tags_to { |tag| tag.upcase }
+      end
+      OtherNori
+    end
+
+    it "should load the parser to use and parse the given xml" do
+      parser.parse("<SomeThing>xml</SomeThing>").should == { "SomeThing" => "xml" }
+      parser.parse("<SomeThing>xml</SomeThing>", nil, other_nori).should == { "SOMETHING" => "xml" }
+    end
+  end
+
 end

metadata

@@ -1,72 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: nori
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Daniel Harrington
 - John Nunemaker
 - Wynn Netherland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
+
+date: 2012-02-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  version_requirements: *id001
+  name: rake
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  version_requirements: *id002
+  name: nokogiri
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id003
+  name: rspec
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: autotest
 description: XML to Hash translator
 email: me@rubiii.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -98,29 +121,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/rubiii/nori
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: nori
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: XML to Hash translator
-test_files:
+test_files: 
 - spec/nori/core_ext/hash_spec.rb
 - spec/nori/core_ext/object_spec.rb
 - spec/nori/core_ext/string_spec.rb