RubyGems - astro-sax-machine - Versions diffs - 0.0.19 → 0.0.20 - Mend

astro-sax-machine 0.0.19 → 0.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/lib/sax-machine.rb +4 -4
data/lib/sax-machine/sax_collection_config.rb +2 -2
data/lib/sax-machine/sax_document.rb +1 -1
data/lib/sax-machine/sax_handler.rb +9 -8
data/spec/sax-machine/sax_document_spec.rb +103 -25
metadata +4 -1

data/lib/sax-machine.rb CHANGED

@@ -1,11 +1,11 @@
-require "rubygems"
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require "cgi"
 require "sax-machine/sax_document"
 require "sax-machine/sax_handler"
 require "sax-machine/sax_config"
 module SAXMachine
-  VERSION = "0.0.14"
-end
+  VERSION = "0.0.20"
+end

data/lib/sax-machine/sax_collection_config.rb CHANGED

@@ -15,13 +15,13 @@ module SAXMachine
                   else nil
                   end
         @default_xmlns = options[:default_xmlns]
-        if @default_xmlns && !@xmlns.include?('')
+        if @default_xmlns && @xmlns && !@xmlns.include?('')
           @xmlns << ''
         end
       end
       def handler(nsstack)
-        if nsstack.nil? || nsstack[''] == ''
+        if @default_xmlns && (nsstack.nil? || nsstack[''] == '')
           nsstack = NSStack.new(nsstack, nsstack)
           nsstack[''] = @default_xmlns
         end

data/lib/sax-machine/sax_document.rb CHANGED

@@ -51,7 +51,7 @@ module SAXMachine
     end
     def column(sym)
-      sax_config.top_level_elements[sym.to_s][0]
+      (sax_config.top_level_elements[sym.to_s] || []).first
     end
     def data_class(sym)

data/lib/sax-machine/sax_handler.rb CHANGED

@@ -45,7 +45,7 @@ module SAXMachine
     end
     def end_element(name)
-      if parsing_collection? && @collection_config.name == name
+      if parsing_collection? && @collection_config.name == name.split(':').last
         @collection_handler.end_element(name)
         @object.send(@collection_config.accessor) << @collection_handler.object
         reset_current_collection
@@ -109,13 +109,14 @@ module SAXMachine
     def self.decode_xml(str)
       return str.map &method(:decode_xml) if str.kind_of?(Array)
-      entities = {
-        '#38'   => '&amp;',
-        '#13'   => "\r",
-      }
-      entities.keys.inject(str) { |string, key|
-        string.gsub(/&#{key};/, entities[key])
-      }
+      # entities = {
+      #         '#38'   => '&amp;',
+      #         '#13'   => "\r",
+      #       }
+      #       entities.keys.inject(str) { |string, key|
+      #         string.gsub(/&#{key};/, entities[key])
+      #       }
+      CGI.unescapeHTML(str)
     end
   end

data/spec/sax-machine/sax_document_spec.rb CHANGED

@@ -138,7 +138,7 @@ describe "SAXMachine" do
           it "should escape correctly the ampersand" do
             document = @klass.parse("<link href='http://api.flickr.com/services/feeds/photos_public.gne?id=49724566@N00&amp;lang=en-us&amp;format=atom' foo='bar'>asdf</link>")
-            document.link.should == "http://api.flickr.com/services/feeds/photos_public.gne?id=49724566@N00&amp;lang=en-us&amp;format=atom"
+            document.link.should == "http://api.flickr.com/services/feeds/photos_public.gne?id=49724566@N00&lang=en-us&format=atom"
           end
           it "should save the value of a matching element" do
@@ -344,7 +344,7 @@ describe "SAXMachine" do
         end
         context "when passing a default namespace" do
-          before :each do
+          before :all do
             @xmlns = 'urn:test'
             class Inner
               include SAXMachine
@@ -369,11 +369,55 @@ describe "SAXMachine" do
       end
     end
+    describe "when desiring sax events" do
+      XHTML_XMLNS = "http://www.w3.org/1999/xhtml"
+      before :all do
+        @klass = Class.new do
+          include SAXMachine
+          elements :body, :events => true
+        end
+      end
+      it "should parse a simple child" do
+        document = @klass.parse("<body><p/></body>")
+        document.body.should == [[:start_element, "", "p", []],
+                                 [:end_element, "", "p"]]
+      end
+      it "should parse a simple child with text" do
+        document = @klass.parse("<body><p>Hello</p></body>")
+        document.body.should == [[:start_element, "", "p", []],
+                                 [:chars, "Hello"],
+                                 [:end_element, "", "p"]]
+      end
+      it "should parse nested children" do
+        document = @klass.parse("<body><p><span/></p></body>")
+        document.body.should == [[:start_element, "", "p", []],
+                                 [:start_element, "", "span", []],
+                                 [:end_element, "", "span"],
+                                 [:end_element, "", "p"]]
+      end
+      it "should parse multiple children" do
+        document = @klass.parse("<body><p>Hello</p><p>World</p></body>")
+        document.body.should == [[:start_element, "", "p", []],
+                                 [:chars, "Hello"],
+                                 [:end_element, "", "p"],
+                                 [:start_element, "", "p", []],
+                                 [:chars, "World"],
+                                 [:end_element, "", "p"]]
+      end
+      it "should pass namespaces" do
+        document = @klass.parse("<body xmlns='#{XHTML_XMLNS}'><p/></body>")
+        document.body.should == [[:start_element, XHTML_XMLNS, "p", []],
+                                 [:end_element, XHTML_XMLNS, "p"]]
+      end
+    end
   end
   describe "elements" do
     describe "when parsing multiple elements" do
-      before :each do
+      before :all do
         @klass = Class.new do
           include SAXMachine
           elements :entry, :as => :entries
@@ -542,37 +586,71 @@ eoxml
         @document.link.should == 'http://feeds.delicious.com/v2/rss/tag/pubsubhubbub?count=15'
       end
     end
+  end
+  describe "yet another full example" do
     context "when parsing a Twitter example" do
       before :all do
-        @document = Root.parse(<<-eoxml).channels[0]
+        RSS_XMLNS = ['http://purl.org/rss/1.0/', '']
+        ATOM_XMLNS = 'http://www.w3.org/2005/Atom' unless defined? ATOM_XMLNS
+        class Link
+          include SAXMachine
+        end
+        class Entry
+          include SAXMachine
+          element   :title,        :xmlns => RSS_XMLNS
+          element   :link,         :xmlns => RSS_XMLNS,   :as => :entry_link
+          element   :title,        :xmlns => ATOM_XMLNS,  :as => :title
+          elements  :link,         :xmlns => ATOM_XMLNS,  :as => :links,      :class => Link
+        end
+        class Feed
+          include SAXMachine
+          element   :title,        :xmlns => RSS_XMLNS,  :as => :title
+          element   :link,         :xmlns => RSS_XMLNS,  :as => :feed_link
+          elements  :item,         :xmlns => RSS_XMLNS,  :as => :entries,         :class => Entry
+          element   :title,        :xmlns => ATOM_XMLNS, :as => :title
+          elements  :link,         :xmlns => ATOM_XMLNS, :as => :links,           :class => Link
+        end
+        @document = Feed.parse(<<-eoxml)
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
- <channel>
- <atom:link type="application/rss+xml" rel="self" href="http://twitter.com/statuses/user_timeline/5381582.rss"/>
- <title>Twitter / julien51</title>
- <link>http://twitter.com/julien51</link>
- <description>Twitter updates from julien / julien51.</description>
- <language>en-us</language>
- <ttl>40</ttl>
- <item>
- <title>julien51: @github : I get an error when trying to build one of my gems (julien51-sax-machine), it seems related to another gem's gemspec.</title>
- <description>julien51: @github : I get an error when trying to build one of my gems (julien51-sax-machine), it seems related to another gem's gemspec.</description>
- <pubDate>Thu, 30 Jul 2009 01:00:30 +0000</pubDate>
- <guid>http://twitter.com/julien51/statuses/2920716033</guid>
- <link>http://twitter.com/julien51/statuses/2920716033</link>
- </item>
-</channel>
-</rss>
+        <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+          <channel>
+            <atom:link type="application/rss+xml" rel="self" href="http://twitter.com/statuses/user_timeline/5381582.rss"/>
+            <title>Twitter / julien51</title>
+            <link>http://twitter.com/julien51</link>
+            <description>Twitter updates from julien / julien51.</description>
+            <language>en-us</language>
+            <ttl>40</ttl>
+          <item>
+            <title>julien51: @github :  I get an error when trying to build one of my gems (julien51-sax-machine), it seems related to another gem's gemspec.</title>
+            <description>julien51: @github :  I get an error when trying to build one of my gems (julien51-sax-machine), it seems related to another gem's gemspec.</description>
+            <pubDate>Thu, 30 Jul 2009 01:00:30 +0000</pubDate>
+            <guid>http://twitter.com/julien51/statuses/2920716033</guid>
+            <link>http://twitter.com/julien51/statuses/2920716033</link>
+          </item>
+          <item>
+            <title>julien51: Hum, San Francisco's summer are delightful. http://bit.ly/VeXt4</title>
+            <description>julien51: Hum, San Francisco's summer are delightful. http://bit.ly/VeXt4</description>
+            <pubDate>Wed, 29 Jul 2009 23:07:32 +0000</pubDate>
+            <guid>http://twitter.com/julien51/statuses/2918869948</guid>
+            <link>http://twitter.com/julien51/statuses/2918869948</link>
+          </item>
+          </channel>
+        </rss>
 eoxml
       end
       it "should parse the title" do
         @document.title.should == 'Twitter / julien51'
       end
-      it "should parse the link" do
-        @document.link.should == 'http://twitter.com/statuses/user_timeline/5381582.rss'
-      end
       it "should find an entry" do
-        @document.entries.length.should == 1
+        @document.entries.length.should == 2
       end
     end
   end

metadata CHANGED

@@ -1,10 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: astro-sax-machine
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Paul Dix
+- astro
+- julien51
+- superfeedr
 autorequire:
 bindir: bin
 cert_chain: []