cql 0.1.2 → 0.1.3

data/spec/select_scenario_dsl_spec.rb

@@ -1,73 +1,73 @@
-require 'rspec'
-require File.dirname(__FILE__) + "/../lib/repo"
-
-describe "select" do
-
-  describe "single value, multiple results" do
-    it 'should get scenario line number' do
-      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
-      result = gr.query do
-        select line
-        from scenarios
-      end
-      result.should == [{"line"=> 6}, {"line"=> 11}, {"line"=> 16}, {"line"=> 21}]
-    end
-
-    it 'should get scenario name' do
-      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
-      result = gr.query do
-        select name
-        from scenarios
-      end
-      result.should == [{"name"=> "Testing the slurping"}, {"name"=> "Testing again"},
-                        {"name"=> "Testing yet again"}, {"name"=> "Testing yet again part 2"}]
-    end
-
-    it 'should get scenario name from multiple feature files' do
-      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple"
-      result = gr.query do
-        select name
-        from scenarios
-      end
-      result.should == [{"name"=> "Has a table"}, {"name"=> "Testing the slurping 1"},
-                        {"name"=> "Testing the slurping not to be found"}, {"name"=> "Testing the slurping 2"},
-                        {"name"=> "Testing the slurping 3"}, {"name"=> "Testing again"},
-                        {"name"=> "Testing yet again"}, {"name"=> "Testing yet again part 2"}]
-    end
-  end
-
-  describe "multiple values" do
-    it 'should get multiple scenarios as a list of maps' do
-      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
-      result = gr.query do
-        select line, name
-        from scenarios
-      end
-      result.should == [{'line'=>6, 'name'=>"Testing the slurping"}, {'line'=>11, 'name'=>"Testing again"},
-                        {'line'=>16, 'name'=>"Testing yet again"}, {'line'=>21, 'name'=>"Testing yet again part 2"}]
-    end
-
-    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,
-                          "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}]}}
-
-      result = gr.query do
-        select all
-        from scenarios
-      end
-      result.should == expected
-
-      result = gr.query do
-        select complete
-        from scenarios
-      end
-      result.should == expected
-    end
-
-  end
+require 'rspec'
+require File.dirname(__FILE__) + "/../lib/repo"
+
+describe "select" do
+
+  describe "single value, multiple results" do
+    it 'should get scenario line number' do
+      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
+      result = gr.query do
+        select line
+        from scenarios
+      end
+      result.should == [{"line"=> 6}, {"line"=> 11}, {"line"=> 16}, {"line"=> 21}]
+    end
+
+    it 'should get scenario name' do
+      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
+      result = gr.query do
+        select name
+        from scenarios
+      end
+      result.should == [{"name"=> "Testing the slurping"}, {"name"=> "Testing again"},
+                        {"name"=> "Testing yet again"}, {"name"=> "Testing yet again part 2"}]
+    end
+
+    it 'should get scenario name from multiple feature files' do
+      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple"
+      result = gr.query do
+        select name
+        from scenarios
+      end
+      result.should == [{"name"=> "Has a table"}, {"name"=> "Testing the slurping 1"},
+                        {"name"=> "Testing the slurping not to be found"}, {"name"=> "Testing the slurping 2"},
+                        {"name"=> "Testing the slurping 3"}, {"name"=> "Testing again"},
+                        {"name"=> "Testing yet again"}, {"name"=> "Testing yet again part 2"}]
+    end
+  end
+
+  describe "multiple values" do
+    it 'should get multiple scenarios as a list of maps' do
+      gr = CQL::Repository.new File.expand_path(File.dirname(__FILE__)) + "/../fixtures/features/scenario/simple2"
+      result = gr.query do
+        select line, name
+        from scenarios
+      end
+      result.should == [{'line'=>6, 'name'=>"Testing the slurping"}, {'line'=>11, 'name'=>"Testing again"},
+                        {'line'=>16, 'name'=>"Testing yet again"}, {'line'=>21, 'name'=>"Testing yet again part 2"}]
+    end
+
+    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,
+                          "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}]}}
+
+      result = gr.query do
+        select all
+        from scenarios
+      end
+      result.should == expected
+
+      result = gr.query do
+        select complete
+        from scenarios
+      end
+      result.should == expected
+    end
+
+  end
 end

data/spec/unit_spec.rb

@@ -1,22 +1,22 @@
-require 'rspec'
-require File.dirname(__FILE__) + "/../lib/repo"
-
-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
-
+require 'rspec'
+require File.dirname(__FILE__) + "/../lib/repo"
+
+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.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -81,15 +81,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/dsl.rb
-- lib/map_reduce.rb
-- lib/repo.rb
 - spec/filter_feature_dsl_spec.rb
 - spec/filter_sso_spec.rb
 - spec/map_reduce_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: []
@@ -123,15 +120,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: cql-0.1.2
+summary: cucumber-0.1.3
 test_files:
 - spec/filter_feature_dsl_spec.rb
 - spec/filter_sso_spec.rb
 - spec/map_reduce_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/lib/dsl.rb

@@ -1,64 +0,0 @@
-require File.dirname(__FILE__) + "/map_reduce"
-module CQL
-  DSL_KEYWORDS = %w(features scenario_outlines scenarios all step_lines examples name)
-  module Dsl
-    (CQL::QUERY_VALUES + CQL::DSL_KEYWORDS).each do |method_name|
-      define_method(method_name) { |*args|
-        return method_name if args.size == 0
-        {method_name=>args}
-      }
-    end
-
-    %w(sc_gt sc_gte sc_lt sc_lte soc_gt soc_gte soc_lt soc_lte ssoc_gt ssoc_gte ssoc_lt ssoc_lte tc_lt tc_lte tc_gt tc_gte lc_lt lc_lte lc_gt lc_gte).each do |meth|
-      define_method(meth) { |num| {meth=>num} }
-    end
-
-    alias :everything :all
-    alias :complete :all
-
-    def select *what
-      @what = what
-    end
-
-    def from where
-      @from = where
-      @data
-    end
-
-    def tags *tags
-      return "tags" if tags.size == 0
-      {'tags'=>tags}
-    end
-
-    def with filter
-      if filter.has_key? 'name'
-        @data = CQL::MapReduce.filter_features(@data, 'feature'=>filter['name'])
-      elsif @from == 'features'
-        filter.each { |k, v| @data = CQL::MapReduce.filter_features(@data, k=>v) }
-      elsif @from == 'scenarios'
-        filter.each { |k, v|
-          @data = CQL::MapReduce.filter_sso2(@data, k=>v)
-        }
-      end
-      @data
-    end
-
-    class Query
-      include Dsl
-      attr_reader :data, :what
-
-      def initialize features, &block
-        @data = features
-        @data = self.instance_eval(&block)
-
-        @data= CQL::MapReduce.filter_sso(@data, 'what'=>@from[0, @from.size-1]) if @from != "features"
-        result = Array.new(@data.size)
-        result = result.map {|e|{}}
-        @what.each do |w|
-          CQL::MapReduce.send(w, @data).each_with_index { |e, i| result[i][w]=e }
-        end
-        @data = result.size == 1 ? result.first : result
-      end
-    end
-  end
-end

data/lib/map_reduce.rb

@@ -1,139 +0,0 @@
-require File.dirname(__FILE__) + "/dsl"
-require 'set'
-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] if input.class != Array
-        input.map { |a| a[property] }
-      end
-    end
-
-    %w(all everything complete).each do |method_name|
-      define_singleton_method(method_name) { |input| input }
-    end
-
-    def self.step_lines input
-      input = [input] if input.class != Array
-      steps(input).map do |scen|
-        scen.map { |line| line['keyword'] + line['name'] }
-      end
-    end
-
-    def self.filter_features input, args
-      if args.has_key?('feature') && args['feature'][0].class == String
-        input = input.find_all { |feature| feature['name'] == args['feature'][0] }
-      elsif args.has_key?('feature') && args['feature'][0].class == Regexp
-        input = input.find_all { |feature| feature['name'] =~ args['feature'][0] }
-      end
-
-      %w(sc_gt sc_gte sc_lt sc_lte soc_gt soc_gte soc_lt soc_lte ssoc_gt ssoc_gte ssoc_lt ssoc_lte).each do |fn|
-        if args.has_key?(fn)
-          what, operator = fn.split "_"
-          desc = {"sc"=>["Scenario"], "soc"=>["Scenario Outline"], "ssoc"=>["Scenario", "Scenario Outline"]}
-          operator_map = {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}
-          input = input.find_all do |feature|
-            size = feature['elements'].find_all { |e| desc[what].include? e['keyword'] }.size
-            size.send(operator_map[operator], args[fn])
-          end
-        end
-      end
-
-      %w(tc_lt tc_lte tc_gt tc_gte).each do |fn|
-        what, operator = fn.split "_"
-        operator_map = {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}
-        if args.has_key?(fn)
-          input = input.find_all do |feature|
-            feature['tags'] && feature['tags'].size.send(operator_map[operator], args[fn])
-          end
-        end
-      end
-
-      input = input.find_all { |feature| has_tags feature['tags'], args['tags'] } if args.has_key? 'tags'
-      input
-    end
-
-    def self.filter_sso 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']
-        end
-      end
-      results
-    end
-
-    def self.filter_sso2 input, args
-      %w(tc_lt tc_lte tc_gt tc_gte).each do |fn|
-        what, operator = fn.split "_"
-        operator_map = {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}
-        if args.has_key?(fn)
-          input.each_with_index do |feature, index|
-            filtered_elements= feature['elements'].find_all do |sso|
-              sso['tags'].size.send(operator_map[operator], args[fn])
-            end
-            input[index]['elements'] = filtered_elements
-
-          end
-        end
-      end
-
-      %w(lc_lt lc_lte lc_gt lc_gte).each do |fn|
-        what, operator = fn.split "_"
-        operator_map = {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}
-        if args.has_key?(fn)
-          input.each_with_index do |feature, index|
-            filtered_elements= feature['elements'].find_all do |sso|
-              sso['steps'].size.send(operator_map[operator], args[fn])
-            end
-            input[index]['elements'] = filtered_elements
-          end
-        end
-      end
-
-      if args.has_key? 'line'
-        input.each_with_index do |feature, index|
-          filtered_elements= feature['elements'].find_all do |sso|
-            raw_step_lines = sso['steps'].map { |sl| sl['name'] }
-            line_to_match = args['line'].first
-            result = nil
-            if line_to_match.class == String
-              result = raw_step_lines.include? line_to_match
-            elsif line_to_match.class == Regexp
-              result = raw_step_lines.find { |line| line =~ line_to_match }
-              if result.class == String
-                result = result.size > 0
-              else
-                result = false
-              end
-            end
-            result
-          end
-          input[index]['elements'] = filtered_elements
-        end
-      end
-
-      input
-    end
-
-    def self.tag_set input
-      tags = Set.new
-      input.each do |feature|
-        feature['elements'].each do |element|
-          break if element['tags'] == nil
-          element['tags'].each { |tag| tags.add tag['name'] }
-        end
-      end
-      tags.to_a
-    end
-
-    def self.has_tags given, search
-      return false if given == nil
-      search.count { |tag_for_search| given.map { |t| t["name"] }.include?(tag_for_search) }==search.size
-    end
-
-  end
-end

data/lib/repo.rb

@@ -1,34 +0,0 @@
-require 'gherkin/parser/parser'
-require 'gherkin/formatter/json_formatter'
-require 'stringio'
-require File.dirname(__FILE__) + "/dsl"
-
-module CQL
-  class Repository
-    include Dsl
-    attr_reader :parsed_feature_files
-
-    def initialize features_home_dir
-      @parsed_feature_files = load_features(list_features(features_home_dir))
-    end
-
-    def query &block
-      Query.new(parsed_feature_files.clone, &block).data
-    end
-
-    private
-    def list_features base_dir
-      Dir.glob(base_dir + "/**/*.feature")
-    end
-
-    def load_features sources
-      io = StringIO.new
-      formatter = Gherkin::Formatter::JSONFormatter.new(io)
-      parser = Gherkin::Parser::Parser.new(formatter)
-      sources.each { |s| parser.parse(IO.read(s), s, 0) }
-      formatter.done
-      JSON.parse(io.string)
-    end
-
-  end
-end