cql 0.2.0 → 0.2.1

data/lib/cql.rb

@@ -1,7 +1,6 @@
 require 'gherkin/parser/parser'
 require 'gherkin/formatter/json_formatter'
 require 'stringio'
-require 'deep_clone'
 require File.dirname(__FILE__) + "/dsl"
 
 module CQL
@@ -15,7 +14,7 @@ module CQL
       @what.each do |w|
         CQL::MapReduce.send(w, data).each_with_index { |e, i| result[i][w]=e }
       end
-      result
+      result.size == 1 ? result.first : result
     end
 
     def initialize features, &block
@@ -38,7 +37,7 @@ module CQL
     end
 
     def query &block
-      Query.new(parsed_feature_files.__deep_clone__, &block).data
+      Query.new(parsed_feature_files.clone, &block).data
     end
 
     private

data/lib/map_reduce.rb

@@ -1,16 +1,14 @@
-require_relative "dsl"
-require_relative "feature_filters"
-require_relative "sso_filters"
-
 require 'set'
-
+require File.dirname(__FILE__) + "/dsl"
+require File.dirname(__FILE__) + "/feature_filters"
+require File.dirname(__FILE__) + "/sso_filters"
 module CQL
   QUERY_VALUES = %w(name uri line description type steps id tags examples)
 
   class MapReduce
     CQL::QUERY_VALUES.each do |property|
       define_singleton_method(property) do |input|
-        input = input.dup
+        input = [input] if input.class != Array
         input.map { |a| a[property] }
       end
     end
@@ -28,6 +26,7 @@ module CQL
 
     def self.feature_children input, args
       results = []
+      input = filter_features(input, 'feature'=>args['feature']) if args.has_key?('feature')
       input.each do |feature|
         feature['elements'].each do |element|
           results.push element if element['type'] == args['what']

data/spec/filter_feature_dsl_spec.rb

@@ -77,7 +77,7 @@ describe "cql" do
         with ssoc lt 9
       end
 
-      result.should == [{"name"=> "f3_2_scenarios_3_so"}  ]
+      result.should == {"name"=> "f3_2_scenarios_3_so"}
 
       result = gs.query do
         select name
@@ -117,7 +117,7 @@ describe "cql" do
         with ssoc lte 5
       end
 
-      result.should == [{"name"=> "f3_2_scenarios_3_so"}]
+      result.should == {"name"=> "f3_2_scenarios_3_so"}
 
 
       result = gs.query do
@@ -183,7 +183,7 @@ describe "cql" do
         with sc gte 7
       end
 
-      result.should ==[ {"name"=> "f2_7_scenarios_2_so"}  ]
+      result.should == {"name"=> "f2_7_scenarios_2_so"}
     end
 
     it 'should filter based on the number of scenarios for sc_lt' do
@@ -213,7 +213,7 @@ describe "cql" do
         with sc lt 4
       end
 
-      result.should == [{"name"=> "f3_2_scenarios_3_so"} ]
+      result.should == {"name"=> "f3_2_scenarios_3_so"}
     end
 
     it 'should filter based on the number of scenarios for sc_lte' do
@@ -257,7 +257,7 @@ describe "cql" do
     {
         0=>[],
         1=>[],
-        2=>[{"name"=> "f1_1_tag"}],
+        2=>{"name"=> "f1_1_tag"},
         3=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}],
         4=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
         5=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}]
@@ -278,7 +278,7 @@ describe "cql" do
 
     {
         0=>[],
-        1=>[{"name"=> "f1_1_tag"}],
+        1=>{"name"=> "f1_1_tag"},
         2=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}],
         3=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
         4=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}]
@@ -300,7 +300,7 @@ describe "cql" do
     {
         0=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
         1=>[{"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
-        2=>[{"name"=> "f3_3_tags"}],
+        2=>{"name"=> "f3_3_tags"},
         3=>[],
         4=>[]
 
@@ -322,7 +322,7 @@ describe "cql" do
         0=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
         1=>[{"name"=> "f1_1_tag"}, {"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
         2=>[{"name"=> "f2_2_tags"}, {"name"=> "f3_3_tags"}],
-        3=>[{"name"=> "f3_3_tags"}],
+        3=>{"name"=> "f3_3_tags"},
         4=>[],
         5=>[]
 
@@ -346,7 +346,7 @@ describe "cql" do
     {
         2=>[{"name"=> "f1_4_scenarios_5_so"}, {"name"=> "f2_7_scenarios_2_so"}, {"name"=> "f3_2_scenarios_3_so"}],
         3=>[{"name"=> "f1_4_scenarios_5_so"}, {"name"=> "f3_2_scenarios_3_so"}],
-        4=>[{"name"=> "f1_4_scenarios_5_so"}],
+        4=>{"name"=> "f1_4_scenarios_5_so"},
         7=>[]
 
     }.each do |number, expected|
@@ -412,7 +412,7 @@ describe "cql" do
         with name 'Test2 Feature'
       end
 
-      result.should == [{"name"=> "Test2 Feature"}]
+      result.should == {"name"=> "Test2 Feature"}
     end
 
     it 'should filter by name regexp' do
@@ -424,7 +424,7 @@ describe "cql" do
         with name /Test2 Feature/
       end
 
-      result.should == [{"name"=> "Test2 Feature"}]
+      result.should == {"name"=> "Test2 Feature"}
 
       result = gs.query do
         select name
@@ -467,7 +467,7 @@ describe "cql" do
         with tags '@one'
       end
 
-      result.should == [{"name"=>"Test3 Feature"} ]
+      result.should == {"name"=>"Test3 Feature"}
     end
 
     it 'should filter by a multiple tags' do
@@ -479,7 +479,7 @@ describe "cql" do
         with tags '@one', '@two'
       end
 
-      result.should == [{"name"=>"Test3 Feature"} ]
+      result.should == {"name"=>"Test3 Feature"}
     end
   end
 

data/spec/filter_sso_spec.rb

@@ -6,7 +6,7 @@ describe "cql" do
     {
         0=>[],
         1=>[],
-        2=>[{"name"=> "1 tag"}],
+        2=>{"name"=> "1 tag"},
         3=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}],
         4=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}],
         5=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}]
@@ -26,7 +26,7 @@ describe "cql" do
 
     {
         0=>[],
-        1=>[{"name"=> "1 tag"}],
+        1=>{"name"=> "1 tag"},
         2=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}],
         3=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}],
         4=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}],
@@ -50,7 +50,7 @@ describe "cql" do
         0=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}],
         1=>[{"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}],
         2=>[{"name"=> "3 tags"}, {"name"=> "4 tags"}],
-        3=>[{"name"=> "4 tags"}],
+        3=>{"name"=> "4 tags"},
         4=>[]
     }.each do |number, expected|
       it "should filter scenarios by the number of tags with the 'tc_gt' operator for count of #{number}" do
@@ -71,7 +71,7 @@ describe "cql" do
         1=>[{"name"=> "1 tag"}, {"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}],
         2=>[{"name"=> "2 tags"}, {"name"=> "3 tags"}, {"name"=> "4 tags"}],
         3=>[{"name"=> "3 tags"}, {"name"=> "4 tags"}],
-        4=>[{"name"=> "4 tags"}],
+        4=>{"name"=> "4 tags"},
         5 =>[]
     }.each do |number, expected|
       it "should filter scenarios by the number of tags with the 'tc_gte' operator for count of #{number}" do
@@ -94,7 +94,7 @@ describe "cql" do
     {
         0=>[],
         1=>[],
-        2=>[{"name"=> "1 line"}],
+        2=>{"name"=> "1 line"},
         3=>[{"name"=> "1 line"}, {"name"=> "2 lines"}],
         4=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}],
         5=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}]
@@ -115,7 +115,7 @@ describe "cql" do
 
     {
         0=>[],
-        1=>[{"name"=> "1 line"}],
+        1=>{"name"=> "1 line"},
         2=>[{"name"=> "1 line"}, {"name"=> "2 lines"}],
         3=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}],
         4=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}],
@@ -139,7 +139,7 @@ describe "cql" do
         0=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}],
         1=>[{"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}],
         2=>[{"name"=> "3 lines"}, {"name"=> "4 lines"}],
-        3=>[{"name"=> "4 lines"}],
+        3=>{"name"=> "4 lines"},
         4=>[]
 
 
@@ -162,7 +162,7 @@ describe "cql" do
         1=>[{"name"=> "1 line"}, {"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}],
         2=>[{"name"=> "2 lines"}, {"name"=> "3 lines"}, {"name"=> "4 lines"}],
         3=>[{"name"=> "3 lines"}, {"name"=> "4 lines"}],
-        4=>[{"name"=> "4 lines"}],
+        4=>{"name"=> "4 lines"},
         5 =>[]
 
 

data/spec/select_feature_dsl_spec.rb

@@ -19,7 +19,7 @@ describe "select" do
         select description
         from features
       end
-      result.should == [{"description"=>"The cat in the hat"}]
+      result.should == {"description"=>"The cat in the hat"}
     end
 
     it 'should find the feature file uri' do

data/spec/select_scen_outline_dsl_spec.rb

@@ -9,7 +9,7 @@ describe "select" do
         select line
         from scenario_outlines
       end
-      result.should ==[{"line"=>3}   ]
+      result.should == {"line"=>3}
     end
 
     it 'should get scenario outlines name' do
@@ -18,7 +18,7 @@ describe "select" do
         select name
         from scenario_outlines
       end
-      result.should == [{"name"=> "An Outline"}]
+      result.should == {"name"=> "An Outline"}
     end
 
     it "should return the examples used" do
@@ -27,14 +27,14 @@ describe "select" do
         select examples
         from scenario_outlines
       end
-      result.should == [{"examples"=>[{"keyword"=>"Examples", "name"=>"", "line"=>6,
+      result.should == {"examples"=>[{"keyword"=>"Examples", "name"=>"", "line"=>6,
                                       "description"=>"", "id"=>"test-feature;an-outline;",
                                       "rows"=>[{"cells"=>["var_a", "var_b"], "line"=>7, "id"=>"test-feature;an-outline;;1"},
                                               {"cells"=>["1", "a"], "line"=>8, "id"=>"test-feature;an-outline;;2"},
                                               {"cells"=>["2", "b"], "line"=>9, "id"=>"test-feature;an-outline;;3"},
                                               {"cells"=>["3", "c"], "line"=>10, "id"=>"test-feature;an-outline;;4"},
                                               {"cells"=>["4", "d"], "line"=>11, "id"=>"test-feature;an-outline;;5"}]
-                                     }]}]
+                                     }]}
     end
 
     it "should return multiple examples used for a single scenario outline" do
@@ -43,21 +43,21 @@ describe "select" do
         select examples
         from scenario_outlines
       end
-      result.should == [{"examples"=>[{"keyword"=>"Examples", "name"=>"One", "line"=>6, "description"=>"", "id"=>"test-feature;an-outline;one",
+      result.should == {"examples"=>[{"keyword"=>"Examples", "name"=>"One", "line"=>6, "description"=>"", "id"=>"test-feature;an-outline;one",
                                       "rows"=>[{"cells"=>["var_a", "var_b"], "line"=>7, "id"=>"test-feature;an-outline;one;1"},
                                                {"cells"=>["1", "a"], "line"=>8, "id"=>"test-feature;an-outline;one;2"},
                                                {"cells"=>["2", "b"], "line"=>9, "id"=>"test-feature;an-outline;one;3"}]},
                                      {"keyword"=>"Examples", "name"=>"Two", "line"=>11, "description"=>"", "id"=>"test-feature;an-outline;two",
                                       "rows"=>[{"cells"=>["var_a", "var_b"], "line"=>12, "id"=>"test-feature;an-outline;two;1"},
                                                {"cells"=>["1", "a"], "line"=>13, "id"=>"test-feature;an-outline;two;2"},
-                                               {"cells"=>["2", "b"], "line"=>14, "id"=>"test-feature;an-outline;two;3"}]}]}]
+                                               {"cells"=>["2", "b"], "line"=>14, "id"=>"test-feature;an-outline;two;3"}]}]}
     end
 
   end
 
   describe "single value, multiple results" do
     it 'should get scenario outlines as is when no select criteria given' do
-      expected = [{"all"=>{"keyword"=>"Scenario Outline",
+      expected = {"all"=>{"keyword"=>"Scenario Outline",
                           "name"=>"An Outline",
                           "line"=>3, "description"=>"",
                           "id"=>"test-feature;an-outline", "type"=>"scenario_outline",
@@ -68,7 +68,7 @@ describe "select" do
                                                  {"cells"=>["1", "a"], "line"=>8, "id"=>"test-feature;an-outline;;2"},
                                                  {"cells"=>["2", "b"], "line"=>9, "id"=>"test-feature;an-outline;;3"},
                                                  {"cells"=>["3", "c"], "line"=>10, "id"=>"test-feature;an-outline;;4"},
-                                                 {"cells"=>["4", "d"], "line"=>11, "id"=>"test-feature;an-outline;;5"}]}]}}]
+                                                 {"cells"=>["4", "d"], "line"=>11, "id"=>"test-feature;an-outline;;5"}]}]}}
 
       gs = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scen_outlines/basic"
       result = gs.query do
@@ -102,7 +102,7 @@ describe "select" do
         select step_lines
         from scenario_outlines
       end
-      result.should == [{"step_lines"=> ["Given something happend", "Then I expect something else"]}]
+      result.should == {"step_lines"=> ["Given something happend", "Then I expect something else"]}
     end
   end
 
@@ -113,13 +113,13 @@ describe "select" do
         select name, line, type, step_lines, id, steps
         from scenario_outlines
       end
-      result.should == [{'name'=>"An Outline",
+      result.should == {'name'=>"An Outline",
                         'line'=>3,
                         'id'=>'test-feature;an-outline',
                         'type'=>'scenario_outline',
                         "steps"=>[{"keyword"=>"Given ", "name"=>"something happend", "line"=>4}, {"keyword"=>"Then ", "name"=>"I expect something else", "line"=>5}],
                         "step_lines"=>["Given something happend", "Then I expect something else"]
-      }]
+      }
     end
 
   end

data/spec/select_scenario_dsl_spec.rb

@@ -49,12 +49,12 @@ describe "select" do
 
     it "should select all" do
       gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/table"
-      expected = [{"all"=>{"keyword"=>"Scenario", "name"=>"Has a table", "line"=>3,
+      expected = {"all"=>{"keyword"=>"Scenario", "name"=>"Has a table", "line"=>3,
                           "description"=>"", "id"=>"simple;has-a-table", "type"=>"scenario",
                           "steps"=>[{"keyword"=>"Given ", "name"=>"Something", "line"=>4,
                                      "rows"=>[{"cells"=>["a", "a"], "line"=>5}, {"cells"=>["s", "a"], "line"=>6},
                                               {"cells"=>["s", "s"], "line"=>7}]},
-                                    {"keyword"=>"Then ", "name"=>"something else", "line"=>8}]}} ]
+                                    {"keyword"=>"Then ", "name"=>"something else", "line"=>8}]}}
 
       result = gr.query do
         select all

data/spec/unit_spec.rb

@@ -0,0 +1,22 @@
+require 'rspec'
+require File.dirname(__FILE__) + "/../lib/cql"
+
+describe "cql" do
+
+  describe "tag searcher" do
+    it "should be able to search for tags" do
+      #tags_given = [{"name"=>"@one", "line"=>3}, {"name"=>"@four", "line"=>3}, {"name"=>"@six", "line"=>3}, {"name"=>"@seven", "line"=>3}]
+      #CQL::MapReduce.has_tags(tags_given, ["@one", "@four"]).should eql true
+      #
+      #tags_given = [{"name"=>"@two", "line"=>3}, {"name"=>"@four", "line"=>3}, {"name"=>"@six", "line"=>3}, {"name"=>"@seven", "line"=>3}]
+      #CQL::MapReduce.has_tags(tags_given, ["@one", "@four"]).should eql false
+      #
+      #tags_given = [{"name"=>"@two", "line"=>3}, {"name"=>"@four", "line"=>3}, {"name"=>"@six", "line"=>3}, {"name"=>"@seven", "line"=>3}]
+      #CQL::MapReduce.has_tags(tags_given, ["@four"]).should eql true
+      #
+      #tags_given = [{"name"=>"@two", "line"=>3}, {"name"=>"@four", "line"=>3}, {"name"=>"@six", "line"=>3}, {"name"=>"@seven", "line"=>3}]
+      #CQL::MapReduce.has_tags(tags_given, ["@four", "@two", "@six", "@seven"]).should eql true
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
 description: Cucumber Query Language
 email: jdfolino@gmail.com
 executables: []
@@ -89,13 +89,24 @@ files:
 - spec/filter_feature_dsl_spec.rb
 - spec/filter_sso_spec.rb
 - spec/map_reduce_spec.rb
-- spec/multiple_queries_spec.rb
 - spec/select_feature_dsl_spec.rb
-- spec/select_scen_outline_dsl_spec.rb
 - spec/select_scenario_dsl_spec.rb
+- spec/select_scen_outline_dsl_spec.rb
+- spec/unit_spec.rb
 homepage: 
 licenses: []
-post_install_message: 
+post_install_message: ! '
+
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
+
+
+  Thank you for installing cql (Cucumber Query Language)
+
+
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
+
+
+'
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -114,15 +125,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: cucumber-0.2.0
+summary: cucumber-0.2.1
 test_files:
 - spec/filter_feature_dsl_spec.rb
 - spec/filter_sso_spec.rb
 - spec/map_reduce_spec.rb
-- spec/multiple_queries_spec.rb
 - spec/select_feature_dsl_spec.rb
-- spec/select_scen_outline_dsl_spec.rb
 - spec/select_scenario_dsl_spec.rb
+- spec/select_scen_outline_dsl_spec.rb
+- spec/unit_spec.rb

data/spec/multiple_queries_spec.rb

@@ -1,28 +0,0 @@
-require 'rspec'
-require File.dirname(__FILE__) + "/../lib/cql"
-
-describe "cql" do
-
-  describe 'cql repo is not mutable' do
-    it 'should not change between queries' do
-
-      repo = CQL::Repository.new File.dirname(__FILE__) + "/../fixtures/features/got"
-
-      result = repo.query do
-        select name
-        from scenarios
-        with tags '@Lannister'
-      end
-
-
-      result = repo.query do
-        select name
-        from scenarios
-        with line /child/
-      end
-
-      result.should == [{"name"=> "Strange relations"},
-                        {"name"=> "Bastard Child"}]
-    end
-  end
-end