cql 1.0.1 → 1.1.0

data/lib/cql.rb

@@ -1,9 +1,5 @@
-if RUBY_VERSION < '1.9.2'
-  require 'backports/1.9.2/array/rotate'
-end
-
 require 'cuke_modeler'
-require 'cql/dsl'
+require 'cql/map_reduce'
 
 module CQL
 
@@ -12,6 +8,8 @@ module CQL
     attr_reader :data, :what
 
     def format_data data
+      space_data
+
       Array.new.tap do |result_array|
         data.each do |element|
           result_array << Hash.new.tap do |result|
@@ -34,11 +32,16 @@ module CQL
       # Populate configurables from DSL block
       self.instance_eval(&block)
 
+
+      raise(ArgumentError, "A query must specify a 'select' clause") unless @what
+      raise(ArgumentError, "A query must specify a 'from' clause") unless @from
+
+
       # Gather relevant objects from root object and filters
-      @data= CQL::MapReduce.gather_objects(@data, @from, @filters)
+      @data = CQL::MapReduce.gather_objects(@data, @from, @filters)
 
       # Extract properties from gathered objects
-      @data= format_output(@data)
+      @data = format_output(@data)
     end
 
 
@@ -50,7 +53,7 @@ module CQL
     end
 
     def determine_key(attribute, index)
-      key = transform_stuff(@name_transforms, attribute, index) if @name_transforms
+      key = mapped_attribute(@name_transforms, attribute, index) if @name_transforms
 
       key || attribute
     end
@@ -59,7 +62,7 @@ module CQL
       original_value = attribute.is_a?(Symbol) ? special_value(element, attribute) : element.send(attribute)
 
       if @value_transforms
-        value = transform_stuff(@value_transforms, attribute, index)
+        value = mapped_attribute(@value_transforms, attribute, index)
         value = value.call(original_value) if value.is_a?(Proc)
       end
 
@@ -72,20 +75,19 @@ module CQL
         when :self
           val = element
         else
-          # todo - error message?
+          raise(ArgumentError, ":#{attribute} is not a valid attribute for selection.")
       end
 
       val
     end
 
-    def transform_stuff(transforms, attribute, location)
+    def mapped_attribute(mappings, attribute, location)
       case
-        when transforms.is_a?(Array)
-          value = transforms[location]
-        when transforms.is_a?(Hash)
-          if transforms[attribute]
-            value = transforms[attribute].first
-            transforms[attribute].rotate!
+        when mappings.is_a?(Array)
+          value = mappings[location]
+        when mappings.is_a?(Hash)
+          if mappings[attribute]
+            value = mappings[attribute][location]
           end
         else
           # todo - add error message
@@ -94,6 +96,51 @@ module CQL
       value
     end
 
+    def space_data
+      space_renamings
+      space_transforms
+    end
+
+    def space_renamings
+      if @name_transforms.is_a?(Hash)
+        new_names = {}
+
+        @name_transforms.each_pair do |key, value|
+          new_names[key] = []
+
+          @what.each do |attribute|
+            if attribute == key
+              new_names[key] << value.shift
+            else
+              new_names[key] << nil
+            end
+          end
+        end
+
+        @name_transforms = new_names
+      end
+    end
+
+    def space_transforms
+      if @value_transforms.is_a?(Hash)
+        new_values = {}
+
+        @value_transforms.each_pair do |key, value|
+          new_values[key] = []
+
+          @what.each do |attribute|
+            if attribute == key
+              new_values[key] << value.shift
+            else
+              new_values[key] << nil
+            end
+          end
+        end
+
+        @value_transforms = new_values
+      end
+    end
+
   end
 
 

data/lib/cql/dsl.rb

@@ -1,5 +1,3 @@
-require 'cql/map_reduce'
-
 module CQL
   module Dsl
 
@@ -26,6 +24,8 @@ module CQL
 
     #Select clause
     def select *what
+      what = [:self] if what.empty?
+
       @what ||= []
       @what.concat(what)
     end
@@ -44,7 +44,6 @@ module CQL
     def from(*targets)
       @from ||= []
 
-      # todo - todo test the intermixing of shorthand and full classes as arguments
       targets.map! { |target| target.is_a?(String) ? determine_class(target) : target }
 
       @from.concat(targets)

data/lib/cql/map_reduce.rb

@@ -1,21 +1,42 @@
 require 'cql/dsl'
 require 'cql/feature_filters'
 require 'cql/sso_filters'
+require 'cql/dsl'
 
 
 module CQL
 
   class MapReduce
 
+    extend Dsl
+
     def self.gather_objects(current_object, target_classes, filters)
       gathered_objects = Array.new.tap { |gathered_objects| collect_all_in(target_classes, current_object, gathered_objects) }
 
       if filters
         filters.each do |filter|
           if filter.is_a?(Proc)
-            gathered_objects.select!(&filter)
+            gathered_objects = filter_with_proc(gathered_objects, filter)
+          elsif filter.is_a?(Hash)
+            filter.keys.each do |filtered_class|
+              clazz = determine_class(filtered_class)
+
+              gathered_objects = gathered_objects.select do |object|
+                if object.is_a?(clazz)
+                  if filter[filtered_class].is_a?(Proc)
+                    filter[filtered_class].call(object)
+                  else
+                    # Must be a predefined filter otherwise
+                    !filter_with_predefined([object], filter[filtered_class]).empty?
+                  end
+                else
+                  true
+                end
+              end
+            end
           else
-            gathered_objects = filter.execute(gathered_objects)
+            # Must be a predefined filter otherwise
+            gathered_objects = filter_with_predefined(gathered_objects, filter)
           end
         end
       end
@@ -30,6 +51,14 @@ module CQL
       private
 
 
+      def filter_with_proc(objects, filter)
+        objects.select(&filter)
+      end
+
+      def filter_with_predefined(objects, filter)
+        filter.execute(objects)
+      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) }

data/lib/cql/version.rb

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

data/spec/dsl_spec.rb

@@ -1,21 +1,96 @@
 require 'spec_helper'
 
 describe 'dsl' do
+
+
+  describe 'invalid query structure' do
+
+    it "will complain if no 'from' clause is specified" do
+      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+      expect {
+        gs.query do
+          select
+          features
+        end
+      }.to raise_error(ArgumentError, "A query must specify a 'from' clause")
+    end
+
+    it "will complain if no 'select' clause is specified" do
+      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+      expect {
+        gs.query do
+          from features
+        end
+      }.to raise_error(ArgumentError, "A query must specify a 'select' clause")
+    end
+
+  end
+
+
+  describe 'clause ordering' do
+
+    it 'handles intermixed clauses' do
+      # Clause ordering doesn't matter as long as any given type of clause is ordered correctly with respect to its multiple uses
+
+      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+      results = gs.query do
+        with { |thing| thing.tags.include?('@one') }
+        as thing1
+        transform :self => lambda { |thing1| 1 }
+        select :self
+        as thing2
+        with scenarios => lambda { |scenario| scenario.name =~ /3/ }
+        from scenarios
+        select :self
+        transform :self => lambda { |thing2| 2 }
+        select name
+      end
+
+      expect(results.first).to eq('thing1' => 1, 'thing2' => 2, 'name' => 'Testing the slurping 3')
+    end
+
+  end
+
+
   describe "select" do
 
-    describe "multiple selections" do
 
-      it 'should handle an empty selection' do
-        skip("It may be useful to be able to return both the underlying object and various attributes on it (which is the probably the intent of this query [assuming that it's not just a typo]) but I can't think of a clean way to do it. Behavior undefined for now.")
+    it 'complains if an unknown special attribute is queried' do
+      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+      expect {
+        gs.query do
+          select :foo
+          from scenarios
+        end
+      }.to raise_error(ArgumentError, ":foo is not a valid attribute for selection.")
+    end
+
+
+    describe "multiple selections" do
 
+      it 'can freely mix empty selections and attribute selections' do
         gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
 
-        result = gs.query do
-          select
+        base_result = gs.query do
+          select :self
           select name
-          from features
+          select :self
+          from scenarios
         end
 
+
+        expect(
+            gs.query do
+              select
+              select name
+              select
+              from scenarios
+            end
+        ).to eq(base_result)
       end
 
     end
@@ -57,7 +132,117 @@ describe 'dsl' do
         }.to raise_error(ArgumentError, "Class 'CukeModeler::NotARealClass' does not exist")
 
       end
+
+      it 'can freely mix shorthand and long-form names' do
+        gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+        # All long-form
+        base_result = gs.query do
+          select name
+          from CukeModeler::Scenario, CukeModeler::Feature
+        end
+
+        # All shorthand
+        expect(
+            gs.query do
+              select name
+              from scenarios, features
+            end
+        ).to eq(base_result)
+
+        # A mix of both
+        expect(
+            gs.query do
+              select name
+              from CukeModeler::Scenario, features
+            end
+        ).to eq(base_result)
+      end
+
     end
 
   end
+
+  describe "transform" do
+
+    describe "multiple targets" do
+
+      it 'does not apply more transforms than have been declared' do
+        gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+        results = gs.query do
+          select :self, :self, :self
+          as thing1, thing2, thing3
+          from scenarios
+          transform :self => lambda { |thing1| 1 }
+          transform :self => lambda { |thing2| 2 }
+        end
+
+        expect(results.first).to include('thing1' => 1, 'thing2' => 2)
+        expect(results.first).to_not include('thing3' => 1)
+        expect(results.first).to_not include('thing3' => 2)
+      end
+
+    end
+
+  end
+
+
+  describe 'with' do
+
+    describe 'targeted' do
+
+      it 'can handle predefined filters' do
+        gs = CQL::Repository.new(@feature_fixtures_directory)
+
+        expect {
+          gs.query do
+            select name
+            from features, scenarios, outlines
+            with scenarios => name(/test/)
+          end
+        }.to_not raise_error
+      end
+
+      it 'can handle a block filter' do
+        gs = CQL::Repository.new(@feature_fixtures_directory)
+
+        expect {
+          gs.query do
+            select name
+            from features, scenarios, outlines
+            with scenarios => lambda { |scenario| true }
+          end
+        }.to_not raise_error
+      end
+
+      it 'can handle shorthand targets' do
+        gs = CQL::Repository.new(@feature_fixtures_directory)
+
+        expect {
+          gs.query do
+            select name
+            from features, scenarios, outlines
+            with scenarios => name(/test/)
+          end
+        }.to_not raise_error
+      end
+
+      it 'can handle multiple targets' do
+        gs = CQL::Repository.new(@feature_fixtures_directory)
+
+        expect {
+          gs.query do
+            select name
+            from features, scenarios, outlines
+            with scenarios => lambda { |scenario| true },
+                 outlines => lambda { |outline| true }
+          end
+        }.to_not raise_error
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Eric Kessler
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-11-28 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
@@ -21,20 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: racatt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -129,13 +130,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
@@ -147,14 +148,13 @@ files:
 - spec/name_filterable_specs.rb
 - spec/repository_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/spec_helper.rb
 - spec/tag_filterable_specs.rb
 homepage: https://github.com/enkessler/cql
 licenses:
 - MIT
-metadata: {}
 post_install_message: ! '
 
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
@@ -172,20 +172,22 @@ rdoc_options:
 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: 2.4.8
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A gem providing functionality to query a Cucumber test suite.
 test_files:
 - spec/dsl_spec.rb
@@ -203,3 +205,4 @@ test_files:
 - spec/select_scen_outline_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/tag_filterable_specs.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmJjZmVjY2MzZGQwMWIyNzIyNjA3ZjMxZDVlNGVhMGYwYWNhMjlmMQ==
-  data.tar.gz: !binary |-
-    ZTEwODIxZmEwZWFiYTM0MTI0YzI4MjZjMDZhYjk1OGRmOTkyYWE5Zg==
-SHA512:
-  metadata.gz: !binary |-
-    ZjgxZDk5NjY1ZjA0YTNkYjJkNDIwZGVhYzVlMmEzODRjMmI1MDRkODk2Njc1
-    YmUzM2ExYjYzYjY4M2I3YjExMjAwNTFjODhjZGRlY2ZhYjZkNTI0NzgwOGY2
-    YTA5ZGE4MDIxOWFjMGU2ZjY1NmY3NzgyYTIxZjNlN2QzMGFhYjc=
-  data.tar.gz: !binary |-
-    M2NjN2RmZGZhNmUzYTE4NzY2OGE5ODM2ZTcwNDkyYjg5OWVmNDMyNTcxZWIy
-    NDkyZTViZTljMGI0ZjRkMzBlMDM1ZDQwZGIzNDRmZTg0OTVmZTNlNmY1NmZh
-    MTdjODU5OWIzYTU2YzJkYjIyYmQ5ODI1M2MyMDAyZjliYTZiNzM=