jsonpath 0.1.0 → 0.1.2

data/Rakefile

@@ -1,5 +1,11 @@
 require 'rake/testtask'
 
+#desc "Build it up"
+#task :build do
+#  sh "rex --independent -o lib/jsonpath/grammar.rex.rb lib/grammar/grammar.rex"
+#  sh "racc -v -O parser.output -o lib/jsonpath/grammar.y.rb lib/grammar/grammar.y"
+#end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
@@ -34,9 +40,9 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/*.rb']
 end
 
-#require 'rake/testtask'
-#Rake::TestTask.new(:test) do |test|
-#  test.libs << 'lib' << 'test'
-#  test.pattern = 'test/**/*_test.rb'
-#  test.verbose = true
-#end
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/jsonpath.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsonpath}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hull"]
-  s.date = %q{2010-03-27}
+  s.date = %q{2010-04-27}
   s.description = %q{Ruby implementation of http://goessner.net/articles/JsonPath/}
   s.email = %q{joshbuddy@gmail.com}
   s.extra_rdoc_files = [

data/lib/jsonpath.rb

@@ -1,7 +1,5 @@
 require 'strscan'
-require 'load_path_find'
-
-$LOAD_PATH.add_current
+$LOAD_PATH << File.expand_path(File.basename(__FILE__))
 
 require File.join('jsonpath', 'enumerable')
 
@@ -14,15 +12,35 @@ class JsonPath
     @path = []
     bracket_count = 0
     while not scanner.eos?
-      token = scanner.scan_until(/($|\$|@|[a-zA-Z]+|\[.*?\]|\.\.|\.(?!\.))/)
-      case token
-      when '.'
-        # do nothing
-      when /^[a-zA-Z]+$/
+      if token = scanner.scan(/\$/)
+        @path << token
+      elsif token = scanner.scan(/@/)
+        @path << token
+      elsif token = scanner.scan(/[a-zA-Z]+/)
         @path << "['#{token}']"
-      else
-        bracket_count == 0 && @path << token or @path[-1] += token
-        bracket_count += token.count('[') - token.count(']')
+      elsif token = scanner.scan(/'(.*?)'/)
+        @path << "[#{token}]"
+      elsif token = scanner.scan(/\[/)
+        count = 1
+        while !count.zero?
+          if t = scanner.scan(/\[/)
+            token << t
+            count += 1
+          elsif t = scanner.scan(/\]/)
+            token << t
+            count -= 1
+          elsif t = scanner.scan(/[^\[\]]*/)
+            token << t
+          end
+        end
+        @path << token
+      elsif token = scanner.scan(/\.\./)
+        @path << token
+      elsif scanner.scan(/\./)
+      elsif token = scanner.scan(/\*/)
+        @path << token
+      elsif token = scanner.scan(/./)
+        @path.last << token
       end
     end
   end

data/lib/jsonpath/enumerable.rb

@@ -12,7 +12,7 @@ class JsonPath
       else
         case expr = @path[pos]
         when '*', '..'
-          each(node, pos + 1, &blk) 
+          each(node, pos + 1, &blk)
         when '$'
           each(node, pos + 1, &blk) if node == @object
         when '@'
@@ -42,7 +42,8 @@ class JsonPath
             end
           end
         else
-          blk.call(node) if pos == (@path.size - 1) && eval("node #{@path[pos]}")
+          #p "#{node.inspect} ---> node #{@path[pos]}"
+          blk.call(node) if pos == (@path.size - 1) && node && eval("node #{@path[pos]}")
         end
 
         if pos > 0 && @path[pos-1] == '..'

data/spec/jsonpath_spec.rb

@@ -86,4 +86,9 @@ describe "JsonPath" do
     JsonPath.new('$..*').on(@object).to_a.size.should == 28
   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
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 -04:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: []