jsonpath 0.3.1 → 0.3.2

data/README.md

@@ -13,7 +13,8 @@ There is stand-alone usage through the binary `jsonpath`
 
 As well, you can include it as a library.
 
-    object = JSON.parse(<<-HERE_DOC))
+~~~~~ {ruby}
+    object = JSON.parse(<<-HERE_DOC)
     {"store": 
       {"bicycle":
         {"price":19.95, "color":"red"},
@@ -27,11 +28,21 @@ As well, you can include it as a library.
     }
     HERE_DOC
 
-    JsonPath.new('$..price').on(object).to_a
+    JsonPath.new('$..price').on(object)
     # => [19.95, 8.95, 12.99, 8.99, 22.99]
   
-    JsonPath.new('$..author').on(object).to_a
+    JsonPath.on(object, '$..author')
     # => ["Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"]
   
-    JsonPath.new('$..book[::2]').on(object).to_a
+    JsonPath.new('$..book[::2]').on(object)
     # => [{"price"=>8.95, "category"=>"reference", "author"=>"Nigel Rees", "title"=>"Sayings of the Century"}, {"price"=>8.99, "category"=>"fiction", "author"=>"Herman Melville", "title"=>"Moby Dick", "isbn"=>"0-553-21311-3"}]
+
+    JsonPath.new('$..color').first(object)
+    # => "red"
+
+    # Lazy enumeration - only needs to find the first two matches
+    JsonPath.new('$..price').enum_on(object).each do |match|
+      break price if price < 15.0
+    end
+    # => 8.95
+~~~~~

data/Rakefile

@@ -1,16 +1,18 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rake/rdoctask'
-desc "Generate documentation"
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rd.rdoc_dir = 'rdoc'
-end
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-task :test => :spec
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/rdoctask'
+desc "Generate documentation"
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  rd.rdoc_dir = 'rdoc'
+end
+
+task :test do
+  $: << 'lib'
+  require 'minitest/autorun'
+  require 'phocus'
+  require 'jsonpath'
+  Dir['./test/**/test_*.rb'].each { |test| require test }
+end

data/jsonpath.gemspec

@@ -18,12 +18,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.test_files = `git ls-files`.split("\n").select{|f| f =~ /^spec/}
   s.rubyforge_project = 'jsonpath'
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   # dependencies
   s.add_runtime_dependency 'json'
   s.add_development_dependency 'code_stats'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.5.0'
-  s.add_development_dependency 'bundler',  '~> 1.0.0'
+  s.add_development_dependency 'minitest', '~> 2.2.0'
+  s.add_development_dependency 'phocus'
+  s.add_development_dependency 'bundler',  '~> 1.0.10'
 end
 

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/test/test_jsonpath.rb

@@ -0,0 +1,101 @@
+class TestJsonpath < MiniTest::Unit::TestCase
+
+  def setup
+    @object = { "store"=> {
+      "book" => [
+        { "category"=> "reference",
+          "author"=> "Nigel Rees",
+          "title"=> "Sayings of the Century",
+          "price"=> 8.95
+        },
+        { "category"=> "fiction",
+          "author"=> "Evelyn Waugh",
+          "title"=> "Sword of Honour",
+          "price"=> 12.99
+        },
+        { "category"=> "fiction",
+          "author"=> "Herman Melville",
+          "title"=> "Moby Dick",
+          "isbn"=> "0-553-21311-3",
+          "price"=> 8.99
+        },
+        { "category"=> "fiction",
+          "author"=> "J. R. R. Tolkien",
+          "title"=> "The Lord of the Rings",
+          "isbn"=> "0-395-19395-8",
+          "price"=> 22.99
+        }
+      ],
+    "bicycle"=> {
+      "color"=> "red",
+      "price"=> 19.95,
+      "catalogue_number" => 12345,
+    } } }
+  end
+
+  def test_lookup_direct_path
+    assert_equal 4, JsonPath.new('$.store.*').on(@object).to_a.first['book'].size
+  end
+
+  def test_retrieve_all_authors
+    assert_equal [
+      @object['store']['book'][0]['author'],
+      @object['store']['book'][1]['author'],
+      @object['store']['book'][2]['author'],
+      @object['store']['book'][3]['author']
+    ], JsonPath.new('$..author').on(@object)
+  end
+
+  def test_retrieve_all_prices
+    assert_equal [
+      @object['store']['bicycle']['price'],
+      @object['store']['book'][0]['price'],
+      @object['store']['book'][1]['price'],
+      @object['store']['book'][2]['price'],
+      @object['store']['book'][3]['price']
+    ].sort, JsonPath.new('$..price').on(@object).sort
+  end
+
+  def test_recognize_array_splices
+    assert_equal [@object['store']['book'][0], @object['store']['book'][1]], JsonPath.new('$..book[0:1:1]').on(@object)
+    assert_equal [@object['store']['book'][1], @object['store']['book'][3]], JsonPath.new('$..book[1::2]').on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new('$..book[::2]').on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new('$..book[:-2:2]').on(@object)
+    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new('$..book[2::]').on(@object)
+  end
+
+  def test_recognize_array_comma
+    assert_equal [@object['store']['book'][0], @object['store']['book'][1]], JsonPath.new('$..book[0,1]').on(@object)
+    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new('$..book[2,-1::]').on(@object)
+  end
+
+  def test_recognize_filters
+    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new("$..book[?(@['isbn'])]").on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] < 10)]").on(@object)
+  end
+  
+  def test_paths_with_underscores
+    assert_equal [@object['store']['bicycle']['catalogue_number']], JsonPath.new('$.store.bicycle.catalogue_number').on(@object)
+  end
+
+  def test_recognize_array_with_evald_index
+    assert_equal [@object['store']['book'][2]], JsonPath.new('$..book[(@.length-2)]').on(@object)
+  end
+
+  def test_use_first
+    assert_equal @object['store']['book'][2], JsonPath.new('$..book[(@.length-2)]').first(@object)
+  end
+
+  def test_counting
+    assert_equal 29, JsonPath.new('$..*').on(@object).to_a.size
+  end
+
+  def test_space_in_path
+    assert_equal ['e'], JsonPath.new("$.'c d'").on({"a" => "a","b" => "b", "c d" => "e"})
+  end
+
+  def test_class_method
+    assert_equal JsonPath.new('$..author').on(@object), JsonPath.on(@object, '$..author')
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonpath
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 -07:00
+date: 2011-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,41 +61,55 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: minitest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
         - 2
-        - 5
+        - 2
         - 0
-        version: 2.5.0
+        version: 2.2.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: phocus
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 10
+        version: 1.0.10
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Ruby implementation of http://goessner.net/articles/JsonPath/.
 email: joshbuddy@gmail.com
-executables: []
-
+executables: 
+- jsonpath
 extensions: []
 
 extra_rdoc_files: 
@@ -112,8 +126,7 @@ files:
 - lib/jsonpath.rb
 - lib/jsonpath/enumerable.rb
 - lib/jsonpath/version.rb
-- spec/jsonpath_spec.rb
-- spec/spec_helper.rb
+- test/test_jsonpath.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/jsonpath
 licenses: []
@@ -148,6 +161,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of http://goessner.net/articles/JsonPath/
-test_files: 
-- spec/jsonpath_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/spec/jsonpath_spec.rb

@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-describe "JsonPath" do
-
-  before(:each) do
-    @object = { "store"=> {
-        "book" => [
-          { "category"=> "reference",
-            "author"=> "Nigel Rees",
-            "title"=> "Sayings of the Century",
-            "price"=> 8.95
-          },
-          { "category"=> "fiction",
-            "author"=> "Evelyn Waugh",
-            "title"=> "Sword of Honour",
-            "price"=> 12.99
-          },
-          { "category"=> "fiction",
-            "author"=> "Herman Melville",
-            "title"=> "Moby Dick",
-            "isbn"=> "0-553-21311-3",
-            "price"=> 8.99
-          },
-          { "category"=> "fiction",
-            "author"=> "J. R. R. Tolkien",
-            "title"=> "The Lord of the Rings",
-            "isbn"=> "0-395-19395-8",
-            "price"=> 22.99
-          }
-        ],
-        "bicycle"=> {
-          "color"=> "red",
-          "price"=> 19.95,
-          "catalogue_number" => 12345,
-        }
-      }
-    }
-  end
-
-  it "should lookup a direct path" do
-    JsonPath.new('$.store.*').on(@object).to_a.first['book'].size.should == 4
-  end
-
-  it "should retrieve all authors" do
-    JsonPath.new('$..author').on(@object).to_a.should == [
-      @object['store']['book'][0]['author'],
-      @object['store']['book'][1]['author'],
-      @object['store']['book'][2]['author'],
-      @object['store']['book'][3]['author']
-    ]
-  end
-
-  it "should retrieve all prices" do
-    JsonPath.new('$..price').on(@object).to_a.sort.should == [
-      @object['store']['bicycle']['price'],
-      @object['store']['book'][0]['price'],
-      @object['store']['book'][1]['price'],
-      @object['store']['book'][2]['price'],
-      @object['store']['book'][3]['price']
-    ].sort
-  end
-
-  it "should recognize all types of array splices" do
-    JsonPath.new('$..book[0:1:1]').on(@object).to_a.should == [@object['store']['book'][0], @object['store']['book'][1]]
-    JsonPath.new('$..book[1::2]').on(@object).to_a.should == [@object['store']['book'][1], @object['store']['book'][3]]
-    JsonPath.new('$..book[::2]').on(@object).to_a.should == [@object['store']['book'][0], @object['store']['book'][2]]
-    JsonPath.new('$..book[:-2:2]').on(@object).to_a.should == [@object['store']['book'][0], @object['store']['book'][2]]
-    JsonPath.new('$..book[2::]').on(@object).to_a.should == [@object['store']['book'][2], @object['store']['book'][3]]
-  end
-
-  it "should recognize array comma syntax" do
-    JsonPath.new('$..book[0,1]').on(@object).to_a.should == [@object['store']['book'][0], @object['store']['book'][1]]
-    JsonPath.new('$..book[2,-1::]').on(@object).to_a.should == [@object['store']['book'][2], @object['store']['book'][3]]
-  end
-
-  it "should support filters" do
-    JsonPath.new("$..book[?(@['isbn'])]").on(@object).to_a.should == [@object['store']['book'][2], @object['store']['book'][3]]
-    JsonPath.new("$..book[?(@['price'] < 10)]").on(@object).to_a.should == [@object['store']['book'][0], @object['store']['book'][2]]
-  end
-  
-  it "should recognize paths with underscores" do
-    JsonPath.new('$.store.bicycle.catalogue_number').on(@object).to_a.should == [@object['store']['bicycle']['catalogue_number']]
-  end
-
-  it "should support eval'd array indicies" do
-    JsonPath.new('$..book[(@.length-2)]').on(@object).to_a.should == [@object['store']['book'][2]]
-  end
-
-  it "should support first" do
-    JsonPath.new('$..book[(@.length-2)]').first(@object) == @object['store']['book'][2]
-  end
-
-  it "should correct retrieve the right number of all nodes" do
-    JsonPath.new('$..*').on(@object).to_a.size.should == 29
-  end
-
-  it "should deal with a space in the key name" do
-    JsonPath.new("$.'c d'").on({"a" => "a","b" => "b", "c d" => "e"}).to_a.should == ['e']
-  end
-
-  it "should support a convenience class method" do
-    JsonPath.on(@object, '$..author').to_a.should == JsonPath.new('$..author').on(@object).to_a
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'jsonpath'