cql 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288eac18d6d8ed4eeb202c52abc6087b811c52da
-  data.tar.gz: caae2839ce9f847f7bdcb98ae6b4200b79dec243
+  metadata.gz: 7723f8638c180e1ad2215a3912db8979a12b8722
+  data.tar.gz: 93cf6e70f784983ae672ff87a73616495e115d59
 SHA512:
-  metadata.gz: 042ea7bee70217efbacd33eb7426269a43893a74fdf7f6230a75ab50e36acbd7b0cb1f7893c6079ee524160d57ec9e8ac0f5a6197688005aa57999d0ff311c04
-  data.tar.gz: e010fbf5f25a61123a40a0d7f0cfbdde84ea187f9282c4ba305b041076c44ed3084e51f344733364b9aeef8236583141e8ad6b990226c16c5a88269acd5a9b88
+  metadata.gz: 588e74d98dbd1d7c5a8cf8331d45abc32ff1005ac8503c78e985f88b14f88baade72ddf6c9cdb0e70b81127e287e681e4749dc655ff3c04c973074cbd405a987
+  data.tar.gz: 6e83c073cadd6e57bfd6f4b28ba111f262e6e1ac11563e793e8e6751dddbfdbacb2f33b62c033940c0eee01d6d1f41004db5b9b03a23d96ebf3d5f13431ad3b2

data/lib/cql.rb

@@ -1,5 +1,6 @@
 require 'cuke_modeler'
 require 'cql/map_reduce'
+require 'cql/queriable'
 
 module CQL
 
@@ -59,7 +60,7 @@ module CQL
     end
 
     def determine_value(element, attribute, index)
-      original_value = attribute.is_a?(Symbol) ? special_value(element, attribute) : element.send(attribute)
+      original_value = attribute.is_a?(Symbol) ? determine_special_value(element, attribute) : determine_normal_value(element, attribute)
 
       if @value_transforms
         value = mapped_attribute(@value_transforms, attribute, index)
@@ -69,10 +70,10 @@ module CQL
       value || original_value
     end
 
-    def special_value(element, attribute)
+    def determine_special_value(element, attribute)
       # todo - Not sure what other special values to have but this could be expanded upon later.
       case attribute
-        when :self
+        when :self, :model
           val = element
         else
           raise(ArgumentError, ":#{attribute} is not a valid attribute for selection.")
@@ -81,6 +82,14 @@ module CQL
       val
     end
 
+    def determine_normal_value(element, attribute)
+      if element.respond_to?(attribute)
+        element.send(attribute)
+      else
+        raise(ArgumentError, "'#{attribute}' is not a valid attribute for selection from a '#{element.class}'.")
+      end
+    end
+
     def mapped_attribute(mappings, attribute, location)
       case
         when mappings.is_a?(Array)
@@ -146,22 +155,20 @@ module CQL
 
   class Repository
 
+    include Queriable
+
+
     def initialize(repository_root)
       case
         when repository_root.is_a?(String)
-          @target_directory = CukeModeler::Directory.new(repository_root)
+          root = CukeModeler::Directory.new(repository_root)
         when repository_root.class.to_s =~ /CukeModeler/
-          @target_directory = repository_root
+          root = repository_root
         else
           raise(ArgumentError, "Don't know how to make a repository from a #{repository_root.class}")
       end
-    end
-
-    def query &block
-      # A quick 'deep clone'
-      new_repo = Marshal::load(Marshal.dump(@target_directory))
 
-      Query.new(new_repo, &block).data
+      @query_root = root
     end
 
   end

data/lib/cql/dsl.rb

@@ -53,8 +53,20 @@ module CQL
     def with(*conditions, &block)
       @filters ||= []
 
-      @filters << block if block
-      @filters.concat(conditions)
+      @filters << {:negate => false, :filter => block} if block
+      conditions.each do |condition|
+        @filters << {:negate => false, :filter => condition}
+      end
+    end
+
+    #without clause
+    def without(*conditions, &block)
+      @filters ||= []
+
+      @filters << {:negate => true, :filter => block} if block
+      conditions.each do |condition|
+        @filters << {:negate => true, :filter => condition}
+      end
     end
 
     class Comparison

data/lib/cql/filters.rb

@@ -15,8 +15,10 @@ module CQL
       }
     end
 
-    def execute objects
-      objects.find_all { |object| has_tags?(object, tags) }
+    def execute(objects, negate)
+      method = negate ? :reject : :select
+
+      objects.send(method) { |object| has_tags?(object, tags) }
     end
 
   end
@@ -48,8 +50,10 @@ module CQL
       @comparison = comparison
     end
 
-    def execute input
-      input.find_all do |object|
+    def execute(input, negate)
+      method = negate ? :reject : :select
+
+      input.send(method) do |object|
         type_count(object).send(comparison.operator, comparison.amount)
       end
     end
@@ -58,8 +62,10 @@ module CQL
 
   class NameFilter < ContentMatchFilter
 
-    def execute(input)
-      input.find_all do |object|
+    def execute(input, negate)
+      method = negate ? :reject : :select
+
+      input.send(method) do |object|
         content_match?([object.name])
       end
     end

data/lib/cql/map_reduce.rb

@@ -15,28 +15,42 @@ module CQL
 
       if filters
         filters.each do |filter|
+          negate = filter[:negate]
+          filter = filter[:filter]
+
+          # Non-targeted filter, will apply to all objects
           if filter.is_a?(Proc)
-            gathered_objects = filter_with_proc(gathered_objects, filter)
+            gathered_objects = filter_with_proc(gathered_objects, filter, negate)
+
+            # Targeted filter, will only apply to certain objects
           elsif filter.is_a?(Hash)
             filter.keys.each do |filtered_class|
               clazz = determine_class(filtered_class)
 
               gathered_objects = gathered_objects.select do |object|
+
+                # A class that is targeted by the filter, so proceed with determination
                 if object.is_a?(clazz)
+
+                  # Block filter
                   if filter[filtered_class].is_a?(Proc)
-                    filter[filtered_class].call(object)
-                  else
+                    filter[filtered_class].call(object) && !negate
+
                     # Must be a predefined filter otherwise
-                    !filter_with_predefined([object], filter[filtered_class]).empty?
+                  else
+                    !filter_with_predefined([object], filter[filtered_class], negate).empty?
                   end
+
+                  # Not a class that is targeted by the filter, so include it
                 else
                   true
                 end
               end
             end
-          else
+
             # Must be a predefined filter otherwise
-            gathered_objects = filter_with_predefined(gathered_objects, filter)
+          else
+            gathered_objects = filter_with_predefined(gathered_objects, filter, negate)
           end
         end
       end
@@ -51,17 +65,21 @@ module CQL
       private
 
 
-      def filter_with_proc(objects, filter)
-        objects.select(&filter)
+      def filter_with_proc(objects, filter, negate)
+        if negate
+          objects.reject(&filter)
+        else
+          objects.select(&filter)
+        end
       end
 
-      def filter_with_predefined(objects, filter)
-        filter.execute(objects)
+      def filter_with_predefined(objects, filter, negate)
+        filter.execute(objects, negate)
       end
 
       # Recursively gathers all objects of the given class(es) found in the passed object (including itself).
       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) }
+        accumulated_objects << current_object if targeted_classes.any? { |targeted_class| (targeted_class == :all) || current_object.is_a?(targeted_class) }
 
         method_for_children = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :contains : :children
 

data/lib/cql/model_dsl.rb

@@ -0,0 +1,18 @@
+# todo - add some sore of error/warning if loading with the 0.x cuke_modeler?
+
+module CukeModeler
+  class Model
+
+    include CQL::Queriable
+
+    alias_method :original_initialize, :initialize
+
+
+    def initialize(source_text = nil)
+      original_initialize(source_text)
+
+      @query_root = self
+    end
+
+  end
+end

data/lib/cql/queriable.rb

@@ -0,0 +1,14 @@
+module CQL
+  module Queriable
+
+    attr_accessor :query_root
+
+
+    def query(&block)
+      raise(ArgumentError, 'Query cannot be run. No query root has been set.') unless @query_root
+
+      Query.new(@query_root, &block).data
+    end
+
+  end
+end

data/lib/cql/sso_filters.rb

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

data/lib/cql/version.rb

@@ -1,3 +1,3 @@
 module CQL
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/testing/cql_test_model.rb

@@ -0,0 +1,42 @@
+module CukeModeler
+  class CqlTestModel
+
+    attr_accessor :attribute_1
+    attr_accessor :attribute_2
+    attr_accessor :attribute_3
+
+    def children
+      @children ||= []
+
+      @children
+    end
+
+
+    # For cuke_modeler 0.x compatibility
+    alias_method :contains, :children
+
+  end
+
+end
+
+# Just a similarly named class for testing shorthand name matching
+module CukeModeler
+  class CqlTestModels
+
+    attr_accessor :attribute_1
+    attr_accessor :attribute_2
+    attr_accessor :attribute_3
+
+    def children
+      @children ||= []
+
+      @children
+    end
+
+
+    # For cuke_modeler 0.x compatibility
+    alias_method :contains, :children
+
+  end
+
+end

data/testing/cucumber/features/clauses/as_clause.feature

@@ -0,0 +1,136 @@
+Feature: 'as' clause'
+
+  The *as* clause allows you to change the keys under which the model attributes specified by the *select* clause will be gathered. Key renaming can be done as a list of new names that are applied in order or as a mapping of specific keys to their new names.
+
+    Sample usage:
+      cql_repo.query do
+        select name
+        as title
+        from features
+      end
+
+  This will return a list of all of the feature names but under the key of 'title' instead of 'name'.
+
+  This clause can be repeated multiple times. When using lists of names, the arguments for successive clauses are simply added to the previous arguments. When using mapped names, the mappings are likewise combined. If the same key is mapped more than once, the mappings are tracked separately such that they can be applied to different instances of attribute retrieval (see examples below).
+
+
+  Background: A sample Cucumber suite
+    Given a directory "test_directory"
+    And a file "test_directory/test_file_1.feature":
+      """
+      Feature: A test feature
+
+        Scenario: Test 1
+          * some steps
+
+        @special_tag
+        Scenario: Test 2
+          * some other steps
+
+        Scenario Outline: Test 3
+          * some steps
+        Examples: First examples
+          | param |
+          | value |
+        Examples: Second examples
+          | param |
+          | value |
+      """
+    And a repository is made from "test_directory"
+
+
+  Scenario: Using 'as' to change the name under which values are returned
+    When the following query is executed:
+      """
+      select name
+      as scenario_name
+      from scenarios, outlines
+      """
+    Then the following values are returned:
+      | scenario_name |
+      | Test 1        |
+      | Test 2        |
+      | Test 3        |
+
+  Scenario: Renaming multiple attributes
+    When the following query is executed:
+      """
+      select name, source_line
+      as scenario_name, scenario_line
+      from scenarios, outlines
+      """
+    Then the following values are returned:
+      | scenario_name | scenario_line |
+      | Test 1        | 3             |
+      | Test 2        | 7             |
+      | Test 3        | 10            |
+
+  Scenario: Selectively renaming attributes
+    When the following query is executed:
+      """
+      select name, source_line
+      as source_line => 'scenario_line'
+      from scenarios, outlines
+      """
+    Then the following values are returned:
+      | name   | scenario_line |
+      | Test 1 | 3             |
+      | Test 2 | 7             |
+      | Test 3 | 10            |
+
+  Scenario: Using the 'as' clause multiple times
+    When the following query is executed:
+      """
+      select name, source_line
+      as scenario_name
+      as scenario_line
+      from scenarios, outlines
+      """
+    Then the result is the same as the result of the following query:
+      """
+      select name, source_line
+      as scenario_name, scenario_line
+      from scenarios, outlines
+      """
+    When the following query is executed:
+      """
+      select name, source_line
+      as name => 'scenario_name'
+      as source_line => 'scenario_line'
+      from scenarios, outlines
+      """
+    And the result is the same as the result of the following query:
+      """
+      select name, source_line
+      as name => 'scenario_name',
+         source_line => 'scenario_line'
+      from scenarios, outlines
+      """
+
+  Scenario: Renaming duplicate attributes
+
+  Sometimes you may want to select the same attribute multiple times but track it separately in the results. This can be done with both set renaming and selective renaming.
+
+    When the following query is executed:
+      """
+      select name, source_line, name
+      as 'name 1', scenario_line, 'name 2'
+      from scenarios, outlines
+      """
+    Then the following values are returned:
+      | name 1 | scenario_line | name 2 |
+      | Test 1 | 3             | Test 1 |
+      | Test 2 | 7             | Test 2 |
+      | Test 3 | 10            | Test 3 |
+    When the following query is executed:
+      """
+      select name, source_line, name
+      as name => 'name 1'
+      as name => 'name 2'
+      from scenarios, outlines
+      """
+    Then the following values are returned:
+      | name 1 | source_line | name 2 |
+      | Test 1 | 3           | Test 1 |
+      | Test 2 | 7           | Test 2 |
+      | Test 3 | 10          | Test 3 |