magnum-pi 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU5NmI1MjVkYTk4NzA0YzU4OWRmYzU1YzYwNjBiYjBmN2FiNGVmMA==
+    YTc1YTljNjBjYzcwMmY5YmQxZmNhNGQ1MjhmNzU1ZjRhNzQ3MGQyMg==
   data.tar.gz: !binary |-
-    MGRiZGM0NGY4YjA3YzhlY2U5Mzg4YTFmNWYwMmIwOGIwYTJmNzA2Zg==
+    YjNlNjUyY2VlNzUxOThjY2U0MmMyMTBhMGNhMGJjZGJkNDBhMDFiMw==
 SHA512:
   metadata.gz: !binary |-
-    NWU3MGMyMjRkNDljNzNmZDM0ZGZkYzI5ZGIzM2U4NjczMGFhNTk1YTVmNDJj
-    YWM3NDQxZDJjYTllMmQ4ZTRkODIwOGRjNzU3YjE4NTFjZDhlNjU3N2IwNWYy
-    MjQwOGM2YjYxZTc0ZGFiZTBlNjg3NjAwM2IxYjhlZTkzYTIxYWQ=
+    OGI1NzVkYWYxZjcxMmZkNzgyMjc1YzhmNThhZGQ2M2FlOGYzOGJjMzM2NTkw
+    NTExMTNkYjM0MGY3Nzc5NmI2ZWQ2MmM1ZDE3YmYzZjgwMDkzYzcwMWQ3N2Ey
+    YzY1ODVlNWQwZTFlNDBjODdlZTMyNTk4YzI0YTEwYjM2YjA5MDI=
   data.tar.gz: !binary |-
-    Zjk0YjUxY2NmMjkxODQzOGM0ZTFlYjAwMjIyMTdkNmM4MmUxM2M2YmM3MTYw
-    ODI4YzU1ZDU5OTEwMTk2MmFmNDJkZjFiNzA5YzI2ZTQyYzYxMmZiZTQ3MTYy
-    ZmMwZWRmZDUwNWUxOWE5ZGU1MmUzNTk2ZjU4ZmM3YmNiNTYyY2U=
+    MGMzMjA5N2ViZjA5MGIyN2Y1ZmFjNmM5MmFmMzVkZTg5NDM4NmQzZmY1MTJk
+    MWJlZjIzZjIzOTBhNjdjODMxNWRjMjcyM2NhZWU4NmViODQxYjQ3ZjRiZWY0
+    OTU1ZjdjOTEzMjVkYjJkOWY2ZWM5ODFkZjI0M2QyNDczNzNmMDA=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = MagnumPI CHANGELOG
 
+== Version 0.2.0 (June 16, 2014)
+
+* Replaced XmlSimple with Ox and created `Ax` for iterating through large XML files with Sax
+
 == Version 0.1.4 (June 12, 2014)
 
 * Extended Kernel, Class, Array and Hash with #deep_clone

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/magnum-pi.rb

@@ -1,6 +1,6 @@
 require "mechanize"
 require "oj"
-require "xmlsimple"
+require "ox"
 require "active_support/core_ext/object/to_query"
 
 require "magnum-pi/core_ext"

data/lib/magnum-pi/api/consumer.rb

@@ -82,7 +82,7 @@ module MagnumPI
         when "json"
           Oj.load response
         when "xml"
-          XmlSimple.xml_in response
+          Ax.new response
         else
           response
         end

data/lib/magnum-pi/gem_ext.rb

@@ -1 +1,2 @@
-require "magnum-pi/gem_ext/mechanize"
+require "magnum-pi/gem_ext/mechanize"
+require "magnum-pi/gem_ext/ox"

data/lib/magnum-pi/gem_ext/ox.rb

@@ -0,0 +1 @@
+require "magnum-pi/gem_ext/ox/ax"

data/lib/magnum-pi/gem_ext/ox/ax.rb

@@ -0,0 +1,115 @@
+require "stringio"
+
+class Ax < Ox::Sax
+
+  def initialize(xml)
+    @stringio = StringIO.new xml
+  end
+
+  def each(pattern, &block)
+    @pattern = pattern.split("/").collect{|x| x == "" ? "*" : x}
+    @block = block
+
+    Ox.sax_parse self, @stringio
+
+  ensure
+    @current_path = nil
+    @elements = nil
+    @entry_regexp = nil
+    @last_call = nil
+  end
+
+  def start_element(name)
+    current_path << name
+    if current_element
+      add_element name
+    elsif entry?
+      add_element
+    else
+      return
+    end
+    @last_call = :start_element
+  end
+
+  def attr(name, str)
+    if element = current_element
+      element[name.to_s] = str
+    end
+  end
+
+  def text(str)
+    if element = current_element
+      element[:text] = str
+    end
+  end
+
+  def end_element(name)
+    element = finalize_element
+    if entry?
+      @block.call element, current_path[-1]
+    elsif element
+      @last_call = :end_element
+    end
+    current_path.pop
+  end
+
+  def to_hash
+    hash = {}
+    each "*" do |entry|
+      hash.merge! entry
+    end
+    hash
+  end
+
+private
+
+  def current_path
+    @current_path ||= []
+  end
+
+  def elements
+    @elements ||= []
+  end
+
+  def entry?
+    @entry_regexp ||= begin
+      pattern = @pattern.join(%q{\/}).gsub("*", %q{[^\/]+})
+      Regexp.new "^#{pattern}$"
+    end
+    !!current_path.join("/").match(@entry_regexp)
+  end
+
+  def current_element
+    elements[-1]
+  end
+
+  def add_element(name = nil)
+    element = {}
+    if parent = current_element
+      values = parent[name.to_s] ||= []
+      element[:values] = values
+      element[:index] = values.size
+    end
+    elements << element
+  end
+
+  def finalize_element
+    if element = elements.pop
+      values = element.delete :values
+      index = element.delete :index
+      if text = element.delete(:text)
+        if element.empty?
+          element = text
+        elsif element["content"]
+          element["content"] = [element["content"]] unless element["content"].is_a?(Array)
+          element["content"] << text
+        else
+          element["content"] = text
+        end
+      end
+      values[index] = element if values
+    end
+    element
+  end
+
+end

data/lib/magnum-pi/version.rb

@@ -1,7 +1,7 @@
 module MagnumPI
   MAJOR = 0
-  MINOR = 1
-  TINY  = 4
+  MINOR = 2
+  TINY  = 0
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/magnum-pi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "mechanize"
   gem.add_dependency "oj"
-  gem.add_dependency "xml-simple"
+  gem.add_dependency "ox"
   gem.add_dependency "activesupport"
 
   gem.add_development_dependency "rake"

data/test/unit/api/test_consumer.rb

@@ -154,16 +154,61 @@ module Unit
             @consumer.expects(:api).returns :format => "xml"
             assert_equal(
               {
+                "foo" => [{}],
                 "bar" => ["BAR"],
                 "baz" => [{"hello" => "world", "content" => "Baz!"}]
               }, @consumer.send(:parse_content,
                 <<-XML
                   <xml>
+                    <foo></foo>
                     <bar>BAR</bar>
                     <baz hello="world">Baz!</baz>
                   </xml>
                 XML
-              )
+              ).to_hash
+            )
+            @consumer.expects(:api).returns :format => "xml"
+            assert_equal(
+              {
+                "bar" => ["BAR"],
+                "baz" => [
+                  {
+                    "hello" => "world",
+                    "content" => ["foo", "Baz!"]
+                  }, {
+                    "hello" => "goodbye",
+                    "content" => "Bye!"
+                  }
+                ],
+                "foos" => [
+                  {
+                    "foo" => ["Hello!", "You!", {"bar" => ["Bar!"]}]
+                  },
+                  "Baz!!!",
+                  {
+                    "foo" => ["Qux!"]
+                  }
+                ]
+              }, @consumer.send(:parse_content,
+                <<-XML
+                  <xml>
+                    <bar>BAR</bar>
+                    <baz hello="world" content="foo">Baz!</baz>
+                    <baz hello="goodbye">Bye!</baz>
+                    <foos>
+                      <foo>Hello!</foo>
+                      <foo>You!</foo>
+                      <foo>
+                        <bar>Bar!</bar>
+                      </foo>
+                    </foos>
+                    <foos>Baz!!!</foos>
+                    <foos>
+                      <foo>Qux!</foo>
+                    </foos>
+                  </xml>
+                XML
+              ).to_hash
             )
             @consumer.expects(:api).returns :format => "unknown"
             assert_equal("foobar", @consumer.send(:parse_content, "foobar"))

data/test/unit/core_ext/test_ax.rb

@@ -0,0 +1,57 @@
+require_relative "../../test_helper"
+
+module Unit
+  class TestAx < MiniTest::Test
+
+    describe Ax do
+      before do
+        @xml = <<-XML
+          <?xml version="1.0" encoding="utf-8"?>
+          <response>
+            <data>
+              <article>
+                <title>MagnumPI is awesome!!!</title>
+                <category>ruby</category>
+              </article>
+              <article>
+                <title>Netherlands beats Spain with 1-5 :)</title>
+                <category>sport</category>
+              </article>
+            </data>
+          </response>
+        XML
+      end
+      it "parses XML like XmlSimple" do
+        assert_equal({
+          "data" => [{
+            "article" => [
+              {
+                "title" => ["MagnumPI is awesome!!!"],
+                "category" => ["ruby"]
+              }, {
+                "title" => ["Netherlands beats Spain with 1-5 :)"],
+                "category" => ["sport"]
+              }
+            ]
+          }]
+        }, Ax.new(@xml).to_hash)
+      end
+      it "can iterate through an XML document" do
+        articles = []
+        Ax.new(@xml).each("/*/article") do |article|
+          articles << article
+        end
+        assert_equal [
+          {
+            "title" => ["MagnumPI is awesome!!!"],
+            "category" => ["ruby"]
+          }, {
+            "title" => ["Netherlands beats Spain with 1-5 :)"],
+            "category" => ["sport"]
+          }
+        ], articles
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnum-pi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -166,6 +166,8 @@ files:
 - lib/magnum-pi/gem_ext/mechanize/http.rb
 - lib/magnum-pi/gem_ext/mechanize/http/agent.rb
 - lib/magnum-pi/gem_ext/mechanize/util.rb
+- lib/magnum-pi/gem_ext/ox.rb
+- lib/magnum-pi/gem_ext/ox/ax.rb
 - lib/magnum-pi/version.rb
 - magnum-pi.gemspec
 - script/console
@@ -176,6 +178,7 @@ files:
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb
 - test/unit/api/test_scheme.rb
+- test/unit/core_ext/test_ax.rb
 - test/unit/core_ext/test_deep_clone.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb
@@ -211,6 +214,7 @@ test_files:
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb
 - test/unit/api/test_scheme.rb
+- test/unit/core_ext/test_ax.rb
 - test/unit/core_ext/test_deep_clone.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb