json_select 0.1.3 → 0.1.4

data/lib/json_select/selector_parser.tt

@@ -63,7 +63,8 @@ grammar JSONSelectSelector
   #   ;
   rule pseudo
     ( ':' a:pseudo_class_name <JSONSelect::Ast::PseudoSelector> ) /
-    ( ':' a:pseudo_function_name '(' ws* e:expression ws* ')' <JSONSelect::Ast::PseudoSelector> )
+    ( ':' a:positional_pseudo_function_name ws* '(' ws* e:expression ws* ')' <JSONSelect::Ast::PseudoSelector> ) /
+    ( ':' a:subselector_pseudo_function_name ws* '(' ws* s:selectors_group ws* ')' <JSONSelect::Ast::PseudoSelector> )
   end
 
   # pseudo_class_name
@@ -74,10 +75,16 @@ grammar JSONSelectSelector
 
   # pseudo_function_name
   #   : `nth-child` | `nth-last-child`
-  rule pseudo_function_name
+  rule positional_pseudo_function_name
     'nth-child' / 'nth-last-child'
   end
 
+  # pseudo_function_name
+  #   : `nth-child` | `nth-last-child`
+  rule subselector_pseudo_function_name
+    'has'
+  end
+
   # expression
   #   /* expression is and of the form "an+b" */
   #   : TODO

data/lib/json_select/version.rb

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

data/spec/conformance_spec.rb

@@ -1,55 +1,111 @@
 describe "JSONSelect", "conformance" do
 
-  %w( basic ).each do |test|
-    selectors = "../fixtures/#{test}_*.selector"
-    selectors = Dir[File.expand_path(selectors, __FILE__)]
+  p_levels = "../fixtures/conformance/level_*"
+  p_groups = "{basic}.json"
 
-    describe "(#{test})" do
+  levels = {}
 
-      let(:input) do
-        path = File.expand_path("../fixtures/#{test}.json", __FILE__)
-        Yajl::Parser.parse(File.read(path))
-      end
+  d = Dir[File.expand_path(p_levels, __FILE__)]
+  d.each do |dir|
+    level = (levels[File.basename(dir)] = {})
 
-      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__)
+    d = Dir[File.expand_path(p_groups, dir)]
+    d.each do |json|
+      gname = File.basename(json, '.json')
+      group = (level[gname] = {})
+      group[:json] = json
 
-        describe "(#{name})" do
+      d = Dir[File.expand_path("../#{gname}_*.selector", json)]
+      d.each do |selector|
+        name = File.basename(selector, '.selector').split('_', 2).last
 
-          it "parses the selector" do
-            ast = Yajl::Parser.parse(File.read(ast))
-            s = JSONSelect(File.read(selector).strip)
-            s.should be_a(JSONSelect)
-            Yajl::Parser.parse(Yajl::Encoder.encode(s.ast)).should == ast
-          end
+        group[name] = [selector,
+          File.expand_path("../#{gname}_#{name}.output", selector)]
+      end
+    end
+  end
 
-          it "produces the correct output" do
-            s = JSONSelect(File.read(selector).strip)
-            e = []
-            Yajl::Parser.parse(File.read(output)) { |o| e << o }
-            s.matches(input).should == e
-          end
+  levels.each do |level, groups|
+    describe "(#{level})" do
+      groups.each do |group, tests|
+        describe "(#{group})" do
+          input_p = tests.delete(:json)
 
-          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
+          let(:input) do
+            Yajl::Parser.parse(File.read(input_p))
           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
+          tests.each do |test, (selector_p, output_p)|
+            describe "(#{test})" do
+
+              let(:selector) do
+                File.read(selector_p)
+              end
 
+              let(:output) do
+                o = File.read(output_p)
+                o.sub! /^172$/, "172\n\"ignored object\""
+
+                e = []
+                Yajl::Parser.parse(o) { |o| e << o }
+                e
+              end
+
+              it "finds all matching children" do
+                JSONSelect(selector).matches(input).should == output
+              end
+
+              it "finds the first matching child" do
+                JSONSelect(selector).match(input).should == output.first
+              end
+
+              it "can correctly test the object" do
+                JSONSelect(selector).test(input).should be_true
+              end
+
+            end
+          end
         end
       end
-
     end
   end
+
+  # %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__)
+  #       selector_o = File.expand_path("../fixtures/#{basename}.selector.out", __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)
+  #         #   Yajl::Parser.parse(Yajl::Encoder.encode(s.ast)).should == ast
+  #         # end
+  #
+  #         # it "produces the correct selector" do
+  #         #   s = JSONSelect(File.read(selector).strip)
+  #         #   e = File.read(selector_o)
+  #         #   s.to_s.should == e
+  #         # end
+  #
+  #       end
+  #     end
+  #
+  #   end
+  # end
 end

data/spec/fixtures/parser/level_1/basic_children.selector

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

data/spec/fixtures/parser/level_1/basic_combination.selector

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

data/spec/fixtures/parser/level_1/basic_first-child.output

@@ -0,0 +1 @@
+string:nth-child(0n1)

data/spec/fixtures/parser/level_1/basic_grouping.output

@@ -0,0 +1 @@
+string.level, number

data/spec/fixtures/parser/level_1/basic_id.output

@@ -0,0 +1 @@
+.favoriteColor

data/spec/fixtures/parser/level_1/basic_id_multiple.output

@@ -0,0 +1 @@
+.language

data/spec/fixtures/parser/level_1/basic_id_quotes.output

@@ -0,0 +1 @@
+.weight

data/spec/fixtures/parser/level_1/basic_id_with_type.output

@@ -0,0 +1 @@
+string.favoriteColor

data/spec/fixtures/parser/level_1/basic_last-child.output

@@ -0,0 +1 @@
+string:nth-last-child(0n1)

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

@@ -0,0 +1 @@
+string:nth-child(-1n2)

data/spec/fixtures/parser/level_1/basic_nth-child.output

@@ -0,0 +1 @@
+string:nth-child(2n1)

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

@@ -0,0 +1 @@
+string:nth-last-child(0n1)

data/spec/fixtures/parser/level_1/basic_root_pseudo.output

@@ -0,0 +1 @@
+:root

data/spec/fixtures/parser/level_1/basic_type.selector

@@ -0,0 +1 @@
+string

data/spec/fixtures/parser/level_1/basic_type2.selector

@@ -0,0 +1 @@
+number

data/spec/fixtures/parser/level_1/basic_type3.output

@@ -0,0 +1 @@
+object

data/spec/fixtures/parser/level_1/basic_universal.output

@@ -0,0 +1 @@
+*

data/spec/fixtures/parser/level_3/basic_has-sans-paren.output

@@ -0,0 +1 @@
+Error: missing closing paren

data/spec/fixtures/parser/level_3/basic_has-sans-paren.selector

@@ -0,0 +1,2 @@
+object:has(.language
+

data/spec/fixtures/parser/level_3/basic_has-whitespace.output

@@ -0,0 +1 @@
+object:has(.language)

data/spec/fixtures/parser/level_3/basic_has-whitespace.selector

@@ -0,0 +1,3 @@
+object:has       (       .language       ) 
+
+

data/spec/fixtures/parser/level_3/basic_has.output

@@ -0,0 +1 @@
+object:has(.language)

data/spec/fixtures/parser/level_3/basic_has.selector

@@ -0,0 +1 @@
+object:has(.language)

data/spec/parser_spec.rb

@@ -0,0 +1,52 @@
+describe "JSONSelect", "parser" do
+
+  p_levels = "../fixtures/parser/level_*"
+  p_groups = %w( basic )
+
+  levels = {}
+
+  d = Dir[File.expand_path(p_levels, __FILE__)]
+  d.each do |dir|
+    level = (levels[File.basename(dir)] = {})
+
+    p_groups.each do |gname|
+      json  = File.expand_path(gname, dir)
+      group = (level[gname] = {})
+
+      d = Dir[File.expand_path("../#{gname}_*.selector", json)]
+      d.each do |selector|
+        name = File.basename(selector, '.selector').split('_', 2).last
+
+        group[name] = [selector,
+          File.expand_path("../#{gname}_#{name}.output", selector)]
+      end
+    end
+  end
+
+  levels.each do |level, groups|
+    describe "(#{level})" do
+      groups.each do |group, tests|
+        describe "(#{group})" do
+          tests.each do |test, (selector_p, output_p)|
+            describe "(#{test})" do
+
+              let(:selector) do
+                File.read(selector_p)
+              end
+
+              let(:output) do
+                File.read(output_p)
+              end
+
+              it "produces the correct selector" do
+                JSONSelect(selector).to_s.should == output
+              end
+
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,40 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json_select
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-27 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: treetop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: JSONSelect implementation for Ruby
-email: 
+email:
 - simon.menke@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .gitmodules
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -63,147 +64,121 @@ files:
 - lib/json_select/selector_parser.tt
 - lib/json_select/version.rb
 - spec/conformance_spec.rb
-- spec/fixtures/README.md
-- 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
-- spec/fixtures/basic_grouping.ast
-- spec/fixtures/basic_grouping.output
-- spec/fixtures/basic_grouping.selector
-- spec/fixtures/basic_id.ast
-- spec/fixtures/basic_id.output
-- spec/fixtures/basic_id.selector
-- spec/fixtures/basic_id_multiple.ast
-- spec/fixtures/basic_id_multiple.output
-- spec/fixtures/basic_id_multiple.selector
-- spec/fixtures/basic_id_quotes.ast
-- spec/fixtures/basic_id_quotes.output
-- spec/fixtures/basic_id_quotes.selector
-- spec/fixtures/basic_id_with_type.ast
-- spec/fixtures/basic_id_with_type.output
-- spec/fixtures/basic_id_with_type.selector
-- spec/fixtures/basic_last-child.ast
-- spec/fixtures/basic_last-child.output
-- spec/fixtures/basic_last-child.selector
-- spec/fixtures/basic_nth-child-2.ast
-- spec/fixtures/basic_nth-child-2.output
-- spec/fixtures/basic_nth-child-2.selector
-- spec/fixtures/basic_nth-child.ast
-- spec/fixtures/basic_nth-child.output
-- spec/fixtures/basic_nth-child.selector
-- spec/fixtures/basic_nth-last-child.ast
-- spec/fixtures/basic_nth-last-child.output
-- spec/fixtures/basic_nth-last-child.selector
-- spec/fixtures/basic_root_pseudo.ast
-- spec/fixtures/basic_root_pseudo.output
-- spec/fixtures/basic_root_pseudo.selector
-- spec/fixtures/basic_type.ast
-- spec/fixtures/basic_type.output
-- spec/fixtures/basic_type.selector
-- spec/fixtures/basic_type2.ast
-- spec/fixtures/basic_type2.output
-- spec/fixtures/basic_type2.selector
-- spec/fixtures/basic_type3.ast
-- spec/fixtures/basic_type3.output
-- spec/fixtures/basic_type3.selector
-- spec/fixtures/basic_universal.ast
-- spec/fixtures/basic_universal.output
-- spec/fixtures/basic_universal.selector
+- spec/fixtures/parser/level_1/basic_children.output
+- spec/fixtures/parser/level_1/basic_children.selector
+- spec/fixtures/parser/level_1/basic_combination.output
+- spec/fixtures/parser/level_1/basic_combination.selector
+- spec/fixtures/parser/level_1/basic_first-child.output
+- spec/fixtures/parser/level_1/basic_first-child.selector
+- spec/fixtures/parser/level_1/basic_grouping.output
+- spec/fixtures/parser/level_1/basic_grouping.selector
+- spec/fixtures/parser/level_1/basic_id.output
+- spec/fixtures/parser/level_1/basic_id.selector
+- spec/fixtures/parser/level_1/basic_id_multiple.output
+- spec/fixtures/parser/level_1/basic_id_multiple.selector
+- spec/fixtures/parser/level_1/basic_id_quotes.output
+- spec/fixtures/parser/level_1/basic_id_quotes.selector
+- spec/fixtures/parser/level_1/basic_id_with_type.output
+- spec/fixtures/parser/level_1/basic_id_with_type.selector
+- spec/fixtures/parser/level_1/basic_last-child.output
+- spec/fixtures/parser/level_1/basic_last-child.selector
+- spec/fixtures/parser/level_1/basic_nth-child-2.output
+- spec/fixtures/parser/level_1/basic_nth-child-2.selector
+- spec/fixtures/parser/level_1/basic_nth-child.output
+- spec/fixtures/parser/level_1/basic_nth-child.selector
+- spec/fixtures/parser/level_1/basic_nth-last-child.output
+- spec/fixtures/parser/level_1/basic_nth-last-child.selector
+- spec/fixtures/parser/level_1/basic_root_pseudo.output
+- spec/fixtures/parser/level_1/basic_root_pseudo.selector
+- spec/fixtures/parser/level_1/basic_type.output
+- spec/fixtures/parser/level_1/basic_type.selector
+- spec/fixtures/parser/level_1/basic_type2.output
+- spec/fixtures/parser/level_1/basic_type2.selector
+- spec/fixtures/parser/level_1/basic_type3.output
+- spec/fixtures/parser/level_1/basic_type3.selector
+- spec/fixtures/parser/level_1/basic_universal.output
+- spec/fixtures/parser/level_1/basic_universal.selector
+- spec/fixtures/parser/level_3/basic_has-sans-paren.output
+- spec/fixtures/parser/level_3/basic_has-sans-paren.selector
+- spec/fixtures/parser/level_3/basic_has-whitespace.output
+- spec/fixtures/parser/level_3/basic_has-whitespace.selector
+- spec/fixtures/parser/level_3/basic_has.output
+- spec/fixtures/parser/level_3/basic_has.selector
+- spec/parser_spec.rb
 - 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'
+      segments:
+      - 0
+      hash: 3219129278350857102
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3219129278350857102
 requirements: []
-
 rubyforge_project: json_select
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 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
-- 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
-- spec/fixtures/basic_grouping.ast
-- spec/fixtures/basic_grouping.output
-- spec/fixtures/basic_grouping.selector
-- spec/fixtures/basic_id.ast
-- spec/fixtures/basic_id.output
-- spec/fixtures/basic_id.selector
-- spec/fixtures/basic_id_multiple.ast
-- spec/fixtures/basic_id_multiple.output
-- spec/fixtures/basic_id_multiple.selector
-- spec/fixtures/basic_id_quotes.ast
-- spec/fixtures/basic_id_quotes.output
-- spec/fixtures/basic_id_quotes.selector
-- spec/fixtures/basic_id_with_type.ast
-- spec/fixtures/basic_id_with_type.output
-- spec/fixtures/basic_id_with_type.selector
-- spec/fixtures/basic_last-child.ast
-- spec/fixtures/basic_last-child.output
-- spec/fixtures/basic_last-child.selector
-- spec/fixtures/basic_nth-child-2.ast
-- spec/fixtures/basic_nth-child-2.output
-- spec/fixtures/basic_nth-child-2.selector
-- spec/fixtures/basic_nth-child.ast
-- spec/fixtures/basic_nth-child.output
-- spec/fixtures/basic_nth-child.selector
-- spec/fixtures/basic_nth-last-child.ast
-- spec/fixtures/basic_nth-last-child.output
-- spec/fixtures/basic_nth-last-child.selector
-- spec/fixtures/basic_root_pseudo.ast
-- spec/fixtures/basic_root_pseudo.output
-- spec/fixtures/basic_root_pseudo.selector
-- spec/fixtures/basic_type.ast
-- spec/fixtures/basic_type.output
-- spec/fixtures/basic_type.selector
-- spec/fixtures/basic_type2.ast
-- spec/fixtures/basic_type2.output
-- spec/fixtures/basic_type2.selector
-- spec/fixtures/basic_type3.ast
-- spec/fixtures/basic_type3.output
-- spec/fixtures/basic_type3.selector
-- spec/fixtures/basic_universal.ast
-- spec/fixtures/basic_universal.output
-- spec/fixtures/basic_universal.selector
+- spec/fixtures/parser/level_1/basic_children.output
+- spec/fixtures/parser/level_1/basic_children.selector
+- spec/fixtures/parser/level_1/basic_combination.output
+- spec/fixtures/parser/level_1/basic_combination.selector
+- spec/fixtures/parser/level_1/basic_first-child.output
+- spec/fixtures/parser/level_1/basic_first-child.selector
+- spec/fixtures/parser/level_1/basic_grouping.output
+- spec/fixtures/parser/level_1/basic_grouping.selector
+- spec/fixtures/parser/level_1/basic_id.output
+- spec/fixtures/parser/level_1/basic_id.selector
+- spec/fixtures/parser/level_1/basic_id_multiple.output
+- spec/fixtures/parser/level_1/basic_id_multiple.selector
+- spec/fixtures/parser/level_1/basic_id_quotes.output
+- spec/fixtures/parser/level_1/basic_id_quotes.selector
+- spec/fixtures/parser/level_1/basic_id_with_type.output
+- spec/fixtures/parser/level_1/basic_id_with_type.selector
+- spec/fixtures/parser/level_1/basic_last-child.output
+- spec/fixtures/parser/level_1/basic_last-child.selector
+- spec/fixtures/parser/level_1/basic_nth-child-2.output
+- spec/fixtures/parser/level_1/basic_nth-child-2.selector
+- spec/fixtures/parser/level_1/basic_nth-child.output
+- spec/fixtures/parser/level_1/basic_nth-child.selector
+- spec/fixtures/parser/level_1/basic_nth-last-child.output
+- spec/fixtures/parser/level_1/basic_nth-last-child.selector
+- spec/fixtures/parser/level_1/basic_root_pseudo.output
+- spec/fixtures/parser/level_1/basic_root_pseudo.selector
+- spec/fixtures/parser/level_1/basic_type.output
+- spec/fixtures/parser/level_1/basic_type.selector
+- spec/fixtures/parser/level_1/basic_type2.output
+- spec/fixtures/parser/level_1/basic_type2.selector
+- spec/fixtures/parser/level_1/basic_type3.output
+- spec/fixtures/parser/level_1/basic_type3.selector
+- spec/fixtures/parser/level_1/basic_universal.output
+- spec/fixtures/parser/level_1/basic_universal.selector
+- spec/fixtures/parser/level_3/basic_has-sans-paren.output
+- spec/fixtures/parser/level_3/basic_has-sans-paren.selector
+- spec/fixtures/parser/level_3/basic_has-whitespace.output
+- spec/fixtures/parser/level_3/basic_has-whitespace.selector
+- spec/fixtures/parser/level_3/basic_has.output
+- spec/fixtures/parser/level_3/basic_has.selector
+- spec/parser_spec.rb
 - spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb