jsonpath 0.2.2 → 0.2.3

data/lib/jsonpath.rb

@@ -1,6 +1,6 @@
 require 'strscan'
-require File.join('jsonpath', 'enumerable')
-require File.join('jsonpath', 'version')
+require 'jsonpath/enumerable'
+require 'jsonpath/version'
 
 class JsonPath
 
@@ -15,7 +15,7 @@ class JsonPath
         @path << token
       elsif token = scanner.scan(/@/)
         @path << token
-      elsif token = scanner.scan(/[a-zA-Z]+/)
+      elsif token = scanner.scan(/[a-zA-Z_]+/)
         @path << "['#{token}']"
       elsif token = scanner.scan(/'(.*?)'/)
         @path << "[#{token}]"

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/jsonpath_spec.rb

@@ -30,7 +30,8 @@ describe "JsonPath" do
         ],
         "bicycle"=> {
           "color"=> "red",
-          "price"=> 19.95
+          "price"=> 19.95,
+          "catalogue_number" => 12345,
         }
       }
     }
@@ -76,13 +77,17 @@ describe "JsonPath" 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 correct retrieve the right number of all nodes" do
-    JsonPath.new('$..*').on(@object).to_a.size.should == 28
+    JsonPath.new('$..*').on(@object).to_a.size.should == 29
   end
 
   it "should deal with a space in the key name" do

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonpath
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,11 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -07:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
   type: :runtime
-  name: json
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: code_stats
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   type: :development
-  name: code_stats
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   type: :development
-  name: rake
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -72,12 +74,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  requirement: *id004
-  prerelease: false
   type: :development
-  name: rspec
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,10 +90,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
-  prerelease: false
   type: :development
-  name: bundler
+  version_requirements: *id005
 description: Ruby implementation of http://goessner.net/articles/JsonPath/.
 email: joshbuddy@gmail.com
 executables: []