json_select 0.1.3 → 0.1.4

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "spec/fixtures/conformance"]
+	path = spec/fixtures/conformance
+	url = git://github.com/lloyd/JSONSelectTests.git

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
   # - 1.8.7
-  - 1.9.1
+  # - 1.9.1
   - 1.9.2
   - jruby
   # - rbx

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rake', '0.8.7'
 gem 'rspec'
 gem 'yajl-ruby'
+gem 'rubygems-openpgp'

data/README.md

@@ -53,8 +53,59 @@ JSONSelect('string:first-child').match(json)   # => "window"
 JSONSelect('string:first-child').matches(json) # => ["window", "beer"]
 ```
 
+## Language support
+
+✓ — **Level 1** — `*`<br>
+Any node
+
+✓ — **Level 1** — `T`<br>
+A node of type `T`, where `T` is one `string`, `number`, `object`, `array`, `boolean`, or `null`
+
+✓ — **Level 1** — `T.key`<br>
+A node of type `T` which is the child of an object and is the value its parents key property
+
+✓ — **Level 1** — `T."complex key"`<br>
+Same as previous, but with property name specified as a JSON string
+
+✓ — **Level 1** — `T:root`<br>
+A node of type `T` which is the root of the JSON document
+
+✓ — **Level 1** — `T:nth-child(n)`<br>
+A node of type `T` which is the nth child of an array parent
+
+✓ — **Level 2** — `T:nth-last-child(n)`<br>
+A node of type `T` which is the nth child of an array parent counting from the end
+
+✓ — **Level 1** — `T:first-child`<br>
+A node of type `T` which is the first child of an array parent (equivalent to `T:nth-child(1)`)
+
+✓ — **Level 2** — `T:last-child`<br>
+A node of type `T` which is the last child of an array parent (equivalent to `T:nth-last-child(1)`)
+
+✓ — **Level 2** — `T:only-child`<br>
+A node of type `T` which is the only child of an array parent
+
+✓ — **Level 2** — `T:empty`<br>
+A node of type `T` which is an array or object with no child
+
+✓ — **Level 1** — `T U`<br>
+A node of type `U` with an ancestor of type `T`
+
+✓ — **Level 1** — `T > U`<br>
+A node of type `U` with a parent of type `T`
+
+✗ — **Level 2** — `T ~ U`<br>
+A node of type `U` with a sibling of type `T`
+
+✓ — **Level 1** — `S1, S2`<br>
+Any node which matches either selector `S1` or `S2`
+
+✗ — **Level 3** — `T:has(S)`<br>
+A node of type `T` which has a child node satisfying the selector `S`
+
+
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version

data/Rakefile

@@ -9,6 +9,11 @@ RSpec::Core::RakeTask.new do |t|
     '-r', File.expand_path("../spec/spec_helper.rb", __FILE__)]
 end
 
+task :checkout_conformance_tests do
+  sh "git submodule init"
+  sh "git submodule update"
+end
+
 task :build_parser do
   sh "bundle exec tt lib/json_select/selector_parser.tt -o lib/json_select/selector_parser.rb"
 
@@ -18,6 +23,12 @@ task :build_parser do
   File.open(path, 'w+') { |f| f.write src }
 end
 
-task :spec    => :build_parser
+task :build do
+  h = Bundler::GemHelper.instance
+  path = Dir[File.join(h.base, "pkg", "#{h.gemspec.name}-*.gem")].sort_by{|f| File.mtime(f)}.last
+  sh "gem sign #{path}"
+end
+
+task :spec    => [:checkout_conformance_tests, :build_parser]
 task :build   => :build_parser
 task :default => :spec

data/lib/json_select/helpers/depth.rb

@@ -1,7 +1,11 @@
 module JSONSelect::DepthHelpers
-  
+
   def is_root(object, test, key, idx, size, depth)
     depth == 0
   end
-  
+
+  def format_is_root(test)
+    ":root"
+  end
+
 end

data/lib/json_select/helpers/key.rb

@@ -1,7 +1,11 @@
 module JSONSelect::KeyHelpers
-  
+
   def has_class(object, test, key, idx, size, depth)
     test[:n] == key.to_s
   end
-  
+
+  def format_has_class(test)
+    ".#{test[:n]}"
+  end
+
 end

data/lib/json_select/helpers/position.rb

@@ -1,24 +1,32 @@
 module JSONSelect::PositionHelpers
-  
+
   def nth_child(object, test, key, idx, size, depth)
     return false unless idx and size
-    
+
     idx += 1
-    
+
     a = test[:a]
     b = test[:b]
-    
+
     if a == 0
       (b == idx)
     else
       (((idx - b) % a) == 0) and ((idx * a + b) >= 0)
     end
   end
-  
+
+  def format_nth_child(test)
+    ":nth-child(#{test[:a]}n#{test[:b]})"
+  end
+
   def nth_last_child(object, test, key, idx, size, depth)
     return false unless idx and size
-    
+
     nth_child(object, test, key, (size - idx) - 1, size, depth)
   end
-  
+
+  def format_nth_last_child(test)
+    ":nth-last-child(#{test[:a]}n#{test[:b]})"
+  end
+
 end

data/lib/json_select/helpers/size.rb

@@ -1,14 +1,18 @@
 module JSONSelect::SizeHelpers
-  
+
   def only_child(object, test, key, idx, size, depth)
     return false unless size
-    
+
     size == 1
   end
-  
+
+  def format_only_child(test)
+    ":only-child"
+  end
+
   def empty(object, test, key, idx, size, depth)
     return false unless size
-    
+
     case object
     when Array then return object.empty?
     else
@@ -17,8 +21,12 @@ module JSONSelect::SizeHelpers
         return true
       end
     end
-    
+
     return false
   end
-  
+
+  def format_empty(test)
+    ":empty"
+  end
+
 end

data/lib/json_select/helpers/type.rb

@@ -1,20 +1,24 @@
 module JSONSelect::TypeHelpers
-  
+
   def instance_of_type(object, test, key, idx, size, depth)
     test[:n] == type_of(object)
   end
 
+  def format_instance_of_type(test)
+    test[:n].to_s
+  end
+
 private
 
   def type_of(object)
     if object.respond_to?(:json_select_each)
       return 'array'
     end
-    
+
     if object.respond_to?(:json_select_each_pair)
       return 'object'
     end
-    
+
     case object
     when Hash       then 'object'
     when Array      then 'array'
@@ -27,5 +31,5 @@ private
     else raise "Invalid object of class #{object.class} for JSONSelect: #{object.inspect}"
     end
   end
-  
+
 end

data/lib/json_select/selector.rb

@@ -42,7 +42,7 @@ class JSONSelect
       raise ArgumentError, "Expected a string for ast"
 
     end
-    
+
     @helpers = Module.new
     @helpers.send(:extend,
       JSONSelect::KeyHelpers,
@@ -50,7 +50,7 @@ class JSONSelect
       JSONSelect::SizeHelpers,
       JSONSelect::DepthHelpers,
       JSONSelect::PositionHelpers)
-    
+
     @helper_methods = {}
     (@helpers.public_methods - Module.public_methods).map do |name|
       @helper_methods[name.to_sym] = @helpers.method(name)
@@ -90,6 +90,42 @@ class JSONSelect
 
   alias_method :===, :test
 
+  def to_s
+    selectors = @ast
+    selectors = (selectors[0] == ',' ? selectors[1..-1] : [selectors])
+
+    selectors.map do |selector|
+      selector.map do |part|
+        case part
+
+        when :>
+          '>'
+
+        when Hash
+          tests = (part[:tests].empty? ? ['*'] : part[:tests])
+
+          tests.map do |test|
+            case test
+
+            when '*'
+              '*'
+
+            when Hash
+              @helpers.send("format_#{test[:f]}", test)
+
+            end
+          end.join('')
+
+        end
+
+      end.join(' ')
+    end.join(', ')
+  end
+
+  def inspect
+    "#<JSONSelect (#{to_s})>"
+  end
+
 private
 
   def _each(selector, object, id, number, total, depth, &block)
@@ -129,21 +165,21 @@ private
           object.json_select_each do |value|
             children << value
           end
-          
+
           a1.unshift(',')
           size = children.size
-          
+
           children.each_with_index do |child, idx|
             _each(a1, child, nil, idx, size, depth + 1, &block)
           end
-          
+
         elsif object.respond_to?(:json_select_each_pair)
           a1.unshift(',')
-          
+
           object.json_select_each_pair do |key, child|
             _each(a1, child, key, nil, nil, depth + 1, &block)
           end
-          
+
         end
       end
     end
@@ -163,7 +199,7 @@ private
       if test[:f] == :is_root
         has_root_test = true
       end
-      
+
       if match
         match = !!@helper_methods[test[:f].to_sym].call(object, test, id, number, total, depth)
       end
@@ -183,16 +219,16 @@ private
     unless match
       return [match, selectors]
     end
-    
+
     # continue search for decendants
     unless selector[0] == :>
       match = false
       selectors.push selector[1..-1]
       return [match, selectors]
     end
-    
+
     # continue search for children
-    if selector.length > 2 
+    if selector.length > 2
       match = false
       selectors.push selector[2..-1]
     end

data/lib/json_select/selector_parser.rb

@@ -619,7 +619,18 @@ module JSONSelect::Selector
     end
 
     def e
-      elements[4]
+      elements[5]
+    end
+
+  end
+
+  module Pseudo2
+    def a
+      elements[1]
+    end
+
+    def s
+      elements[5]
     end
 
   end
@@ -669,53 +680,66 @@ module JSONSelect::Selector
       end
       s4 << r5
       if r5
-        r6 = _nt_pseudo_function_name
+        r6 = _nt_positional_pseudo_function_name
         s4 << r6
         if r6
-          if has_terminal?('(', false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure('(')
-            r7 = nil
+          s7, i7 = [], index
+          loop do
+            r8 = _nt_ws
+            if r8
+              s7 << r8
+            else
+              break
+            end
           end
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
           s4 << r7
           if r7
-            s8, i8 = [], index
-            loop do
-              r9 = _nt_ws
-              if r9
-                s8 << r9
-              else
-                break
-              end
+            if has_terminal?('(', false, index)
+              r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('(')
+              r9 = nil
             end
-            r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-            s4 << r8
-            if r8
-              r10 = _nt_expression
+            s4 << r9
+            if r9
+              s10, i10 = [], index
+              loop do
+                r11 = _nt_ws
+                if r11
+                  s10 << r11
+                else
+                  break
+                end
+              end
+              r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
               s4 << r10
               if r10
-                s11, i11 = [], index
-                loop do
-                  r12 = _nt_ws
-                  if r12
-                    s11 << r12
-                  else
-                    break
-                  end
-                end
-                r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-                s4 << r11
-                if r11
-                  if has_terminal?(')', false, index)
-                    r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
-                  else
-                    terminal_parse_failure(')')
-                    r13 = nil
+                r12 = _nt_expression
+                s4 << r12
+                if r12
+                  s13, i13 = [], index
+                  loop do
+                    r14 = _nt_ws
+                    if r14
+                      s13 << r14
+                    else
+                      break
+                    end
                   end
+                  r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
                   s4 << r13
+                  if r13
+                    if has_terminal?(')', false, index)
+                      r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                      @index += 1
+                    else
+                      terminal_parse_failure(')')
+                      r15 = nil
+                    end
+                    s4 << r15
+                  end
                 end
               end
             end
@@ -732,8 +756,95 @@ module JSONSelect::Selector
       if r4
         r0 = r4
       else
-        @index = i0
-        r0 = nil
+        i16, s16 = index, []
+        if has_terminal?(':', false, index)
+          r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure(':')
+          r17 = nil
+        end
+        s16 << r17
+        if r17
+          r18 = _nt_subselector_pseudo_function_name
+          s16 << r18
+          if r18
+            s19, i19 = [], index
+            loop do
+              r20 = _nt_ws
+              if r20
+                s19 << r20
+              else
+                break
+              end
+            end
+            r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+            s16 << r19
+            if r19
+              if has_terminal?('(', false, index)
+                r21 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('(')
+                r21 = nil
+              end
+              s16 << r21
+              if r21
+                s22, i22 = [], index
+                loop do
+                  r23 = _nt_ws
+                  if r23
+                    s22 << r23
+                  else
+                    break
+                  end
+                end
+                r22 = instantiate_node(SyntaxNode,input, i22...index, s22)
+                s16 << r22
+                if r22
+                  r24 = _nt_selectors_group
+                  s16 << r24
+                  if r24
+                    s25, i25 = [], index
+                    loop do
+                      r26 = _nt_ws
+                      if r26
+                        s25 << r26
+                      else
+                        break
+                      end
+                    end
+                    r25 = instantiate_node(SyntaxNode,input, i25...index, s25)
+                    s16 << r25
+                    if r25
+                      if has_terminal?(')', false, index)
+                        r27 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                        @index += 1
+                      else
+                        terminal_parse_failure(')')
+                        r27 = nil
+                      end
+                      s16 << r27
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+        if s16.last
+          r16 = instantiate_node(JSONSelect::Ast::PseudoSelector,input, i16...index, s16)
+          r16.extend(Pseudo2)
+        else
+          @index = i16
+          r16 = nil
+        end
+        if r16
+          r0 = r16
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -817,10 +928,10 @@ module JSONSelect::Selector
     r0
   end
 
-  def _nt_pseudo_function_name
+  def _nt_positional_pseudo_function_name
     start_index = index
-    if node_cache[:pseudo_function_name].has_key?(index)
-      cached = node_cache[:pseudo_function_name][index]
+    if node_cache[:positional_pseudo_function_name].has_key?(index)
+      cached = node_cache[:positional_pseudo_function_name][index]
       if cached
         cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
@@ -854,7 +965,31 @@ module JSONSelect::Selector
       end
     end
 
-    node_cache[:pseudo_function_name][start_index] = r0
+    node_cache[:positional_pseudo_function_name][start_index] = r0
+
+    r0
+  end
+
+  def _nt_subselector_pseudo_function_name
+    start_index = index
+    if node_cache[:subselector_pseudo_function_name].has_key?(index)
+      cached = node_cache[:subselector_pseudo_function_name][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('has', false, index)
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 3))
+      @index += 3
+    else
+      terminal_parse_failure('has')
+      r0 = nil
+    end
+
+    node_cache[:subselector_pseudo_function_name][start_index] = r0
 
     r0
   end