json_select 0.1.1 → 0.1.2

data/lib/json_select/ast/hash_selector.rb

@@ -3,9 +3,9 @@ module JSONSelect::Ast::HashSelector
   def to_ast
     tv = self.text_value[1..-1]
     if tv[0,1] == '"'
-      { :class => eval(tv) }
+      { :f => :has_class, :n => eval(tv) }
     else
-      { :class => tv }
+      { :f => :has_class, :n => tv }
     end
   end
 

data/lib/json_select/ast/pseudo_selector.rb

@@ -2,20 +2,23 @@ module JSONSelect::Ast::PseudoSelector
 
   def to_ast
     if respond_to?(:e)
-      ast = { :pseudo_function => a.text_value, :a => 0 , :b => 0 }
-      ast.merge!(e.to_ast)
-      ast
+      test = { :f => a.text_value.gsub('-', '_') }
+      test.merge!(e.to_ast)
+      test
     else
       case a.text_value
 
       when 'first-child'
-        { :pseudo_function => 'nth-child', :a => 0, :b => 1 }
+        { :f => :nth_child, :a => 0, :b => 1 }
 
       when 'last-child'
-        { :pseudo_function => 'nth-last-child', :a => 0, :b => 1 }
+        { :f => :nth_last_child, :a => 0, :b => 1 }
+
+      when 'root'
+        { :f => :is_root }
 
       else
-        { :pseudo_class => a.text_value }
+        { :f => a.text_value.gsub('-', '_') }
 
       end
     end

data/lib/json_select/ast/simple_selector.rb

@@ -1,23 +1,26 @@
 module JSONSelect::Ast::SimpleSelector
   
   def to_ast
-    ast = {}
+    tests = []
+    node  = {:tests => tests}
     
     if respond_to?(:a) and respond_to?(:b)
-      ast.merge! a.to_ast
+      tests << a.to_ast
       
       b.elements.each do |s|
-        ast.merge!(s.to_ast)
+        tests << s.to_ast
       end
       
     else
       self.elements.each do |s|
-        ast.merge!(s.to_ast)
+        tests << s.to_ast
       end
       
     end
     
-    ast
+    tests.compact!
+    
+    node
   end
   
 end

data/lib/json_select/ast/type_selector.rb

@@ -2,7 +2,7 @@ module JSONSelect::Ast::TypeSelector
 
   # `object` | `array` | `number` | `string` | `boolean` | `null`
   def to_ast
-    { :type => self.text_value }
+    { :f => :instance_of_type, :n => self.text_value }
   end
 
 end

data/lib/json_select/ast/universal_selector.rb

@@ -1,7 +1,7 @@
 module JSONSelect::Ast::UniversalSelector
   
   def to_ast
-    {}
+    nil
   end
   
 end

data/lib/json_select/selector.rb

@@ -46,7 +46,7 @@ class JSONSelect
 
   # Returns the first matching child in `object`
   def match(object)
-    _each(@ast, object, nil, nil, nil) do |object|
+    _each(@ast, object, nil, nil, nil, 0) do |object|
       return object
     end
 
@@ -59,7 +59,7 @@ class JSONSelect
   def matches(object)
     matches = []
 
-    _each(@ast, object, nil, nil, nil) do |object|
+    _each(@ast, object, nil, nil, nil, 0) do |object|
       matches << object
     end
 
@@ -68,7 +68,7 @@ class JSONSelect
 
   # Returns true if `object` has any matching children.
   def test(object)
-    _each(@ast, object, nil, nil, nil) do |object|
+    _each(@ast, object, nil, nil, nil, 0) do |object|
       return true
     end
 
@@ -105,14 +105,14 @@ private
   #   }
   #   if (call && fun) fun(obj);
   # };
-  def _each(selector, object, id, number, total, &block)
+  def _each(selector, object, id, number, total, depth, &block)
     a0 = (selector[0] == ',' ? selector[1..-1] : [selector])
     a1 = []
 
     call = false
 
     a0.each do |selector|
-      ok, extra = _match(object, selector, id, number, total)
+      ok, extra = _match(object, selector, id, number, total, depth)
 
       call = true if ok
       a1.concat extra
@@ -126,7 +126,7 @@ private
         size = object.size
 
         object.each_with_index do |child, idx|
-          _each(a1, child, nil, idx, size, &block)
+          _each(a1, child, nil, idx, size, depth + 1, &block)
         end
 
       when Hash
@@ -134,7 +134,7 @@ private
         size = object.size
 
         object.each_with_index do |(key, child), idx|
-          _each(a1, child, key, idx, size, &block)
+          _each(a1, child, key, idx, size, depth + 1, &block)
         end
 
       else
@@ -148,7 +148,7 @@ private
           size = children.size
           
           children.each_with_index do |(key, child), idx|
-            _each(a1, child, key, idx, size, &block)
+            _each(a1, child, key, idx, size, depth + 1, &block)
           end
         end
 
@@ -188,56 +188,54 @@ private
   #
   #   return [m, sels];
   # }
-  def _match(object, selector, id, number, total)
+  def _match(object, selector, id, number, total, depth)
     selectors = []
     current_selector = (selector[0] == :> ? selector[1] : selector[0])
     match = true
+    has_root_test = false
 
-    if current_selector.key?(:type)
-      match = (match and current_selector[:type] == _type_of(object))
-    end
-
-    if current_selector.key?(:class)
-      match = (match and current_selector[:class] == id.to_s)
-    end
-
-    if match and current_selector.key?(:pseudo_function)
-      pseudo_function = current_selector[:pseudo_function]
-
-      if pseudo_function == 'nth-last-child'
-        number = total - number
-      else
-        number += 1
+    current_selector[:tests].each do |test|
+      if test[:f] == :is_root
+        has_root_test = true
       end
-
-      if current_selector[:a] == 0
-        match = (current_selector[:b] == number)
-      else
-        # WTF!
-        match = ((((number - current_selector[:b]) % current_selector[:a]) == 0) && ((number * current_selector[:a] + current_selector[:b]) >= 0))
+      
+      if match
+        match = !!send(test[:f], object, test, id, number, total, depth)
       end
     end
 
-    if Hash === selector[0] and selector[0][:pseudo_class] != 'root'
+    # continue search for decendants
+    if Hash === selector[0] and !has_root_test
       selectors.push selector
     end
 
-    if match
-      if selector[0] == :>
-        if selector.length > 2 
-          match = false
-          selectors.push selector[2..-1]
-        end
-      elsif selector.length > 1
-        match = false
-        selectors.push selector[1..-1]
-      end
+    # break search for terminals
+    if selector.size <= 1
+      return [match, selectors]
+    end
+
+    # break search (no match)
+    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 
+      match = false
+      selectors.push selector[2..-1]
     end
 
     return [match, selectors]
   end
 
-  def _type_of(object)
+  def type_of(object)
     if object.respond_to?(:json_select_each)
       return 'object'
     end
@@ -254,5 +252,53 @@ private
     else raise "Invalid object of class #{object.class} for JSONSelect: #{object.inspect}"
     end
   end
+  
+  def only_child(object, test, key, idx, size, depth)
+    size == 1
+  end
+  
+  def empty(object, test, key, idx, size, depth)
+    case object
+    when Array then return object.empty?
+    when Hash  then return object.empty?
+    else
+      if object.respond_to?(:json_select_each)
+        object.json_select_each { return false }
+        return true
+      end
+    end
+    return false
+  end
+  
+  def is_root(object, test, key, idx, size, depth)
+    depth == 0
+  end
+  
+  def instance_of_type(object, test, key, idx, size, depth)
+    test[:n] == type_of(object)
+  end
+  
+  def has_class(object, test, key, idx, size, depth)
+    test[:n] == key.to_s
+  end
+  
+  def nth_child(object, test, key, idx, size, depth)
+    return false unless idx
+    
+    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 nth_last_child(object, test, key, idx, size, depth)
+    nth_child(object, test, key, (size - idx) - 1, size, depth)
+  end
 
 end

data/lib/json_select/selector_parser.rb

@@ -794,8 +794,19 @@ module JSONSelect::Selector
           if r4
             r0 = r4
           else
-            @index = i0
-            r0 = nil
+            if has_terminal?('empty', false, index)
+              r5 = instantiate_node(SyntaxNode,input, index...(index + 5))
+              @index += 5
+            else
+              terminal_parse_failure('empty')
+              r5 = nil
+            end
+            if r5
+              r0 = r5
+            else
+              @index = i0
+              r0 = nil
+            end
           end
         end
       end

data/lib/json_select/selector_parser.tt

@@ -69,7 +69,7 @@ grammar JSONSelectSelector
   # pseudo_class_name
   #   : `root` | `first-child` | `last-child` | `only-child`
   rule pseudo_class_name
-    'root' / 'first-child' / 'last-child' / 'only-child'
+    'root' / 'first-child' / 'last-child' / 'only-child' / 'empty'
   end
 
   # pseudo_function_name

data/lib/json_select/version.rb

@@ -1,3 +1,3 @@
 class JSONSelect
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/fixtures/basic_children.ast

@@ -1,6 +1,14 @@
-[ { "class" : "name"
+[ { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "name"
+      }
+    ]
   }
 , ">"
-, { "class" : "first"
+, { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "first"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_combination.ast

@@ -1,5 +1,13 @@
-[ { "class" : "name"
+[ { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "name"
+      }
+    ]
   }
-, { "class" : "first"
+, { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "first"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_first-child.ast

@@ -1,6 +1,11 @@
-[ { "type"            : "string"
-  , "pseudo_function" : "nth-child"
-  , "a" : 0
-  , "b" : 1
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "nth_child"
+      , "a" : 0
+      , "b" : 1
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_grouping.ast

@@ -1,12 +1,22 @@
 [ ","
 
-, [ { "type"  : "string"
-    , "class" : "level"
+, [ { "tests" :
+      [ { "f" : "instance_of_type"
+        , "n" : "string"
+        }
+      , { "f" : "has_class"
+        , "n" : "level"
+        }
+      ]
     }
   ]
-
-, [ { "type"  : "number"
+  
+, [ { "tests" :
+      [ { "f" : "instance_of_type"
+        , "n" : "number"
+        }
+      ]
     }
   ]
-  
+
 ]

data/spec/fixtures/basic_id.ast

@@ -1,3 +1,7 @@
-[ { "class" : "favoriteColor"
+[ { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "favoriteColor"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_id_multiple.ast

@@ -1,3 +1,7 @@
-[ { "class" : "language"
+[ { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "language"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_id_quotes.ast

@@ -1,3 +1,7 @@
-[ { "class" : "weight"
+[ { "tests" :
+    [ { "f" : "has_class"
+      , "n" : "weight"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_id_with_type.ast

@@ -1,4 +1,10 @@
-[ { "class" : "favoriteColor"
-  , "type"  : "string"
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "has_class"
+      , "n" : "favoriteColor"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_last-child.ast

@@ -1,6 +1,11 @@
-[ { "type"            : "string"
-  , "pseudo_function" : "nth-last-child"
-  , "a" : 0
-  , "b" : 1
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "nth_last_child"
+      , "a" : 0
+      , "b" : 1
+      }
+    ]
   }
-]
+]

data/spec/fixtures/basic_nth-child-2.ast

@@ -1,6 +1,11 @@
-[ { "type"            : "string"
-  , "pseudo_function" : "nth-child"
-  , "a"               : -1
-  , "b"               : 2
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "nth_child"
+      , "a" : -1
+      , "b" : 2
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_nth-child.ast

@@ -1,6 +1,11 @@
-[ { "type"            : "string"
-  , "pseudo_function" : "nth-child"
-  , "a"               : 2
-  , "b"               : 1
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "nth_child"
+      , "a" : 2
+      , "b" : 1
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_nth-last-child.ast

@@ -1,6 +1,11 @@
-[ { "type"            : "string"
-  , "pseudo_function" : "nth-last-child"
-  , "a"               : 0
-  , "b"               : 1
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    , { "f" : "nth_last_child"
+      , "a" : 0
+      , "b" : 1
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_root_pseudo.ast

@@ -1,3 +1,6 @@
-[ { "pseudo_class" : "root"
+[ { "tests" :
+    [ { "f" : "is_root"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_type.ast

@@ -1,3 +1,7 @@
-[ { "type" : "string"
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "string"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_type2.ast

@@ -1,3 +1,7 @@
-[ { "type" : "number"
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "number"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_type3.ast

@@ -1,3 +1,7 @@
-[ { "type" : "object"
+[ { "tests" :
+    [ { "f" : "instance_of_type"
+      , "n" : "object"
+      }
+    ]
   }
 ]

data/spec/fixtures/basic_universal.ast

@@ -1,2 +1,5 @@
-[ { }
+[ { "tests" :
+    [ 
+    ]
+  }
 ]

metadata

@@ -1,39 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json_select
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-24 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: treetop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70235358530860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70235358530860
 description: JSONSelect implementation for Ruby
-email: 
+email:
 - simon.menke@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -115,35 +110,31 @@ files:
 - spec/fixtures/basic_universal.selector
 - spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/fd/json_select
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: json_select
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: JSONSelect implementation for Ruby
-test_files: 
+test_files:
 - spec/conformance_spec.rb
 - spec/fixtures/README.md
 - spec/fixtures/alltests.txt