cql 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODIxODczMTZmOTQwODJjMGFjODIwZjE5Zjk2OWJhYzY2YTQ0MzMzNA==
+  data.tar.gz: !binary |-
+    OWMyODEwMzRmOGZkMDlkZGFhNzcyOTQ2OTNlZTViZmQ4OTVhOTk0Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Yzg2YzE0YjNjZmY1NGMxNDMzY2QxNDFiZTMxOTU5NDE5NDNhMmZlMTJkY2Vi
+    YzRiNjQwMzk2OGYyNjYzNTg1NzM3YmM3M2M1OTBhNzM2ZWY1NDZjN2I2N2Mx
+    MjYzMmYyNTA2NzJiNzExOTk2MmFlMzI4NmQ3ZWFkNzliYTQwNzI=
+  data.tar.gz: !binary |-
+    NDg5MGNjNmYxZGRkODE0ODNmNmU1M2MyNjlkY2RhOGE0NDNjZDhiZjExYzhh
+    YTAzNzE3YTc4NDU4ZDg1MGNkM2M0MGMxYmFhMGIyN2I5YjcxYWViOGQ1YmM5
+    Nzk0ZTZlN2UyNmIzZGUzNTM4NWI5MDQxMDk0M2Y4MjI3ZjcwZjM=

data/lib/cql.rb

@@ -1,63 +1,71 @@
-require 'gherkin/parser/parser'
-require 'gherkin/formatter/json_formatter'
-require 'stringio'
-require File.dirname(__FILE__) + "/dsl"
-
-module CQL
-
-  class Query
-    include Dsl
-    attr_reader :data, :what
-
-    def format_to_ary_of_hsh data
-      result = Array.new(data.size).map { |e| {} }
-      @what.each do |w|
-        CQL::MapReduce.send(w, data).each_with_index { |e, i| result[i][w]=e }
-      end
-      result.size == 1 ? result.first : result
-    end
-
-    def initialize features, &block
-      @data = features
-      @data = self.instance_eval(&block)
-
-      #getting the children of features
-      @data= CQL::MapReduce.feature_children(@data, 'what'=>@from[0, @from.size-1]) if @from != "features"
-
-      @data= format_to_ary_of_hsh(@data)
-    end
-  end
-
-
-  class Repository
-    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
-      require 'find'
-      res = []
-      Find.find(base_dir) do |f|
-        res << f if f.match(/\.feature\Z/)
-      end
-      res
-    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
+require 'cuke_modeler'
+require File.dirname(__FILE__) + "/dsl"
+
+module CQL
+
+  class Query
+    include Dsl
+    attr_reader :data, :what
+
+    def format_to_ary_of_hsh data
+      result = Array.new(data.size).map { |e| {} }
+
+      @what.each do |w|
+        CQL::MapReduce.send(w, data).each_with_index do |e, i|
+          if e.class.to_s =~ /CukeModeler/
+            result[i][w]=e.raw_element
+          else
+            result[i][w]=e
+          end
+        end
+      end
+
+      result
+    end
+
+    def initialize features, &block
+      @data = features
+      @data = self.instance_eval(&block)
+
+      #getting the children of features
+      @data= CQL::MapReduce.feature_children(@data, 'what'=>@from[0, @from.size-1]) if @from != "features"
+
+      @data= format_to_ary_of_hsh(@data)
+    end
+  end
+
+
+  class Repository
+    attr_reader :parsed_feature_files
+
+    def initialize features_home_dir
+      @parsed_feature_files = collect_feature_models(CukeModeler::Directory.new(features_home_dir))
+    end
+
+    def query &block
+      new_repo = Marshal::load(Marshal.dump(parsed_feature_files))
+
+      Query.new(new_repo, &block).data
+    end
+
+
+    private
+
+
+    def collect_feature_models(directory_model)
+      Array.new.tap { |accumulated_features| collect_all_in(:features, directory_model, accumulated_features) }
+    end
+
+    # Recursively gathers all things of the given type found in the passed container.
+    def collect_all_in(type_of_thing, container, accumulated_things)
+      accumulated_things.concat container.send(type_of_thing) if container.respond_to?(type_of_thing)
+
+      if container.respond_to?(:contains)
+        container.contains.each do |child_container|
+          collect_all_in(type_of_thing, child_container, accumulated_things)
+        end
+      end
+    end
+
+  end
+end

data/lib/dsl.rb

@@ -1,111 +1,111 @@
-require File.dirname(__FILE__) + "/map_reduce"
-module CQL
-  module Dsl
-    #Select clause
-    def select *what
-      @what = what
-    end
-
-    (CQL::QUERY_VALUES + %w(all step_lines examples)).each do |method_name|
-      define_method(method_name) { |*args|
-        return method_name if args.size == 0
-        {method_name=>args}
-      }
-    end
-
-    alias :everything :all
-    alias :complete :all
-
-    def name *args
-      return 'name' if args.size == 0
-      CQL::NameFilter.new args[0]
-    end
-
-    def line *args
-      return 'line' if args.size == 0
-      CQL::LineFilter.new args.first
-    end
-
-    #from clause
-    def from where
-      @from = where
-      @data
-    end
-
-    %w(features scenario_outlines scenarios).each do |method_name|
-      define_method(method_name) { |*args|
-        return method_name if args.size == 0
-        {method_name=>args}
-      }
-    end
-
-    #with clause
-    def with filter
-      @data = filter.execute(@data)
-    end
-
-    class Comparison
-      attr_accessor :op, :amount
-
-      def initialize op, amount
-        @op = op
-        @amount = amount
-      end
-
-      def operator
-        {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}[@op]
-      end
-
-    end
-
-    def tc comparison
-      if @from == 'features'
-        FeatureTagCountFilter.new('tc', comparison)
-      else
-        SsoTagCountFilter.new 'tc', comparison
-      end
-    end
-
-    def lc comparison
-      CQL::SsoLineCountFilter.new('lc', comparison)
-    end
-
-    def ssoc comparison
-      Filter.new('ssoc', comparison)
-    end
-
-    def sc comparison
-      Filter.new('sc', comparison)
-    end
-
-    def soc comparison
-      Filter.new('soc', comparison)
-    end
-
-    def gt amount
-      Comparison.new 'gt', amount
-    end
-
-    def gte amount
-      Comparison.new 'gte', amount
-    end
-
-    def lt amount
-      Comparison.new 'lt', amount
-    end
-
-    def lte amount
-      Comparison.new 'lte', amount
-    end
-
-    def tags *tags
-      return "tags" if tags.size == 0
-      if @from == 'features'
-        FeatureTagFilter.new tags
-      else
-        CQL::SsoTagFilter.new tags
-      end
-    end
-
-  end
+require File.dirname(__FILE__) + "/map_reduce"
+module CQL
+  module Dsl
+    #Select clause
+    def select *what
+      @what = what
+    end
+
+    (CQL::QUERY_VALUES + %w(all step_lines examples)).each do |method_name|
+      define_method(method_name) { |*args|
+        return method_name if args.size == 0
+        {method_name=>args}
+      }
+    end
+
+    alias :everything :all
+    alias :complete :all
+
+    def name *args
+      return 'name' if args.size == 0
+      CQL::NameFilter.new args[0]
+    end
+
+    def line *args
+      return 'line' if args.size == 0
+      CQL::LineFilter.new args.first
+    end
+
+    #from clause
+    def from where
+      @from = where
+      @data
+    end
+
+    %w(features scenario_outlines scenarios).each do |method_name|
+      define_method(method_name) { |*args|
+        return method_name if args.size == 0
+        {method_name=>args}
+      }
+    end
+
+    #with clause
+    def with filter
+      @data = filter.execute(@data)
+    end
+
+    class Comparison
+      attr_accessor :op, :amount
+
+      def initialize op, amount
+        @op = op
+        @amount = amount
+      end
+
+      def operator
+        {"lt"=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>='}[@op]
+      end
+
+    end
+
+    def tc comparison
+      if @from == 'features'
+        FeatureTagCountFilter.new('tc', comparison)
+      else
+        SsoTagCountFilter.new 'tc', comparison
+      end
+    end
+
+    def lc comparison
+      CQL::SsoLineCountFilter.new('lc', comparison)
+    end
+
+    def ssoc comparison
+      Filter.new('ssoc', comparison)
+    end
+
+    def sc comparison
+      Filter.new('sc', comparison)
+    end
+
+    def soc comparison
+      Filter.new('soc', comparison)
+    end
+
+    def gt amount
+      Comparison.new 'gt', amount
+    end
+
+    def gte amount
+      Comparison.new 'gte', amount
+    end
+
+    def lt amount
+      Comparison.new 'lt', amount
+    end
+
+    def lte amount
+      Comparison.new 'lte', amount
+    end
+
+    def tags *tags
+      return "tags" if tags.size == 0
+      if @from == 'features'
+        FeatureTagFilter.new tags
+      else
+        CQL::SsoTagFilter.new tags
+      end
+    end
+
+  end
 end

data/lib/feature_filters.rb

@@ -1,73 +1,89 @@
-module CQL
-  class NameFilter
-    attr_reader :name
-
-    def initialize name
-      @name = name
-    end
-
-    def execute input
-      if name.class == String
-        input = input.find_all { |feature| feature['name'] == name }
-      elsif name.class == Regexp
-        input = input.find_all { |feature| feature['name'] =~ name }
-      end
-      input
-    end
-  end
-
-  class Filter
-    attr_reader :type, :comparison
-
-    def initialize type, comparison
-      @type = type
-      @comparison = comparison
-    end
-
-    def full_type
-      {"sc"=>["Scenario"], "soc"=>["Scenario Outline"], "ssoc"=>["Scenario", "Scenario Outline"]}[@type]
-    end
-
-    def execute input
-      input.find_all do |feature|
-        size = feature['elements'].find_all { |e| full_type.include? e['keyword'] }.size
-        size.send(comparison.operator, comparison.amount)
-      end
-    end
-
-  end
-
-  class FeatureTagCountFilter < Filter
-    def execute input
-      input.find_all do |feature|
-        feature['tags'] && feature['tags'].size.send(comparison.operator, comparison.amount)
-      end
-    end
-  end
-
-  class TagFilter
-    attr_reader :tags
-
-    def initialize tags
-      @tags = tags
-    end
-
-    def has_tags given, search
-      return false if given == nil
-      search.count do |tag_for_search|
-        given.map { |t| t["name"] }.include?(tag_for_search)
-      end ==search.size
-    end
-  end
-
-  class FeatureTagFilter < TagFilter
-    def initialize tags
-      super tags
-    end
-
-    def execute input
-      input.find_all { |feature| has_tags feature['tags'], tags }
-    end
-  end
-
+module CQL
+  class NameFilter
+    attr_reader :name
+
+    def initialize name
+      @name = name
+    end
+
+    def execute input
+      if name.class == String
+        input = input.find_all { |feature| feature.name == name }
+      elsif name.class == Regexp
+        input = input.find_all { |feature| feature.name =~ name }
+      end
+
+      input
+    end
+  end
+
+  class Filter
+    attr_reader :type, :comparison
+
+    def initialize type, comparison
+      @type = type
+      @comparison = comparison
+    end
+
+    def full_type
+      {"sc"=>["Scenario"], "soc"=>["Scenario Outline"], "ssoc"=>["Scenario", "Scenario Outline"]}[@type]
+    end
+
+    def execute input
+      input.find_all do |feature|
+        size = feature.tests.find_all { |test|
+
+          element_class = test.class.to_s[/::.*$/].gsub(':', '')
+
+          case element_class
+            when 'Outline'
+              element_class = 'Scenario Outline'
+            when 'Scenario'
+              element_class = 'Scenario'
+            else
+              raise "Unknown class: #{element_class}"
+          end
+
+          full_type.include?(element_class)
+        }.size
+
+        size.send(comparison.operator, comparison.amount)
+      end
+    end
+
+  end
+
+  class FeatureTagCountFilter < Filter
+    def execute input
+      input.find_all do |feature|
+        feature.tags && feature.tags.size.send(comparison.operator, comparison.amount)
+      end
+    end
+  end
+
+  class TagFilter
+    attr_reader :tags
+
+    def initialize tags
+      @tags = tags
+    end
+
+    def has_tags given, search
+      return false if given == nil
+      search.count do |tag_for_search|
+        given.map { |t| t["name"] }.include?(tag_for_search)
+      end ==search.size
+    end
+  end
+
+  class FeatureTagFilter < TagFilter
+    def initialize tags
+      super tags
+    end
+
+    def execute input
+      input.find_all { |feature| has_tags feature.raw_element['tags'], tags }
+    end
+  end
+
 end