json_select 0.1.0 → 0.1.1

data/lib/json_select/selector_parser.tt

@@ -1,11 +1,10 @@
-module JSONSelect
-grammar SelectorParser
+grammar JSONSelectSelector
 
   # selectors_group
   #   : selector [ `,` selector ]*
   #   ;
   rule selectors_group
-    a:selector b:( ',' c:selector )* <JSONSelect::Ast::SelectorGroup>
+    ws* a:selector b:( ws* ',' ws* c:selector )* ws* <JSONSelect::Ast::SelectorGroup>
   end
 
   # selector
@@ -19,7 +18,7 @@ grammar SelectorParser
   #   : `>` | \s+
   #   ;
   rule combinator
-    '>' / [\s]+
+    (ws* '>' ws* ) / (ws+)
   end
 
   # simple_selector_sequence
@@ -40,14 +39,14 @@ grammar SelectorParser
   rule type_selector
     ('object' / 'array' / 'number' / 'string' / 'boolean' / 'null') <JSONSelect::Ast::TypeSelector>
   end
-  
+
   # universal
   #   : '*'
   #   ;
   rule universal
     '*' <JSONSelect::Ast::UniversalSelector>
   end
-  
+
   # hash
   #   : `.` name
   #   | `.` json_string
@@ -63,8 +62,8 @@ grammar SelectorParser
   #   | `:` pseudo_function_name `(` expression `)`
   #   ;
   rule pseudo
-    ( ':' a:pseudo_class_name <JSONSelect::Ast::PseudoSelector> ) / 
-    ( ':' a:pseudo_function_name '(' e:expression ')' <JSONSelect::Ast::PseudoSelector> )
+    ( ':' a:pseudo_class_name <JSONSelect::Ast::PseudoSelector> ) /
+    ( ':' a:pseudo_function_name '(' ws* e:expression ws* ')' <JSONSelect::Ast::PseudoSelector> )
   end
 
   # pseudo_class_name
@@ -72,7 +71,7 @@ grammar SelectorParser
   rule pseudo_class_name
     'root' / 'first-child' / 'last-child' / 'only-child'
   end
-  
+
   # pseudo_function_name
   #   : `nth-child` | `nth-last-child`
   rule pseudo_function_name
@@ -83,26 +82,20 @@ grammar SelectorParser
   #   /* expression is and of the form "an+b" */
   #   : TODO
   #   ;
-  # /^ \(
-  #   (?: ([+-]?) ([0-9]*) n (?:([+-]) ([0-9]) )?
-  #   | (odd|even)
-  #   | ( [+-]? [0-9]+ )
-  #   )
-  #    \) /;
   rule expression
     ('odd'  <JSONSelect::Ast::OddExpr> ) /
     ('even' <JSONSelect::Ast::EvenExpr>) /
-    ( a:[+-]? b:[0-9]* 'n' c:( [+-] [0-9] )? <JSONSelect::Ast::ComplexExpr> ) /
+    ( a:[+-]? b:[0-9]* 'n' ws* c:( [+-] ws* [0-9] )? <JSONSelect::Ast::ComplexExpr> ) /
     ( [+-]? [0-9]+ <JSONSelect::Ast::SimpleExpr> )
   end
-  
+
   # json_string
   #   : `"` json_chars* `"`
   #   ;
   rule json_string
     ["] json_chars* ["]
   end
-  
+
   # json_chars
   #   : any-Unicode-character-except-"-or-\-or-control-character
   #   |  `\"`
@@ -113,27 +106,27 @@ grammar SelectorParser
   #   |  `\n`
   #   |  `\r`
   #   |  `\t`
-  #   |   \u four-hex-digits 
+  #   |   \u four-hex-digits
   #   ;
   rule json_chars
     [^\\"] /
     ( [\\] ["\\/bfnrt] )
   end
-  
+
   # name
   #   : nmstart nmchar*
   #   ;
   rule name
     nmstart nmchar*
   end
-  
+
   # nmstart
   #   : escape | [_a-zA-Z] | nonascii
   #   ;
   rule nmstart
     escape / [_a-zA-Z] / nonascii
   end
-  
+
   # nmchar
   #   : [_a-zA-Z0-9-]
   #   | escape
@@ -143,13 +136,13 @@ grammar SelectorParser
     [_a-zA-Z0-9-] / escape / nonascii
   end
 
-  # escape 
+  # escape
   #   : \\[^\r\n\f0-9a-fA-F]
   #   ;
   rule escape
     [\\] [^\r\n\f0-9a-fA-F]
   end
-  
+
   # nonascii
   #   : [^\0-0177]
   #   ;
@@ -157,5 +150,8 @@ grammar SelectorParser
     [^\0-0177]
   end
 
-end
+  rule ws
+    [ \t\r\n]
+  end
+
 end

data/lib/json_select/version.rb

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

data/spec/conformance_spec.rb

@@ -1,41 +1,55 @@
 describe "JSONSelect", "conformance" do
-  
+
   %w( basic ).each do |test|
     selectors = "../fixtures/#{test}_*.selector"
     selectors = Dir[File.expand_path(selectors, __FILE__)]
-    
+
     describe "(#{test})" do
-  
+
       let(:input) do
         path = File.expand_path("../fixtures/#{test}.json", __FILE__)
         Yajl::Parser.parse(File.read(path))
       end
-      
+
       selectors.each do |selector|
         basename = File.basename(selector, '.selector')
         name     = basename[(test.size + 1)..-1]
         output   = File.expand_path("../fixtures/#{basename}.output", __FILE__)
         ast      = File.expand_path("../fixtures/#{basename}.ast", __FILE__)
-        
+
         describe "(#{name})" do
-          
+
           it "parses the selector" do
             ast = Yajl::Parser.parse(File.read(ast))
             s = JSONSelect(File.read(selector).strip)
-            s.should be_a(JSONSelect::Selector)
-            s.ast.should == ast
+            s.should be_a(JSONSelect)
+            Yajl::Parser.parse(Yajl::Encoder.encode(s.ast)).should == ast
           end
-          
+
           it "produces the correct output" do
             s = JSONSelect(File.read(selector).strip)
             e = []
             Yajl::Parser.parse(File.read(output)) { |o| e << o }
-            s.evaluate(input).should == e
+            s.matches(input).should == e
           end
-          
+
+          it "finds the first matching child" do
+            s = JSONSelect(File.read(selector).strip)
+            e = []
+            Yajl::Parser.parse(File.read(output)) { |o| e << o }
+            s.match(input).should == e.first
+          end
+
+          it "can correctly test the object" do
+            s = JSONSelect(File.read(selector).strip)
+            e = []
+            Yajl::Parser.parse(File.read(output)) { |o| e << o }
+            s.test(input).should be_true
+          end
+
         end
       end
-    
+
     end
   end
 end

data/spec/fixtures/basic_children.ast

@@ -0,0 +1,6 @@
+[ { "class" : "name"
+  }
+, ">"
+, { "class" : "first"
+  }
+]

data/spec/fixtures/basic_children.output

@@ -0,0 +1 @@
+"Lloyd"

data/spec/fixtures/basic_children.selector

@@ -0,0 +1 @@
+.name > .first

data/spec/fixtures/basic_combination.ast

@@ -0,0 +1,5 @@
+[ { "class" : "name"
+  }
+, { "class" : "first"
+  }
+]

data/spec/fixtures/basic_combination.output

@@ -0,0 +1 @@
+"Lloyd"

data/spec/fixtures/basic_combination.selector

@@ -0,0 +1 @@
+.name .first

data/spec/fixtures/basic_universal.output

@@ -52,6 +52,7 @@
     "wine"
 ]
 172
+"somehow YAJL swallows the next object after a number"
 {
     "name": {
         "first": "Lloyd",
@@ -82,4 +83,4 @@
         "wine"
     ],
     "weight": 172
-}
+}

data/spec/ruby_extensions_spec.rb

@@ -0,0 +1,28 @@
+describe "JSONSelect", "Ruby extensions" do
+  
+  it "treats Symbol keys as Strings" do
+    JSONSelect('.name .first').
+      match(:name => { :first => 'hello' }).
+      should == 'hello'
+  end
+  
+  it "treats Symbol values as Strings" do
+    JSONSelect('.name string.uid').
+      match(:name => { :uid => :hello }).
+      should == :hello
+  end
+  
+  it "treats Objects which respond to #json_select_each as Objects" do
+    class Person < Struct.new(:name, :age)
+      def json_select_each
+        yield(:name, self.name)
+        yield(:age, self.age)
+      end
+    end
+    
+    JSONSelect('object.person string.name').
+      match(:person => Person.new('Simon Menke', 24)).
+      should == 'Simon Menke'
+  end
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: json_select
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simon Menke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +02:00
+date: 2011-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -52,7 +53,6 @@ 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/parser.rb
 - lib/json_select/selector.rb
 - lib/json_select/selector_parser.rb
 - lib/json_select/selector_parser.tt
@@ -62,6 +62,12 @@ files:
 - spec/fixtures/alltests.txt
 - spec/fixtures/basic.json
 - spec/fixtures/basic.xml
+- spec/fixtures/basic_children.ast
+- spec/fixtures/basic_children.output
+- spec/fixtures/basic_children.selector
+- spec/fixtures/basic_combination.ast
+- spec/fixtures/basic_combination.output
+- spec/fixtures/basic_combination.selector
 - spec/fixtures/basic_first-child.ast
 - spec/fixtures/basic_first-child.output
 - spec/fixtures/basic_first-child.selector
@@ -107,6 +113,7 @@ files:
 - spec/fixtures/basic_universal.ast
 - spec/fixtures/basic_universal.output
 - spec/fixtures/basic_universal.selector
+- spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/fd/json_select
@@ -142,6 +149,12 @@ test_files:
 - spec/fixtures/alltests.txt
 - spec/fixtures/basic.json
 - spec/fixtures/basic.xml
+- spec/fixtures/basic_children.ast
+- spec/fixtures/basic_children.output
+- spec/fixtures/basic_children.selector
+- spec/fixtures/basic_combination.ast
+- spec/fixtures/basic_combination.output
+- spec/fixtures/basic_combination.selector
 - spec/fixtures/basic_first-child.ast
 - spec/fixtures/basic_first-child.output
 - spec/fixtures/basic_first-child.selector
@@ -187,4 +200,5 @@ test_files:
 - spec/fixtures/basic_universal.ast
 - spec/fixtures/basic_universal.output
 - spec/fixtures/basic_universal.selector
+- spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb

data/lib/json_select/parser.rb

@@ -1,19 +0,0 @@
-class JSONSelect::Parser
-  
-  def initialize(source)
-    @parser = JSONSelect::SelectorParserParser.new
-    @source = source
-  end
-  
-  def parse
-    tree = @parser.parse(@source)
-    if tree
-      JSONSelect::Selector.new(tree.to_ast)
-    else
-      raise JSONSelect::ParseError, @parser.failure_reason
-      # puts parser.failure_line
-      # puts parser.failure_column
-    end
-  end
-  
-end