magnum-pi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc1YTljNjBjYzcwMmY5YmQxZmNhNGQ1MjhmNzU1ZjRhNzQ3MGQyMg==
+    MTgzYWJjMmVmMWM2Yjc4ODVmMzkxOTlmYWNlZWI4OTk1YTMxODQ3NA==
   data.tar.gz: !binary |-
-    YjNlNjUyY2VlNzUxOThjY2U0MmMyMTBhMGNhMGJjZGJkNDBhMDFiMw==
+    YWViMGNjMjM3MWQxNGRiYzNjZGM0ODEwMzlmYWMyMjI3NmVkZjk2Yw==
 SHA512:
   metadata.gz: !binary |-
-    OGI1NzVkYWYxZjcxMmZkNzgyMjc1YzhmNThhZGQ2M2FlOGYzOGJjMzM2NTkw
-    NTExMTNkYjM0MGY3Nzc5NmI2ZWQ2MmM1ZDE3YmYzZjgwMDkzYzcwMWQ3N2Ey
-    YzY1ODVlNWQwZTFlNDBjODdlZTMyNTk4YzI0YTEwYjM2YjA5MDI=
+    ZGZiM2YzMzQyYjUyMDM4ZTZkNDNmMGUxY2MwNDRjZTNhMDVmYWU3YTk5MzIz
+    N2RhZjJkYTNkODRkMDA2YTA5ZTM5MjVlNTk1YTAxMjdlN2IyNjNiMTRhYmMx
+    YTk1NWQzMzA5MDU1OGFlNTJiM2JjOGFkZGQyZGQ5MDc1ZTNhMzU=
   data.tar.gz: !binary |-
-    MGMzMjA5N2ViZjA5MGIyN2Y1ZmFjNmM5MmFmMzVkZTg5NDM4NmQzZmY1MTJk
-    MWJlZjIzZjIzOTBhNjdjODMxNWRjMjcyM2NhZWU4NmViODQxYjQ3ZjRiZWY0
-    OTU1ZjdjOTEzMjVkYjJkOWY2ZWM5ODFkZjI0M2QyNDczNzNmMDA=
+    NWJiNDhkNzI2Njg5MjAyNGNhNTY2NmEwZTQ3MThiMWFiM2U0ZTE1Y2I4MDA2
+    NThlMWJkYjA5MTMzNDc2YjM5OTgwNmNjZDliN2E3ZWU2MzAxOWNhNzgzMWQ5
+    OWJhMzI5OTY2ZjgxY2NhM2Y5YWZiMDUwZDE0ZjU1MmJjMmI3OGM=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = MagnumPI CHANGELOG
 
+== Version 0.2.1 (June 18, 2014)
+
+* Created `Aj` for iterating through large JSON files with Saj
+
 == Version 0.2.0 (June 16, 2014)
 
 * Replaced XmlSimple with Ox and created `Ax` for iterating through large XML files with Sax

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

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

@@ -80,7 +80,7 @@ module MagnumPI
       def parse_content(response)
         case api[:format].to_s
         when "json"
-          Oj.load response
+          Aj.new response
         when "xml"
           Ax.new response
         else

data/lib/magnum-pi/gem_ext.rb

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

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

@@ -0,0 +1 @@
+require "magnum-pi/gem_ext/oj/aj"

data/lib/magnum-pi/gem_ext/oj/aj.rb

@@ -0,0 +1,135 @@
+require "stringio"
+
+class Aj < Oj::Saj
+
+  def initialize(json)
+    @stringio = StringIO.new json
+  end
+
+  def each(pattern, &block)
+    @pattern = pattern.split("/").collect{|x| x == "" ? "*" : x}
+    @block = block
+
+    @stringio.rewind
+    Oj.saj_parse self, @stringio
+
+  ensure
+    @types = nil
+    @current_path = nil
+    @entries = nil
+    @regexp = nil
+  end
+
+  def hash_start(key)
+    start_enum key, {}, :hash
+  end
+
+  def array_start(key)
+    start_enum key, [], :array
+  end
+
+  def hash_end(key)
+    end_enum
+  end
+
+  def array_end(key)
+    end_enum
+  end
+
+  def add_value(value, key)
+    if (entry = current_entry).nil?
+      current_path << :nokey
+      entries << {key => value}
+      end_enum
+    else
+      entry[key] = value
+    end
+  end
+
+  def to_enum
+    enum = nil
+    each "*" do |entry, key|
+      enum ||= begin
+        if key == :nokey
+          entry
+        elsif key.is_a?(String)
+          {}
+        else
+          []
+        end
+      end
+      enum[key] = entry if key != :nokey
+    end
+    enum
+  end
+
+private
+
+  def types
+    @types ||= []
+  end
+
+  def current_path
+    @current_path ||= []
+  end
+
+  def entries
+    @entries ||= []
+  end
+
+  def current_entry
+    entries[-1]
+  end
+
+  def current_key
+    current_path[-1]
+  end
+
+  def current_type
+    types[-1]
+  end
+
+  def entry?
+    @regexp ||= begin
+      pattern = @pattern.join(%q{\/}).gsub("*", %q{[^\/]+})
+      Regexp.new "^#{pattern}$"
+    end
+    !!current_path.join("/").match(@regexp)
+  end
+
+  def start_enum(key, entry, type)
+    add_to_current_path key
+    if current_entry || entry?
+      add_entry entry
+    end
+    types << type
+  end
+
+  def end_enum
+    entry = entries.pop
+    if entry?
+      @block.call entry, current_key
+    end
+    finalize_entry
+  end
+
+  def add_to_current_path(key)
+    key ||= (current_entry || []).size if current_type == :array
+    current_path << key if key
+  end
+
+  def add_entry(entry)
+    if (parent = current_entry).nil?
+      parent = (current_type == :hash ? {} : [])
+      entries << parent
+    end
+    parent[current_key] = entry
+    entries << entry
+  end
+
+  def finalize_entry
+    current_path.pop
+    types.pop
+  end
+
+end

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

@@ -10,13 +10,13 @@ class Ax < Ox::Sax
     @pattern = pattern.split("/").collect{|x| x == "" ? "*" : x}
     @block = block
 
+    @stringio.rewind
     Ox.sax_parse self, @stringio
 
   ensure
     @current_path = nil
     @elements = nil
-    @entry_regexp = nil
-    @last_call = nil
+    @regexp = nil
   end
 
   def start_element(name)
@@ -28,7 +28,6 @@ class Ax < Ox::Sax
     else
       return
     end
-    @last_call = :start_element
   end
 
   def attr(name, str)
@@ -47,8 +46,6 @@ class Ax < Ox::Sax
     element = finalize_element
     if entry?
       @block.call element, current_path[-1]
-    elsif element
-      @last_call = :end_element
     end
     current_path.pop
   end
@@ -61,6 +58,8 @@ class Ax < Ox::Sax
     hash
   end
 
+  alias :to_enum :to_hash
+
 private
 
   def current_path
@@ -72,11 +71,11 @@ private
   end
 
   def entry?
-    @entry_regexp ||= begin
+    @regexp ||= begin
       pattern = @pattern.join(%q{\/}).gsub("*", %q{[^\/]+})
       Regexp.new "^#{pattern}$"
     end
-    !!current_path.join("/").match(@entry_regexp)
+    !!current_path.join("/").match(@regexp)
   end
 
   def current_element

data/lib/magnum-pi/version.rb

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

data/magnum-pi.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "xml-simple"
 end

data/test/test_helper.rb

@@ -10,5 +10,6 @@ end
 
 require "bundler"
 Bundler.require :default, :development, :test
+require "xmlsimple"
 
 require_relative "test_helper/minitest"

data/test/test_helper/minitest.rb

@@ -1,10 +1,10 @@
-class MiniTest::Test
-  def setup
-    $stringio ||= StringIO.new
-    $stdout = $stringio
-  end
-  def teardown
-    $stdout = STDOUT
-    $stringio.truncate $stringio.rewind
-  end
-end
+# class MiniTest::Test
+#   def setup
+#     $stringio ||= StringIO.new
+#     $stdout = $stringio
+#   end
+#   def teardown
+#     $stdout = STDOUT
+#     $stringio.truncate $stringio.rewind
+#   end
+# end

data/test/unit/api/test_consumer.rb

@@ -31,7 +31,7 @@ module Unit
             response = mock
             response.expects(:content).returns('{"name": "Paul Engel"}')
             @consumer.expects(:request).with(:get, "http://foo.bar", {:foo => "bar"}).returns(response)
-            assert_equal({"name" => "Paul Engel"}, @consumer.get(:foo => "bar"))
+            assert_equal({"name" => "Paul Engel"}, @consumer.get(:foo => "bar").to_enum)
           end
         end
         describe "#post" do
@@ -39,7 +39,7 @@ module Unit
             response = mock
             response.expects(:content).returns('{"name": "Paul Engel"}')
             @consumer.expects(:request).with(:post, "http://foo.bar", {:foo => "bar"}).returns(response)
-            assert_equal({"name" => "Paul Engel"}, @consumer.post(:foo => "bar"))
+            assert_equal({"name" => "Paul Engel"}, @consumer.post(:foo => "bar").to_enum)
           end
         end
         describe "#download" do
@@ -149,7 +149,7 @@ module Unit
                 <<-JSON
                   {"foo": "bar"}
                 JSON
-              )
+              ).to_enum
             )
             @consumer.expects(:api).returns :format => "xml"
             assert_equal(

data/test/unit/gem_ext/test_aj.rb

@@ -0,0 +1,82 @@
+require_relative "../../test_helper"
+
+module Unit
+  class TestAj < MiniTest::Test
+
+    describe Aj do
+      before do
+        @json = <<-JSON
+          {
+            "data": {
+              "articles": [
+                {
+                  "title": "MagnumPI is awesome!!!",
+                  "category": "ruby"
+                }, {
+                  "title": "Netherlands beats Spain with 1-5 :)",
+                  "category": "sport"
+                }
+              ]
+            }
+          }
+        JSON
+      end
+      it "parses JSON like Oj" do
+        assert_equal Oj.load(@json), Aj.new(@json).to_enum
+        assert_equal({
+          "data" => {
+            "articles" => [
+              {
+                "title" => "MagnumPI is awesome!!!",
+                "category" => "ruby"
+              }, {
+                "title" => "Netherlands beats Spain with 1-5 :)",
+                "category" => "sport"
+              }
+            ]
+          }
+        }, Aj.new(@json).to_enum)
+        assert_equal({
+          "name" => "Paul Engel"
+        }, Aj.new('{"name": "Paul Engel"}').to_enum)
+        assert_equal([
+          {"name" => "Paul Engel"},
+          {"name" => "Ken Adams"}
+        ], Aj.new('[{"name": "Paul Engel"}, {"name": "Ken Adams"}]').to_enum)
+      end
+      it "can return an array within a JSON document" do
+        result = []
+        Aj.new(@json).each("data/articles") do |entry|
+          result << entry
+        end
+        assert_equal [
+          [
+            {
+              "title" => "MagnumPI is awesome!!!",
+              "category" => "ruby"
+            }, {
+              "title" => "Netherlands beats Spain with 1-5 :)",
+              "category" => "sport"
+            }
+          ]
+        ], result
+      end
+      it "can iterate through a JSON document" do
+        articles = []
+        Aj.new(@json).each("data/articles/*") 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

data/test/unit/{core_ext → gem_ext}/test_ax.rb

@@ -22,6 +22,8 @@ module Unit
         XML
       end
       it "parses XML like XmlSimple" do
+        assert_equal XmlSimple.xml_in(@xml), Ax.new(@xml).to_enum
+        assert_equal XmlSimple.xml_in(@xml), Ax.new(@xml).to_hash
         assert_equal({
           "data" => [{
             "article" => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnum-pi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -136,6 +136,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create an easy interface to talk with APIs
 email:
 - pm_engel@icloud.com
@@ -166,6 +180,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/oj.rb
+- lib/magnum-pi/gem_ext/oj/aj.rb
 - lib/magnum-pi/gem_ext/ox.rb
 - lib/magnum-pi/gem_ext/ox/ax.rb
 - lib/magnum-pi/version.rb
@@ -178,8 +194,9 @@ 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/gem_ext/test_aj.rb
+- test/unit/gem_ext/test_ax.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb
 - test/unit/test_magnum-pi.rb
@@ -214,8 +231,9 @@ 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/gem_ext/test_aj.rb
+- test/unit/gem_ext/test_ax.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb
 - test/unit/test_magnum-pi.rb