sergio 0.0.2 → 0.0.3

data/lib/sergio/hash_methods.rb

@@ -50,15 +50,6 @@ module Sergio
       v
     end
 
-    #FROM https://gist.github.com/6391/62b6aae9206abe7b3fea6d4659e4c246f8cf7632
-    def hash_recursive_merge(lval, rval)
-      r = {}
-      v = lval.merge(rval) do |key, oldval, newval| 
-        r[key] = oldval.class == Hash && newval.class == Hash ? hash_recursive_merge(oldval, newval) : newval
-      end
-      v
-    end
-
     def hash_recursive_append(lval, rval)
       r = {}
       v = lval.merge(rval) do |key, oldval, newval|
@@ -85,10 +76,4 @@ module Sergio
       v
     end
   end
-
-  def remove_empty_hashes(hash)
-    hash.delete_if do |k,v|
-      true
-    end
-  end
 end

data/lib/sergio/sergio_sax.rb

@@ -7,8 +7,9 @@ class SergioSax < Nokogiri::XML::SAX::Document
   end
 
   def start_element(name, attrs = [])
+    attrs = Hash[*attrs.flatten]
     @stack << [name, attrs]
-    if current_configs = @object.class.sergio_config.get_element_configs(@stack.clone)
+    if current_configs = @object.class.sergio_config.get_element_configs(@stack)
       current_configs.each do |c|
         if c.aggregate_element
           @parent_callbacks << lambda do
@@ -21,7 +22,7 @@ class SergioSax < Nokogiri::XML::SAX::Document
 
   def characters(string)
     name, attrs = @stack.last
-    attrs << ['@text', string]
+    attrs['@text'] = attrs.fetch('@text', '') + string
   end
 
   def cdata_block(string)
@@ -29,22 +30,20 @@ class SergioSax < Nokogiri::XML::SAX::Document
   end
   
   def end_element(name)
-    current_configs = @object.class.sergio_config.get_element_configs(@stack.clone)
+    current_configs = @object.class.sergio_config.get_element_configs(@stack)
     name, attrs = @stack.pop
     if current_configs
       current_configs.each do |c|
         attr = c.options[:attribute]
-        val = attrs.assoc(attr)
+        val = attrs[attr]
         callback = c.callback
 
         if val && !c.aggregate_element
-          val = val[1]
           r = if callback.arity == 1
             callback.call(val)
           elsif callback.arity == 2
-            h = Hash[*attrs.flatten]
-            h.delete('@text')
-            callback.call(val, h)
+            attrs.delete('@text')
+            callback.call(val, attrs)
           end
 
           #only builds parent elements if at least one of their child elements has a match

data/lib/sergio/version.rb

@@ -1,3 +1,3 @@
 module Sergio
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/support/weird_unicode.xml

@@ -0,0 +1,42 @@
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:service="http://activitystrea.ms/service-provider" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:geo="http://www.georss.org/georss" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:gnip="http://www.gnip.com/schemas/2010">
+  <id>z13ocjxg0rnfj1kgh04cejqrswjgx1fopzs0k</id>
+  <published>2011-12-13T16:38:37+00:00</published>
+  <updated>2011-12-13T16:38:38+00:00</updated>
+  <title type="text/plain">Jay M posted a bookmark on Google+</title>
+  <category term="BookmarkPosted" label="Bookmark Posted"/>
+  <link rel="alternate" type="text/html" href="https://plus.google.com/115224273541109110117/posts/QfsSsHEmF27"/>
+  <source>
+    <link rel="self" type="application/json" href="https://www.googleapis.com/plus/v1/activities?query=Christmas&amp;orderBy=recent&amp;maxResults=20&amp;key=AIzaSyCl4y-dm-Nzf8zPdBYjQUSN0xbxE7JLCRI"/>
+    <title>Google - Plus - Keyword Search - Christmas</title>
+    <updated>2011-12-13T19-03-49Z</updated>
+    <gnip:rule>Christmas</gnip:rule>
+  </source>
+  <service:provider>
+    <name>Google</name>
+    <uri>plus.google.com</uri>
+  </service:provider>
+  <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+  <activity:object>
+    <activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+    <id>object:z13ocjxg0rnfj1kgh04cejqrswjgx1fopzs0k</id>
+    <title type="text/html">www.militaryweddingdiscounts.com  &#xBB; Blog Archive   &#xBB; Second Day of Christmas &#x2013; Jay Mountford Photography</title>
+    <content type="text/html">Second Day of Christmas &#x2013; Jay Mountford Photography. Posted by Emma &#x2665; - December 13th, 2011. Name: Jay Mountford. Company name: Jay Mountford Photography. &#x2665; Favourite Christmas Song: That&amp;#39;s a toug...</content>
+    <subtitle type="text/html">Oooo looky looky - I&amp;#39;m talking about some amusing Christmas wishes over on Military Wedding today!&lt;br /&gt;&lt;br /&gt;#Christmas #Wedding #Military #Photography</subtitle>
+    <link rel="alternate" type="text/html" href="https://plus.google.com/115224273541109110117/posts/QfsSsHEmF27"/>
+    <link rel="enclosure" type="text/html" href="http://militaryweddingdiscounts.com/second-day-of-christmas-jay-mountford-photography/" title="www.militaryweddingdiscounts.com  &#xBB; Blog Archive   &#xBB; Second Day of Christmas &#x2013; Jay Mountford Photography"/>
+    <link rel="enclosure" type="image/jpeg" href="http://militaryweddingdiscounts.com/wp-content/uploads/2011/12/JayMountford12doc-1024x819.png" media:width="1024" media:height="819"/>
+    <gnip:statistics favoriteCount="0"/>
+  </activity:object>
+  <author>
+    <name>Jay M</name>
+    <uri>https://plus.google.com/115224273541109110117</uri>
+  </author>
+  <activity:actor>
+    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+    <link rel="alternate" type="html" length="0" href="https://plus.google.com/115224273541109110117"/>
+    <id>115224273541109110117</id>
+  </activity:actor>
+  <gnip:matching_rules>
+    <gnip:matching_rule rel="source">Christmas</gnip:matching_rule>
+  </gnip:matching_rules>
+</entry>

data/spec/unit/sergio_hash_methods_spec.rb

@@ -62,32 +62,6 @@ describe Sergio::HashMethods do
     end
   end
 
-  context 'hash_recursive_merge' do
-    before do
-      @s = Class.new do
-        include Sergio::HashMethods
-      end.new
-    end
-
-    it 'merges subhashes together' do
-      h1 = {:thing => {'guy' => 'cool'}}
-      h2 = {:thing => {'guys' => 'cool'}}
-      @s.hash_recursive_merge(h1, h2).should == {:thing => {'guy' => 'cool', 'guys' => 'cool'}}
-    end
-
-    it 'replaces intersecting key values with rightmost hash argument value' do
-      h1 = {:thing => {'guy' => 'cool'}}
-      h2 = {:thing => {'guy' => 'cools'}}
-      @s.hash_recursive_merge(h1, h2).should == {:thing => {'guy' => 'cools'}}
-    end
-
-    it 'merges new key values into existing hash if one is present' do
-      h1 = {:thing => {'guy' => 'cool'}}
-      h2 = {:thing => {'neat' => 'cools'}}
-      @s.hash_recursive_merge(h1, h2).should == {:thing => {'guy' => 'cool', 'neat' => 'cools'}}
-    end
-  end
-
   context 'hash_recursive_append' do
     before do
       @s = Class.new do

data/spec/unit/sergio_spec.rb

@@ -38,14 +38,15 @@ describe Sergio do
           end
         end
       end
-      @xml = '<a>
-        <b></b>
-        <b><f>a</f></b>
-        <b>he</b>
-        <c>a</c>
-        <c>
-          <e>e</e>
-        </c>
+      @xml = '
+        <a>
+          <b></b>
+          <b><f>a</f></b>
+          <b>he</b>
+          <c>a</c>
+          <c>
+            <e>e</e>
+          </c>
         </a>'
       h = s.new.parse(@xml)
       h.should == {'a' => {'b' => [{'f' => 'a'}, {'e' => 'e'}]}}
@@ -269,7 +270,7 @@ describe Sergio do
 
       @xml = '<a y="what"><b>hi</b></a>'
       @hash = s.new.parse(@xml)
-      @hash['a']['b'].should == {'c' => 'what'}
+      @hash['a']['b'].should == 'hi'
     end
   end
 
@@ -291,4 +292,18 @@ describe Sergio do
       v.should == {'thing' => [{'stuff' => '1'}, {'stuff' => '2'}]}
     end
   end
+
+  it 'properly parses elements which make multiple calls to SergioSax#characters' do
+    s = new_sergio do
+      element 'entry' do
+        element 'activity:object', 'object' do
+          element 'subtitle'
+        end
+      end
+    end
+
+    parsed_d = s.new.parse(File.read(File.dirname(__FILE__) + '/../support/weird_unicode.xml'))
+    expected = "Oooo looky looky - I&#39;m talking about some amusing Christmas wishes over on Military Wedding today!<br /><br />#Christmas #Wedding #Military #Photography"
+    parsed_d['entry']['object']['subtitle'].should == expected
+  end
 end

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sergio
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Max Justus Spransy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70096777136780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70096777136780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70096777135780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70096777135780
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70096777134760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: "\n      Sergio provides a declarative syntax for parsing unruly xml into nice pretty hashes.\n    "
-email: 
+  prerelease: false
+  version_requirements: *70096777134760
+description: ! "\n      Sergio provides a declarative syntax for parsing unruly xml
+  into nice pretty hashes.\n    "
+email:
 - maxjustus@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -73,40 +69,38 @@ files:
 - spec/support/buzz_activity_stream.xml
 - spec/support/facebook_activity_stream.xml
 - spec/support/twitter_activity_stream.xml
+- spec/support/weird_unicode.xml
 - spec/unit/sergio_hash_methods_spec.rb
 - spec/unit/sergio_spec.rb
-has_rdoc: true
 homepage: https://github.com/maxjustus/Sergio
 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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sergio
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: SAXy xml to hash transformation.
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/support/buzz_activity_stream.xml
 - spec/support/facebook_activity_stream.xml
 - spec/support/twitter_activity_stream.xml
+- spec/support/weird_unicode.xml
 - spec/unit/sergio_hash_methods_spec.rb
 - spec/unit/sergio_spec.rb