cql 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6805bf349ee0cbb1c9f38d2cad8c4b753454e08
+  data.tar.gz: e7a3dce28a0236ef2423f3d7827353ae2e6c0b77
+SHA512:
+  metadata.gz: ecbf137679cd1cb1f402d543c5177e776950d1a68d36741cdf984743430961c990028fcf6ec416dbdd6583199d431413ba98ad20918f3ec6a90fc17e1e8e43fc
+  data.tar.gz: 72d5f4d09e184a38fd745b9e22346167b9441e6393942c2906b9e5a8bd56ca171d762961466f300b9e767a511f3b67b43fb76a7ca4cee7e89162faee46d923c2

data/lib/cql/filters.rb

@@ -7,8 +7,12 @@ module CQL
       @tags = tags
     end
 
-    def has_tags?(object, tags)
-      tags.all? { |tag| object.tags.include?(tag) }
+    def has_tags?(object, target_tags)
+      target_tags.all? { |target_tag|
+        tags = object.tags
+        tags = tags.collect { |tag| tag.name } unless Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
+        tags.include?(target_tag)
+      }
     end
 
     def execute objects

data/lib/cql/map_reduce.rb

@@ -63,8 +63,10 @@ module CQL
       def collect_all_in(targeted_classes, current_object, accumulated_objects)
         accumulated_objects << current_object if targeted_classes.any? { |targeted_class| current_object.is_a?(targeted_class) }
 
-        if current_object.respond_to?(:contains)
-          current_object.contains.each do |child_object|
+        method_for_children = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :contains : :children
+
+        if current_object.respond_to?(method_for_children)
+          current_object.send(method_for_children).each do |child_object|
             collect_all_in(targeted_classes, child_object, accumulated_objects)
           end
         end

data/lib/cql/sso_filters.rb

@@ -14,8 +14,10 @@ module CQL
   class LineFilter < ContentMatchFilter
 
     def execute(input)
+      method_for_text = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :base : :text
+
       input.find_all do |tests|
-        raw_step_lines = tests.steps.map { |step| step.base }
+        raw_step_lines = tests.steps.map { |step| step.send(method_for_text) }
 
         content_match?(raw_step_lines)
       end

data/lib/cql/version.rb

@@ -1,3 +1,3 @@
 module CQL
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/dsl_spec.rb

@@ -37,7 +37,7 @@ describe 'dsl' do
       gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
 
       results = gs.query do
-        with { |thing| thing.tags.include?('@one') }
+        with { |scenario| scenario.name =~ /slurping/ }
         as thing1
         transform :self => lambda { |thing1| 1 }
         select :self
@@ -57,6 +57,37 @@ describe 'dsl' do
 
   describe "select" do
 
+    it 'correctly selects a single attribute from a model' do
+      model = CukeModeler::CqlTestModel.new
+      model.attribute_1 = 'foo'
+
+      repo = CQL::Repository.new(model)
+
+      result = repo.query do
+        select attribute_1
+        from cql_test_models
+      end
+
+
+      expect(result).to eq([{'attribute_1' => 'foo'}])
+    end
+
+    it 'correctly selects multiple attributes from a model' do
+      model = CukeModeler::CqlTestModel.new
+      model.attribute_1 = 'foo'
+      model.attribute_2 = 'bar'
+
+      repo = CQL::Repository.new(model)
+
+      result = repo.query do
+        select attribute_1, attribute_2
+        from cql_test_models
+      end
+
+
+      expect(result).to eq([{'attribute_1' => 'foo',
+                             'attribute_2' => 'bar'}])
+    end
 
     it 'complains if an unknown special attribute is queried' do
       gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
@@ -98,6 +129,17 @@ describe 'dsl' do
 
   describe "from" do
 
+    it "can handle an empty 'from' clause" do
+      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+      result = gs.query do
+        select name
+        from
+      end
+
+      expect(result).to eq([])
+    end
+
     describe "multiple targets" do
 
       it 'raises an exception for inapplicable attributes' do
@@ -110,7 +152,6 @@ describe 'dsl' do
             from scenarios
           end
         }.to raise_error
-
       end
 
     end

data/spec/select_feature_dsl_spec.rb

@@ -15,16 +15,16 @@ describe "select" do
                                      {"name" => "Test2 Feature"}, {"name" => "Test3 Feature"}])
     end
 
-    it 'should return descriptions from features' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select description_text
-        from features
-      end
-
-      expect(result).to eq([{"description_text" => "The cat in the hat"}])
-    end
+    # it 'should return descriptions from features' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select description_text
+    #     from features
+    #   end
+    #
+    #   expect(result).to eq([{"description_text" => "The cat in the hat"}])
+    # end
 
     it 'should return paths from from feature files' do
       repo_path = "#{@feature_fixtures_directory}/scenario/simple"
@@ -41,34 +41,34 @@ describe "select" do
                                      {'path' => "#{repo_path}/test_full.feature"}])
     end
 
-    it 'should return tags from features' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
-
-      result = gs.query do
-        select tags
-        from features
-      end
-
-      expect(result).to match_array([{"tags" => []},
-                                     {"tags" => ["@one"]},
-                                     {"tags" => ["@two"]},
-                                     {"tags" => ["@one", "@two"]}])
-    end
-
-
-    it 'should return multiple things from features' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
-
-      result = gs.query do
-        select name, tags
-        from features
-      end
-
-      expect(result).to match_array([{"name" => "Simple", "tags" => []},
-                                     {"name" => "Test Feature", "tags" => ["@one"]},
-                                     {"name" => "Test2 Feature", "tags" => ["@two"]},
-                                     {"name" => "Test3 Feature", "tags" => ["@one", "@two"]}])
-    end
+    # it 'should return tags from features' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
+    #
+    #   result = gs.query do
+    #     select tags
+    #     from features
+    #   end
+    #
+    #   expect(result).to match_array([{"tags" => []},
+    #                                  {"tags" => ["@one"]},
+    #                                  {"tags" => ["@two"]},
+    #                                  {"tags" => ["@one", "@two"]}])
+    # end
+    #
+    #
+    # it 'should return multiple things from features' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
+    #
+    #   result = gs.query do
+    #     select name, tags
+    #     from features
+    #   end
+    #
+    #   expect(result).to match_array([{"name" => "Simple", "tags" => []},
+    #                                  {"name" => "Test Feature", "tags" => ["@one"]},
+    #                                  {"name" => "Test2 Feature", "tags" => ["@two"]},
+    #                                  {"name" => "Test3 Feature", "tags" => ["@one", "@two"]}])
+    # end
 
     it 'should return things from multiple feature files' do
       gr = CQL::Repository.new("#{@feature_fixtures_directory}/combined/b")
@@ -96,18 +96,18 @@ describe "select" do
                                      {"name" => "f3_3_tags"}])
     end
 
-    it 'should return ids from features' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select raw_element
-        as 'id'
-        transform 'raw_element' => lambda { |element| element['id'] }
-        from features
-      end
-
-      expect(result).to eq([{"id" => "test3-feature"}])
-    end
+    # it 'should return ids from features' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as 'id'
+    #     transform 'raw_element' => lambda { |element| element['id'] }
+    #     from features
+    #   end
+    #
+    #   expect(result).to eq([{"id" => "test3-feature"}])
+    # end
 
   end
 end

data/spec/select_scen_outline_dsl_spec.rb

@@ -3,36 +3,37 @@ require 'spec_helper'
 describe "select" do
   describe 'from scenario_outlines' do
 
-    it 'should return tags from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tags2")
-
-      result = gs.query do
-        select tags
-        from outlines
-      end
-
-      expect(result).to match_array([{"tags" => ["@two"]},
-                                     {"tags" => ["@one"]},
-                                     {"tags" => []},
-                                     {"tags" => ["@two"]},
-                                     {"tags" => ["@one"]},
-                                     {"tags" => ["@two", "@four"]},
-                                     {"tags" => ["@one", "@five"]},
-                                     {"tags" => []},
-                                     {"tags" => ["@two"]},
-                                     {"tags" => ["@one"]}])
-    end
-
-    it 'should return descriptions from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
-
-      result = gs.query do
-        select description_text
-        from outlines
-      end
-
-      expect(result).to eq([{"description_text" => ""}, {"description_text" => "\nOutline description."}])
-    end
+    # it 'should return tags from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tags2")
+    #
+    #   result = gs.query do
+    #     select tags
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to match_array([{"tags" => ["@two"]},
+    #                                  {"tags" => ["@one"]},
+    #                                  {"tags" => []},
+    #                                  {"tags" => ["@two"]},
+    #                                  {"tags" => ["@one"]},
+    #                                  {"tags" => ["@two", "@four"]},
+    #                                  {"tags" => ["@one", "@five"]},
+    #                                  {"tags" => []},
+    #                                  {"tags" => ["@two"]},
+    #                                  {"tags" => ["@one"]}])
+    # end
+    #
+    # it 'should return descriptions from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #
+    #   result = gs.query do
+    #     select description_text
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"description_text" => ""}, {"description_text" => "\nOutline description."}])
+    # end
+    #
 
     it 'should return lines from scenario outlines' do
       gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
@@ -56,70 +57,70 @@ describe "select" do
       expect(result).to eq([{"name" => "An Outline"}])
     end
 
-    it 'should return types from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-
-      result = gs.query do
-        select raw_element
-        as 'type'
-        transform 'raw_element' => lambda { |element| element['type'] }
-        from outlines
-      end
-
-      expect(result).to eq([{"type" => "scenario_outline"}])
-    end
-
-    it 'should return step lines from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-
-      result = gs.query do
-        select raw_element
-        as step_lines
-        transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
-        from outlines
-      end
-
-      expect(result).to eq([{"step_lines" => ["Given something happend", "Then I expect something else"]}])
-    end
-
-    it 'should return ids from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-
-      result = gs.query do
-        select raw_element
-        as 'id'
-        transform 'raw_element' => lambda { |element| element['id'] }
-        from outlines
-      end
-
-      expect(result).to eq([{"id" => "test-feature;an-outline"}])
-    end
-
-    it 'should return steps from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-
-      result = gs.query do
-        select raw_element
-        as steps
-        transform 'raw_element' => lambda { |element| element['steps'] }
-        from outlines
-      end
-
-      expect(result).to eq([{"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 4}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 5}]}])
-    end
-
-
-    it 'should return multiple things from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
-
-      result = gs.query do
-        select name, tags
-        from outlines
-      end
-
-      expect(result).to eq([{"name" => "An Outline", "tags" => []},
-                            {"name" => "An Outline with everything", "tags" => ["@outline_tag"]}])
-    end
+    # it 'should return types from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as 'type'
+    #     transform 'raw_element' => lambda { |element| element['type'] }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"type" => "scenario_outline"}])
+    # end
+    #
+    # it 'should return step lines from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as step_lines
+    #     transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"step_lines" => ["Given something happend", "Then I expect something else"]}])
+    # end
+    #
+    # it 'should return ids from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as 'id'
+    #     transform 'raw_element' => lambda { |element| element['id'] }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"id" => "test-feature;an-outline"}])
+    # end
+    #
+    # it 'should return steps from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as steps
+    #     transform 'raw_element' => lambda { |element| element['steps'] }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 4}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 5}]}])
+    # end
+    #
+    #
+    # it 'should return multiple things from scenario outlines' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #
+    #   result = gs.query do
+    #     select name, tags
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"name" => "An Outline", "tags" => []},
+    #                         {"name" => "An Outline with everything", "tags" => ["@outline_tag"]}])
+    # end
 
     it 'should return things from multiple feature files' do
       gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tags2")
@@ -156,77 +157,77 @@ describe "select" do
       end
     end
 
-    it "should return the examples from scenario outlines" do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-      result = gr.query do
-        select raw_element
-        as examples
-        transform 'raw_element' => lambda { |element| element['examples'] }
-        from outlines
-      end
-
-      expect(result).to eq([{"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
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
-      result = gr.query do
-        select raw_element
-        as examples
-        transform 'raw_element' => lambda { |element| element['examples'] }
-        from outlines
-      end
-
-      expect(result).to eq([{"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"}]}]},
-                            {"examples" => [{"keyword" => "Examples", "name" => "One", "line" => 31, "description" => "This is example One.", "id" => "test-feature;an-outline-with-everything;one",
-                                             "rows" => [{"cells" => ["var_a", "var_b"], "line" => 34, "id" => "test-feature;an-outline-with-everything;one;1"},
-                                                        {"cells" => ["1", "a"], "line" => 35, "id" => "test-feature;an-outline-with-everything;one;2"},
-                                                        {"cells" => ["2", "b"], "line" => 36, "id" => "test-feature;an-outline-with-everything;one;3"}]},
-                                            {"keyword" => "Examples", "name" => "Two", "line" => 39, "description" => "", "tags" => [{"name" => "@example_tag", "line" => 38}], "id" => "test-feature;an-outline-with-everything;two",
-                                             "rows" => [{"cells" => ["var_a", "var_b"], "line" => 40, "id" => "test-feature;an-outline-with-everything;two;1"},
-                                                        {"cells" => ["1", "a"], "line" => 41, "id" => "test-feature;an-outline-with-everything;two;2"},
-                                                        {"cells" => ["2", "b"], "line" => 42, "id" => "test-feature;an-outline-with-everything;two;3"}]}]}])
-    end
-
-    it 'should return scenario outlines name and line numbers as a map' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
-      result = gs.query do
-        select name, source_line, raw_element, raw_element, raw_element, raw_element
-        as 'source_line' => 'line'
-        as 'raw_element' => 'id'
-        as 'raw_element' => 'type'
-        as 'raw_element' => 'steps'
-        as 'raw_element' => 'step_lines'
-
-        transform 'raw_element' => lambda { |element| element['id'] }
-        transform 'raw_element' => lambda { |element| element['type'] }
-        transform 'raw_element' => lambda { |element| element['steps'] }
-        transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
-
-
-        from outlines
-      end
-
-      expect(result).to eq([{'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
+    # it "should return the examples from scenario outlines" do
+    #   gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   result = gr.query do
+    #     select raw_element
+    #     as examples
+    #     transform 'raw_element' => lambda { |element| element['examples'] }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"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
+    #   gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #   result = gr.query do
+    #     select raw_element
+    #     as examples
+    #     transform 'raw_element' => lambda { |element| element['examples'] }
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{"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"}]}]},
+    #                         {"examples" => [{"keyword" => "Examples", "name" => "One", "line" => 31, "description" => "This is example One.", "id" => "test-feature;an-outline-with-everything;one",
+    #                                          "rows" => [{"cells" => ["var_a", "var_b"], "line" => 34, "id" => "test-feature;an-outline-with-everything;one;1"},
+    #                                                     {"cells" => ["1", "a"], "line" => 35, "id" => "test-feature;an-outline-with-everything;one;2"},
+    #                                                     {"cells" => ["2", "b"], "line" => 36, "id" => "test-feature;an-outline-with-everything;one;3"}]},
+    #                                         {"keyword" => "Examples", "name" => "Two", "line" => 39, "description" => "", "tags" => [{"name" => "@example_tag", "line" => 38}], "id" => "test-feature;an-outline-with-everything;two",
+    #                                          "rows" => [{"cells" => ["var_a", "var_b"], "line" => 40, "id" => "test-feature;an-outline-with-everything;two;1"},
+    #                                                     {"cells" => ["1", "a"], "line" => 41, "id" => "test-feature;an-outline-with-everything;two;2"},
+    #                                                     {"cells" => ["2", "b"], "line" => 42, "id" => "test-feature;an-outline-with-everything;two;3"}]}]}])
+    # end
+    #
+    # it 'should return scenario outlines name and line numbers as a map' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   result = gs.query do
+    #     select name, source_line, raw_element, raw_element, raw_element, raw_element
+    #     as 'source_line' => 'line'
+    #     as 'raw_element' => 'id'
+    #     as 'raw_element' => 'type'
+    #     as 'raw_element' => 'steps'
+    #     as 'raw_element' => 'step_lines'
+    #
+    #     transform 'raw_element' => lambda { |element| element['id'] }
+    #     transform 'raw_element' => lambda { |element| element['type'] }
+    #     transform 'raw_element' => lambda { |element| element['steps'] }
+    #     transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
+    #
+    #
+    #     from outlines
+    #   end
+    #
+    #   expect(result).to eq([{'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
 end

data/spec/select_scenario_dsl_spec.rb

@@ -3,37 +3,6 @@ require 'spec_helper'
 describe "select" do
   describe 'from scenarios' do
 
-    it 'should return tags from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tags2")
-
-      result = gs.query do
-        select tags
-        from scenarios
-      end
-
-      expect(result).to match_array([{"tags" => ["@two"]},
-                                     {"tags" => ["@one"]},
-                                     {"tags" => []},
-                                     {"tags" => ["@two"]},
-                                     {"tags" => ["@one"]},
-                                     {"tags" => ["@two", "@four"]},
-                                     {"tags" => ["@one", "@five"]},
-                                     {"tags" => []},
-                                     {"tags" => ["@two"]},
-                                     {"tags" => ["@one"]}])
-    end
-
-    it 'should return descriptions from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/table")
-
-      result = gs.query do
-        select description_text
-        from scenarios
-      end
-
-      expect(result).to eq([{"description_text" => "Scenario description."}])
-    end
-
     it 'should return lines from scenarios' do
       gr = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
 
@@ -57,80 +26,80 @@ describe "select" do
                             {"name" => "Testing yet again"}, {"name" => "Testing yet again part 2"}])
     end
 
-    it 'should return types from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select raw_element
-        as 'type'
-        transform 'raw_element' => lambda { |element| element['type'] }
-        from scenarios
-      end
-
-      expect(result).to eq([{"type" => "scenario"}, {"type" => "scenario"},
-                            {"type" => "scenario"}, {"type" => "scenario"}])
-    end
-
-    it 'should return step lines from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select raw_element
-        as step_lines
-        transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
-        from scenarios
-      end
-
-      expect(result).to eq([{"step_lines" => ["Given something happend", "Then I expect something else"]},
-                            {"step_lines" => ["Given something happend", "Then I expect something else"]},
-                            {"step_lines" => ["Given something happend", "Then I expect something else"]},
-                            {"step_lines" => ["Given something happend", "Then I expect something else"]}])
-    end
-
-    it 'should return ids from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select raw_element
-        as 'id'
-        transform 'raw_element' => lambda { |element| element['id'] }
-        from scenarios
-      end
-
-      expect(result).to eq([{"id" => "test3-feature;testing-the-slurping"},
-                            {"id" => "test3-feature;testing-again"},
-                            {"id" => "test3-feature;testing-yet-again"},
-                            {"id" => "test3-feature;testing-yet-again-part-2"},])
-    end
-
-    it 'should return steps from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
-
-      result = gs.query do
-        select raw_element
-        as steps
-        transform 'raw_element' => lambda { |element| element['steps'] }
-        from scenarios
-      end
-
-      expect(result).to eq([{"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 7}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 8}]},
-                            {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 12}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 13}]},
-                            {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 17}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 18}]},
-                            {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 22}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 23}]}])
-    end
+    # it 'should return types from scenarios' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as 'type'
+    #     transform 'raw_element' => lambda { |element| element['type'] }
+    #     from scenarios
+    #   end
+    #
+    #   expect(result).to eq([{"type" => "scenario"}, {"type" => "scenario"},
+    #                         {"type" => "scenario"}, {"type" => "scenario"}])
+    # end
+    #
+    # it 'should return step lines from scenarios' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as step_lines
+    #     transform 'raw_element' => lambda { |element| element['steps'].collect { |step| step['keyword'] + step['name'] } }
+    #     from scenarios
+    #   end
+    #
+    #   expect(result).to eq([{"step_lines" => ["Given something happend", "Then I expect something else"]},
+    #                         {"step_lines" => ["Given something happend", "Then I expect something else"]},
+    #                         {"step_lines" => ["Given something happend", "Then I expect something else"]},
+    #                         {"step_lines" => ["Given something happend", "Then I expect something else"]}])
+    # end
+    #
+    # it 'should return ids from scenarios' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as 'id'
+    #     transform 'raw_element' => lambda { |element| element['id'] }
+    #     from scenarios
+    #   end
+    #
+    #   expect(result).to eq([{"id" => "test3-feature;testing-the-slurping"},
+    #                         {"id" => "test3-feature;testing-again"},
+    #                         {"id" => "test3-feature;testing-yet-again"},
+    #                         {"id" => "test3-feature;testing-yet-again-part-2"},])
+    # end
+    #
+    # it 'should return steps from scenarios' do
+    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #
+    #   result = gs.query do
+    #     select raw_element
+    #     as steps
+    #     transform 'raw_element' => lambda { |element| element['steps'] }
+    #     from scenarios
+    #   end
+    #
+    #   expect(result).to eq([{"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 7}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 8}]},
+    #                         {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 12}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 13}]},
+    #                         {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 17}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 18}]},
+    #                         {"steps" => [{"keyword" => "Given ", "name" => "something happend", "line" => 22}, {"keyword" => "Then ", "name" => "I expect something else", "line" => 23}]}])
+    # end
 
     it 'should return multiple things from scenarios' do
       gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
 
       result = gs.query do
-        select name, tags
+        select name, source_line
         from scenarios
       end
 
-      expect(result).to eq([{"name" => "Testing the slurping", "tags" => ["@one"]},
-                            {"name" => "Testing again", "tags" => ["@two"]},
-                            {"name" => "Testing yet again", "tags" => ["@one"]},
-                            {"name" => "Testing yet again part 2", "tags" => ["@one", "@two"]}])
+      expect(result).to eq([{"name" => "Testing the slurping", "source_line" => 6},
+                            {"name" => "Testing again", "source_line" => 11},
+                            {"name" => "Testing yet again", "source_line" => 16},
+                            {"name" => "Testing yet again part 2", "source_line" => 21}])
     end
 
     it 'should return things from multiple feature files' do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ end
 
 
 require "#{File.dirname(__FILE__)}/../lib/cql"
+require "#{File.dirname(__FILE__)}/../testing/cql_test_model"
 require "#{File.dirname(__FILE__)}/tag_filterable_specs"
 require "#{File.dirname(__FILE__)}/name_filterable_specs"
 require "#{File.dirname(__FILE__)}/line_count_filterable_specs"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Eric Kessler
@@ -10,118 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuke_modeler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: racatt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: relish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Cucumber Query Language
@@ -130,13 +129,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cql.rb
 - lib/cql/dsl.rb
 - lib/cql/feature_filters.rb
 - lib/cql/filters.rb
 - lib/cql/map_reduce.rb
 - lib/cql/sso_filters.rb
 - lib/cql/version.rb
-- lib/cql.rb
 - spec/dsl_spec.rb
 - spec/filter_example_spec.rb
 - spec/filter_feature_dsl_spec.rb
@@ -148,46 +147,41 @@ files:
 - spec/name_filterable_specs.rb
 - spec/repository_spec.rb
 - spec/select_feature_dsl_spec.rb
-- spec/select_scenario_dsl_spec.rb
 - spec/select_scen_outline_dsl_spec.rb
+- spec/select_scenario_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/tag_filterable_specs.rb
 homepage: https://github.com/enkessler/cql
 licenses:
 - MIT
-post_install_message: ! '
+metadata: {}
+post_install_message: |2+
 
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
 
-
   Thank you for installing cql (Cucumber Query Language)
 
-
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
 
-
-'
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem providing functionality to query a Cucumber test suite.
 test_files:
 - spec/dsl_spec.rb
@@ -205,4 +199,3 @@ test_files:
 - spec/select_scen_outline_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/tag_filterable_specs.rb
-has_rdoc: