json_select 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.1
+  - 1.9.2
+  - jruby
+  - rbx
+  - ree

data/Gemfile

@@ -3,5 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in json_select.gemspec
 gemspec
 
+gem 'rake', '0.8.7'
 gem 'rspec'
 gem 'yajl-ruby'

data/Rakefile

@@ -11,6 +11,11 @@ end
 
 task :build_parser do
   sh "bundle exec tt lib/json_select/selector_parser.tt -o lib/json_select/selector_parser.rb"
+
+  path = 'lib/json_select/selector_parser.rb'
+  src = File.read(path)
+  src.gsub!('JSONSelectSelector', 'JSONSelect::Selector')
+  File.open(path, 'w+') { |f| f.write src }
 end
 
 task :spec    => :build_parser

data/lib/json_select.rb

@@ -1,12 +1,11 @@
-module JSONSelect
-  
+class JSONSelect
+
   require 'treetop'
-  
+
   require 'json_select/version'
   require 'json_select/selector_parser'
   require 'json_select/selector'
-  require 'json_select/parser'
-  
+
   module Ast
     require 'json_select/ast/combination_selector'
     require 'json_select/ast/simple_selector'
@@ -15,21 +14,17 @@ module JSONSelect
     require 'json_select/ast/hash_selector'
     require 'json_select/ast/pseudo_selector'
     require 'json_select/ast/universal_selector'
-    
+
     require 'json_select/ast/odd_expr'
     require 'json_select/ast/even_expr'
     require 'json_select/ast/simple_expr'
     require 'json_select/ast/complex_expr'
   end
-  
+
   ParseError = Class.new(RuntimeError)
-  
-  def self.parse(selector)
-    JSONSelect::Parser.new(selector).parse
-  end
-  
+
 end
 
 def JSONSelect(selector)
-  JSONSelect.parse(selector)
+  JSONSelect.new(selector)
 end

data/lib/json_select/ast/combination_selector.rb

@@ -1,14 +1,14 @@
 module JSONSelect::Ast::CombinationSelector
-  
+
   def to_ast
     ast = [a.to_ast]
-    
+
     b.elements.each do |comb|
-      ast.push('>') if comb.c.text_value.strip == '>'
+      ast.push(:>) if comb.c.text_value.strip == '>'
       ast.push(comb.d.to_ast)
     end
-    
+
     ast
   end
-  
+
 end

data/lib/json_select/ast/complex_expr.rb

@@ -1,27 +1,27 @@
 module JSONSelect::Ast::ComplexExpr
-  
+
   def to_ast
     _a = ""
-    
+
     if a.text_value.size > 0
       _a += a.text_value
     else
       _a += '+'
     end
-    
+
     if b.text_value.size > 0
       _a += b.text_value
     else
       _a += '1'
     end
-    
+
     if c.text_value.size > 0
       _b = c.text_value.to_i
     else
       _b = 0
     end
-    
-    { 'a' => _a.to_i, 'b' => _b }
+
+    { :a => _a.to_i, :b => _b }
   end
-  
+
 end

data/lib/json_select/ast/even_expr.rb

@@ -1,7 +1,7 @@
 module JSONSelect::Ast::EvenExpr
-  
+
   def to_ast
-    { 'a' => 2, 'b' => 0 }
+    { :a => 2, :b => 0 }
   end
-  
+
 end

data/lib/json_select/ast/hash_selector.rb

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

data/lib/json_select/ast/odd_expr.rb

@@ -1,7 +1,7 @@
 module JSONSelect::Ast::OddExpr
-  
+
   def to_ast
-    { 'a' => 2, 'b' => 1 }
+    { :a => 2, :b => 1 }
   end
-  
+
 end

data/lib/json_select/ast/pseudo_selector.rb

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

data/lib/json_select/ast/simple_expr.rb

@@ -1,7 +1,7 @@
 module JSONSelect::Ast::SimpleExpr
-  
+
   def to_ast
-    { 'a' => 0, 'b' => text_value.to_i }
+    { :a => 0, :b => text_value.to_i }
   end
-  
+
 end

data/lib/json_select/ast/type_selector.rb

@@ -1,8 +1,8 @@
 module JSONSelect::Ast::TypeSelector
-  
+
   # `object` | `array` | `number` | `string` | `boolean` | `null`
   def to_ast
-    { "type" => self.text_value }
+    { :type => self.text_value }
   end
-  
+
 end

data/lib/json_select/selector.rb

@@ -1,27 +1,84 @@
-class JSONSelect::Selector
-  
+class JSONSelect
+
   attr_reader :ast
-  
-  def initialize(ast)
-    @ast = ast
+
+  @@parser_cache = {}
+
+  def self.reset_cache!
+    @@parser_cache.clear
   end
-  
+
+  def initialize(src, use_parser_cache=true)
+    case src
+
+    when String
+      ast = nil
+
+      if use_parser_cache
+        ast = @@parser_cache[src]
+      end
+
+      if ast
+        @ast = ast
+
+      else
+        parser = JSONSelect::SelectorParser.new
+        tree   = parser.parse(src)
+        unless tree
+          raise JSONSelect::ParseError, parser.failure_reason
+        end
+
+        @ast = tree.to_ast
+
+        if use_parser_cache
+          @@parser_cache[src] = ast
+        end
+      end
+
+    when Array
+      @ast = src
+
+    else
+      raise ArgumentError, "Expected a string for ast"
+
+    end
+  end
+
+  # Returns the first matching child in `object`
   def match(object)
+    _each(@ast, object, nil, nil, nil) do |object|
+      return object
+    end
+
+    return nil
+  end
+
+  alias_method :=~, :match
+
+  # Returns all matching children in `object`
+  def matches(object)
     matches = []
-    
+
     _each(@ast, object, nil, nil, nil) do |object|
       matches << object
     end
-    
+
     matches
   end
-  
-  alias_method :evaluate, :match
-  alias_method :=~,       :match
-  alias_method :===,      :match
-  
+
+  # Returns true if `object` has any matching children.
+  def test(object)
+    _each(@ast, object, nil, nil, nil) do |object|
+      return true
+    end
+
+    return false
+  end
+
+  alias_method :===, :test
+
 private
-  
+
   # function forEach(sel, obj, fun, id, num, tot) {
   #   var a = (sel[0] === ',') ? sel.slice(1) : [sel];
   #   var a0 = [];
@@ -51,40 +108,59 @@ private
   def _each(selector, object, id, number, total, &block)
     a0 = (selector[0] == ',' ? selector[1..-1] : [selector])
     a1 = []
-    
+
     call = false
-    
+
     a0.each do |selector|
       ok, extra = _match(object, selector, id, number, total)
-      
+
       call = true if ok
       a1.concat extra
     end
-    
-    if (Array === object or Hash === object) and a1.any?
-      a1.unshift(',')
-      size = object.size
-      
-      if Array === object
+
+    if a1.any?
+      case object
+
+      when Array
+        a1.unshift(',')
+        size = object.size
+
         object.each_with_index do |child, idx|
           _each(a1, child, nil, idx, size, &block)
         end
-      end
-      
-      if Hash === object
+
+      when Hash
+        a1.unshift(',')
+        size = object.size
+
         object.each_with_index do |(key, child), idx|
           _each(a1, child, key, idx, size, &block)
         end
+
+      else
+        if object.respond_to?(:json_select_each)
+          children = []
+          object.json_select_each do |key, value|
+            children << [key, value]
+          end
+          
+          a1.unshift(',')
+          size = children.size
+          
+          children.each_with_index do |(key, child), idx|
+            _each(a1, child, key, idx, size, &block)
+          end
+        end
+
       end
-      
     end
-    
+
     if call and block
       block.call(object)
     end
   end
-  
-  
+
+
   # function mn(node, sel, id, num, tot) {
   #   var sels = [];
   #   var cs = (sel[0] === '>') ? sel[1] : sel[0];
@@ -100,77 +176,83 @@ private
   #       m = (!((num - cs.b) % cs.a) && ((num*cs.a + cs.b) >= 0));
   #     }
   #   }
-  #   
+  #
   #   // should we repeat this selector for descendants?
   #   if (sel[0] !== '>' && sel[0].pc !== ":root") sels.push(sel);
-  #   
+  #
   #   if (m) {
   #     // is there a fragment that we should pass down?
   #     if (sel[0] === '>') { if (sel.length > 2) { m = false; sels.push(sel.slice(2)); } }
   #     else if (sel.length > 1) { m = false; sels.push(sel.slice(1)); }
   #   }
-  #   
+  #
   #   return [m, sels];
   # }
   def _match(object, selector, id, number, total)
     selectors = []
-    current_selector = (selector[0] == '>' ? selector[1] : selector[0])
+    current_selector = (selector[0] == :> ? selector[1] : selector[0])
     match = true
-    
-    if current_selector.key?('type')
-      match = (match and current_selector['type'] == _type_of(object))
+
+    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)
+
+    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 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
       end
-      
-      if current_selector['a'] == 0
-        match = current_selector['b'] == number
+
+      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))
+        match = ((((number - current_selector[:b]) % current_selector[:a]) == 0) && ((number * current_selector[:a] + current_selector[:b]) >= 0))
       end
     end
-    
-    if selector[0] != '>' and selector[0]['pseudo_class'] != 'root'
+
+    if Hash === selector[0] and selector[0][:pseudo_class] != 'root'
       selectors.push selector
     end
-    
+
     if match
-      if selector[0] == '>'
-        if selector.length > 2
-          m = false
+      if selector[0] == :>
+        if selector.length > 2 
+          match = false
           selectors.push selector[2..-1]
         end
       elsif selector.length > 1
-        m = false
+        match = false
         selectors.push selector[1..-1]
       end
     end
-    
+
     return [match, selectors]
   end
-  
+
   def _type_of(object)
+    if object.respond_to?(:json_select_each)
+      return 'object'
+    end
+    
     case object
     when Hash       then 'object'
     when Array      then 'array'
     when String     then 'string'
+    when Symbol     then 'string'
     when Numeric    then 'number'
     when TrueClass  then 'boolean'
     when FalseClass then 'boolean'
     when NilClass   then 'null'
+    else raise "Invalid object of class #{object.class} for JSONSelect: #{object.inspect}"
     end
   end
-  
+
 end