json_select 0.1.2 → 0.1.3

data/.travis.yml

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

data/README.md

@@ -1,4 +1,4 @@
-# JSONSelect
+# JSONSelect [![Build Status](http://travis-ci.org/fd/json_select.png)](http://travis-ci.org/fd/json_select)
 
 **CSS-like selectors for JSON.**
 
@@ -48,7 +48,9 @@ json = { # This would normally be loaded with something like yajl-ruby
   "weight" => 172
 }
 
-JSONSelect('string:first-child').match(json) # => ["Lloyd", "Bulgarian", "English", "Spanish", "window", "beer"]
+JSONSelect('string:first-child').test(json)    # => true
+JSONSelect('string:first-child').match(json)   # => "window"
+JSONSelect('string:first-child').matches(json) # => ["window", "beer"]
 ```
 
 ## Note on Patches/Pull Requests

data/lib/json_select.rb

@@ -5,6 +5,12 @@ class JSONSelect
   require 'json_select/version'
   require 'json_select/selector_parser'
   require 'json_select/selector'
+  
+  require 'json_select/helpers/size'
+  require 'json_select/helpers/key'
+  require 'json_select/helpers/type'
+  require 'json_select/helpers/depth'
+  require 'json_select/helpers/position'
 
   module Ast
     require 'json_select/ast/combination_selector'

data/lib/json_select/helpers/depth.rb

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

data/lib/json_select/helpers/key.rb

@@ -0,0 +1,7 @@
+module JSONSelect::KeyHelpers
+  
+  def has_class(object, test, key, idx, size, depth)
+    test[:n] == key.to_s
+  end
+  
+end

data/lib/json_select/helpers/position.rb

@@ -0,0 +1,24 @@
+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 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
+  
+end

data/lib/json_select/helpers/size.rb

@@ -0,0 +1,24 @@
+module JSONSelect::SizeHelpers
+  
+  def only_child(object, test, key, idx, size, depth)
+    return false unless size
+    
+    size == 1
+  end
+  
+  def empty(object, test, key, idx, size, depth)
+    return false unless size
+    
+    case object
+    when Array 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
+  
+end

data/lib/json_select/helpers/type.rb

@@ -0,0 +1,31 @@
+module JSONSelect::TypeHelpers
+  
+  def instance_of_type(object, test, key, idx, size, depth)
+    test[:n] == type_of(object)
+  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'
+    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

data/lib/json_select/selector.rb

@@ -42,6 +42,19 @@ class JSONSelect
       raise ArgumentError, "Expected a string for ast"
 
     end
+    
+    @helpers = Module.new
+    @helpers.send(:extend,
+      JSONSelect::KeyHelpers,
+      JSONSelect::TypeHelpers,
+      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)
+    end
   end
 
   # Returns the first matching child in `object`
@@ -79,32 +92,6 @@ class JSONSelect
 
 private
 
-  # function forEach(sel, obj, fun, id, num, tot) {
-  #   var a = (sel[0] === ',') ? sel.slice(1) : [sel];
-  #   var a0 = [];
-  #   var call = false;
-  #   for (var i = 0; i < a.length; i++) {
-  #     var x = mn(obj, a[i], id, num, tot);
-  #     if (x[0]) call = true;
-  #     for (var j = 0; j < x[1].length; j++) a0.push(x[1][j]);
-  #   }
-  #   if (a0.length && typeof obj === 'object') {
-  #     if (a0.length >= 1) a0.unshift(",");
-  #     if (isArray(obj)) {
-  #       for (var i = 0; i < obj.length; i++) forEach(a0, obj[i], fun, undefined, i, obj.length);
-  #     } else {
-  #       // it's a shame to do this for :last-child and other
-  #       // properties which count from the end when we don't
-  #       // even know if they're present.  Also, the stream
-  #       // parser is going to be pissed.
-  #       var l = 0;
-  #       for (var k in obj) if (obj.hasOwnProperty(k)) l++;
-  #       var i = 0;
-  #       for (var k in obj) if (obj.hasOwnProperty(k)) forEach(a0, obj[k], fun, k, i++, l);
-  #     }
-  #   }
-  #   if (call && fun) fun(obj);
-  # };
   def _each(selector, object, id, number, total, depth, &block)
     a0 = (selector[0] == ',' ? selector[1..-1] : [selector])
     a1 = []
@@ -131,27 +118,33 @@ private
 
       when Hash
         a1.unshift(',')
-        size = object.size
 
-        object.each_with_index do |(key, child), idx|
-          _each(a1, child, key, idx, size, depth + 1, &block)
+        object.each do |key, child|
+          _each(a1, child, key, nil, nil, depth + 1, &block)
         end
 
       else
         if object.respond_to?(:json_select_each)
           children = []
-          object.json_select_each do |key, value|
-            children << [key, value]
+          object.json_select_each do |value|
+            children << value
           end
           
           a1.unshift(',')
           size = children.size
           
-          children.each_with_index do |(key, child), idx|
-            _each(a1, child, key, idx, size, depth + 1, &block)
+          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
 
@@ -160,34 +153,6 @@ private
     end
   end
 
-
-  # function mn(node, sel, id, num, tot) {
-  #   var sels = [];
-  #   var cs = (sel[0] === '>') ? sel[1] : sel[0];
-  #   var m = true;
-  #   if (cs.type) m = m && (cs.type === mytypeof(node));
-  #   if (cs.id)   m = m && (cs.id === id);
-  #   if (m && cs.pf) {
-  #     if (cs.pf === ":nth-last-child") num = tot - num;
-  #     else num++;
-  #     if (cs.a === 0) {
-  #       m = cs.b === num;
-  #     } else {
-  #       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, depth)
     selectors = []
     current_selector = (selector[0] == :> ? selector[1] : selector[0])
@@ -200,7 +165,7 @@ private
       end
       
       if match
-        match = !!send(test[:f], object, test, id, number, total, depth)
+        match = !!@helper_methods[test[:f].to_sym].call(object, test, id, number, total, depth)
       end
     end
 
@@ -235,70 +200,4 @@ private
     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
-  
-  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/version.rb

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

data/spec/fixtures/basic_first-child.output

@@ -1,6 +1,2 @@
-"Lloyd"
-"Bulgarian"
-"English"
-"Spanish"
 "window"
 "beer"

data/spec/fixtures/basic_last-child.output

@@ -1,6 +1,2 @@
-"Hilaiel"
-"advanced"
-"native"
-"beginner"
 "aisle"
 "wine"

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

@@ -1,12 +1,3 @@
-"Lloyd"
-"Hilaiel"
-"yellow"
-"Bulgarian"
-"advanced"
-"English"
-"native"
-"Spanish"
-"beginner"
 "window"
 "aisle"
 "beer"

data/spec/fixtures/basic_nth-child.output

@@ -1,7 +1,3 @@
-"Lloyd"
-"Bulgarian"
-"English"
-"Spanish"
 "window"
 "beer"
 "wine"

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

@@ -1,6 +1,2 @@
-"Hilaiel"
-"advanced"
-"native"
-"beginner"
 "aisle"
 "wine"

data/spec/fixtures/basic_universal.output

@@ -83,4 +83,4 @@
         "wine"
     ],
     "weight": 172
-}
+}

data/spec/ruby_extensions_spec.rb

@@ -12,9 +12,9 @@ describe "JSONSelect", "Ruby extensions" do
       should == :hello
   end
   
-  it "treats Objects which respond to #json_select_each as Objects" do
+  it "treats Objects which respond to #json_select_each_pair as Objects" do
     class Person < Struct.new(:name, :age)
-      def json_select_each
+      def json_select_each_pair
         yield(:name, self.name)
         yield(:age, self.age)
       end
@@ -25,4 +25,20 @@ describe "JSONSelect", "Ruby extensions" do
       should == 'Simon Menke'
   end
   
+  it "treats Objects which respond to #json_select_each as Arrays" do
+    class List
+      def initialize(items)
+        @items = items
+      end
+      
+      def json_select_each
+        @items.each { |i| yield(i) }
+      end
+    end
+    
+    JSONSelect('array.person string:first-child').
+      match(:person => List.new(%w( foo bar baz ))).
+      should == 'foo'
+  end
+  
 end

metadata

@@ -1,34 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: json_select
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-26 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-27 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: treetop
-  requirement: &70235358530860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70235358530860
+  version_requirements: *id001
 description: JSONSelect implementation for Ruby
-email:
+email: 
 - simon.menke@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -48,6 +53,11 @@ files:
 - lib/json_select/ast/simple_selector.rb
 - lib/json_select/ast/type_selector.rb
 - lib/json_select/ast/universal_selector.rb
+- lib/json_select/helpers/depth.rb
+- lib/json_select/helpers/key.rb
+- lib/json_select/helpers/position.rb
+- lib/json_select/helpers/size.rb
+- lib/json_select/helpers/type.rb
 - lib/json_select/selector.rb
 - lib/json_select/selector_parser.rb
 - lib/json_select/selector_parser.tt
@@ -110,31 +120,35 @@ 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.7.2
+rubygems_version: 1.6.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