nori 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+== 0.2.1 (2011-05-15)
+
+* 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">
+        <approved xsi:type="xsd:boolean">true</approved>
+        <id xsi:type="xsd:long">76737</id>
+      </multiRef>
+
+  is now translated to:
+
+      { "multiRef" => { "@id" => "id1", "id" => "76737", "approved" => "true" } }
+
 == 0.2.0 (2011-04-30)
 
 * Removed JSON from the original Crack basis

data/README.md

@@ -1,8 +1,8 @@
 Nori ![http://travis-ci.org/rubiii/nori](http://travis-ci.org/rubiii/nori.png)
 ====
 
-Really simple XML parsing ripped from Crack which ripped it from Merb.
-Nori was created to bypass the stale development of Crack, improve its XML parser
+Really simple XML parsing ripped from Crack which ripped it from Merb.  
+Nori was created to bypass the stale development of Crack, improve its XML parser  
 and fix certain issues.
 
 ``` ruby
@@ -10,12 +10,12 @@ Nori.parse("<tag>This is the contents</tag>")
 # => { 'tag' => 'This is the contents' }
 ```
 
-Nori supports pluggable parsers and ships with both REXML and Nokogiri implementations.
+Nori supports pluggable parsers and ships with both REXML and Nokogiri implementations.  
 It defaults to REXML, but you can change it to use Nokogiri via:
 
 ``` ruby
 Nori.parser = :nokogiri
 ```
 
-Make sure Nokogiri is in your LOAD_PATH when parsing XML, because Nori tries to load it
+Make sure Nokogiri is in your LOAD_PATH when parsing XML, because Nori tries to load it  
 when it's needed.

data/Rakefile

@@ -9,7 +9,7 @@ task :benchmark do
 end
 
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-fd -c)
+  t.rspec_opts = %w(-c)
 end
 
 task :default => :spec

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
 module Nori
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -65,6 +65,13 @@ module Nori
 
     attr_accessor :name, :attributes, :children, :type
 
+    def prefixed_attributes
+      attributes.inject({}) do |memo, (key, value)|
+        memo["@#{key}"] = value
+        memo
+      end
+    end
+
     def add_node(node)
       @text = true if node.is_a? String
       @children << node
@@ -83,8 +90,12 @@ module Nori
 
       if @text
         t = typecast_value( unnormalize_xml_entities( inner_html ) )
-        t.class.send(:attr_accessor, :attributes)
-        t.attributes = attributes
+        if t.is_a?(String)
+          class << t
+            attr_accessor :attributes
+          end
+          t.attributes = attributes
+        end
         return { name => t }
       else
         #change repeating groups into an array
@@ -111,7 +122,7 @@ module Nori
               out.merge!( k => v.map{|e| e.to_hash[k]})
             end
           end
-          out.merge! attributes unless attributes.empty?
+          out.merge! prefixed_attributes unless attributes.empty?
           out = out.empty? ? nil : out
         end
 

data/spec/nori/nori_spec.rb

@@ -25,7 +25,7 @@ describe Nori do
 
       it "should transform a simple tag with attributes" do
         xml = "<tag attr1='1' attr2='2'></tag>"
-        hash = { 'tag' => { 'attr1' => '1', 'attr2' => '2' } }
+        hash = { 'tag' => { '@attr1' => '1', '@attr2' => '2' } }
         parse(xml).should == hash
       end
 
@@ -42,11 +42,11 @@ describe Nori do
         hash = {
           'opt' => {
             'user' => [{
-              'login'    => 'grep',
-              'fullname' => 'Gary R Epstein'
+              '@login'    => 'grep',
+              '@fullname' => 'Gary R Epstein'
             },{
-              'login'    => 'stty',
-              'fullname' => 'Simon T Tyson'
+              '@login'    => 'stty',
+              '@fullname' => 'Simon T Tyson'
             }]
           }
         }
@@ -66,8 +66,8 @@ describe Nori do
         hash = {
           'opt' => {
             'user' => {
-              'login' => 'grep',
-              'fullname' => 'Gary R Epstein'
+              '@login' => 'grep',
+              '@fullname' => 'Gary R Epstein'
             }
           }
         }
@@ -75,6 +75,17 @@ describe Nori do
         parse(xml).should == hash
       end
 
+      it "should prefix attributes with an @-sign to avoid problems with overwritten values" do
+        xml =<<-XML
+          <multiRef id="id1">
+            <approved>true</approved>
+            <id>76737</id>
+          </multiRef>
+        XML
+
+        parse(xml)["multiRef"].should == { "approved" => "true", "@id" => "id1", "id" => "76737" }
+      end
+
       context "Parsing xml with text and attributes" do
         before do
           xml =<<-XML
@@ -104,6 +115,16 @@ describe Nori do
         it "default attributes to empty hash if not present" do
           @data['opt']['user'][1].attributes.should == {}
         end
+
+        it "add 'attributes' accessor methods to parsed instances of String" do
+          @data['opt']['user'][0].should respond_to(:attributes)
+          @data['opt']['user'][0].should respond_to(:attributes=)
+        end
+
+        it "not add 'attributes' accessor methods to all instances of String" do
+          "some-string".should_not respond_to(:attributes)
+          "some-string".should_not respond_to(:attributes=)
+        end
       end
 
       it "should typecast an integer" do
@@ -148,26 +169,26 @@ describe Nori do
       end
 
       it "should unescape XML entities in attributes" do
-        xml_entities.each do |k,v|
-          xml = "<tag attr='Some content #{v}'></tag>"
-          parse(xml)['tag']['attr'].should =~ Regexp.new(k)
+        xml_entities.each do |key, value|
+          xml = "<tag attr='Some content #{value}'></tag>"
+          parse(xml)['tag']['@attr'].should =~ Regexp.new(key)
         end
       end
 
       it "should undasherize keys as tags" do
         xml = "<tag-1>Stuff</tag-1>"
-        parse(xml).keys.should include( 'tag_1' )
+        parse(xml).keys.should include('tag_1')
       end
 
       it "should undasherize keys as attributes" do
         xml = "<tag1 attr-1='1'></tag1>"
-        parse(xml)['tag1'].keys.should include( 'attr_1')
+        parse(xml)['tag1'].keys.should include('@attr_1')
       end
 
       it "should undasherize keys as tags and attributes" do
         xml = "<tag-1 attr-1='1'></tag-1>"
-        parse(xml).keys.should include( 'tag_1' )
-        parse(xml)['tag_1'].keys.should include( 'attr_1')
+        parse(xml).keys.should include('tag_1')
+        parse(xml)['tag_1'].keys.should include('@attr_1')
       end
 
       it "should render nested content correctly" do
@@ -203,7 +224,7 @@ describe Nori do
 
         hash = {
           "user" => {
-            "gender"    => "m",
+            "@gender"   => "m",
             "age"       => 35,
             "name"      => "Home Simpson",
             "dob"       => Date.parse('1988-01-01'),
@@ -347,14 +368,14 @@ describe Nori do
         EOT
 
         expected_topic_hash = {
-          'id' => "175756086",
-          'owner' => "55569174@N00",
-          'secret' => "0279bf37a1",
-          'server' => "76",
-          'title' => "Colored Pencil PhotoBooth Fun",
-          'ispublic' => "1",
-          'isfriend' => "0",
-          'isfamily' => "0",
+          '@id' => "175756086",
+          '@owner' => "55569174@N00",
+          '@secret' => "0279bf37a1",
+          '@server' => "76",
+          '@title' => "Colored Pencil PhotoBooth Fun",
+          '@ispublic' => "1",
+          '@isfriend' => "0",
+          '@isfamily' => "0",
         }
 
         parse(topic_xml)["rsp"]["photos"]["photo"].each do |k, v|
@@ -471,7 +492,7 @@ describe Nori do
 
         expected_product_hash = {
           'weight' => 0.5,
-          'image' => {'type' => 'ProductImage', 'filename' => 'image.gif' },
+          'image' => {'@type' => 'ProductImage', 'filename' => 'image.gif' },
         }
 
         parse(product_xml)["product"].should == expected_product_hash

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nori
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +02:00
-default_executable: 
+date: 2011-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -102,7 +101,6 @@ files:
 - spec/nori/nori_spec.rb
 - spec/nori/parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rubiii/nori
 licenses: []
 
@@ -132,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nori
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: XML to Hash translator