cql 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7723f8638c180e1ad2215a3912db8979a12b8722
-  data.tar.gz: 93cf6e70f784983ae672ff87a73616495e115d59
+  metadata.gz: fe541449ce515566bd3a3483b42f2260829a03e1
+  data.tar.gz: 846f80e853bef0ba8d441187370ce948e6cca50b
 SHA512:
-  metadata.gz: 588e74d98dbd1d7c5a8cf8331d45abc32ff1005ac8503c78e985f88b14f88baade72ddf6c9cdb0e70b81127e287e681e4749dc655ff3c04c973074cbd405a987
-  data.tar.gz: 6e83c073cadd6e57bfd6f4b28ba111f262e6e1ac11563e793e8e6751dddbfdbacb2f33b62c033940c0eee01d6d1f41004db5b9b03a23d96ebf3d5f13431ad3b2
+  metadata.gz: 5f5bb7cb738155ad68f98b877d4889be5f57b69adec5c37804307aa47d29bde11c7819e3a883994e85ff3b903f636a542a575668b1cac9b299068244e3b08df6
+  data.tar.gz: ee4e8bf2dee1d7aeb0128c65fe3001c1d21c97290b6668384d044de2066880de687a2398040616f8f000eefb6d4aed1ff269a975ae2c8f51e6769ac7364063f6

data/lib/cql.rb

@@ -37,6 +37,7 @@ module CQL
       raise(ArgumentError, "A query must specify a 'select' clause") unless @what
       raise(ArgumentError, "A query must specify a 'from' clause") unless @from
 
+      warn("Multiple selections made without using an 'as' clause") unless @name_transforms || (@what.count == @what.uniq.count)
 
       # Gather relevant objects from root object and filters
       @data = CQL::MapReduce.gather_objects(@data, @from, @filters)

data/lib/cql/version.rb

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

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

@@ -59,13 +59,17 @@ Feature: 'select' clause
       | Test 2 | 7           |
 
   Scenario: Selection of the same attribute multiple times
+
+  Note: Duplicate attribute selection should be combined with an 'as' clause in order to ensure that later attribute selections do not override earlier selections of the same attribute.
+
     When the following query is executed:
       """
       select name, name
+      as name1, name2
       from scenarios
       """
     Then the following values are returned:
-      | name   | name   |
+      | name1  | name2  |
       | Test 1 | Test 1 |
       | Test 2 | Test 2 |
 

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

@@ -124,30 +124,34 @@ Feature: 'transform' clause
 
   Scenario: Transforming duplicate attributes
 
+  Reminder: Duplicate attribute selection should be used in conjunction with the 'as' clause.
+
   Sometimes you may want to select the same attribute multiple times and perform multiple different transformations on it. This can be done with both set transforming and selective transforming.
 
     When the following query is executed:
       """
       select name, tags, name
+      as name1, tags, name2
       transform lambda { |name| name.upcase },
                 lambda { |tags| 9 },
                 lambda { |name| name.downcase }
       from scenarios, outlines
       """
     Then the following values are returned:
-      | name   | tags | name   |
+      | name1  | tags | name2  |
       | TEST 1 | 9    | test 1 |
       | TEST 2 | 9    | test 2 |
       | TEST 3 | 9    | test 3 |
     When the following query is executed:
       """
       select name, source_line, name
+      as name1, source_line, name2
       transform name => lambda { |name| name.upcase }
       transform name => lambda { |name| name.downcase }
       from scenarios, outlines
       """
     Then the following values are returned:
-      | name   | source_line | name   |
+      | name1  | source_line | name2  |
       | TEST 1 | 3           | test 1 |
       | TEST 2 | 7           | test 2 |
       | TEST 3 | 10          | test 3 |

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

@@ -43,8 +43,8 @@ Feature: 'with' clause
 
 
   Background: A sample Cucumber suite
-    Given a directory "test_directory"
-    And a file "test_directory/test_file_1.feature":
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -67,7 +67,7 @@ Feature: 'with' clause
           | param |
           | value |
       """
-    And a file "test_directory/test_file_2.feature":
+    And the following feature has been modeled in the repository:
       """
       Feature: A feature with lots of scenarios
 
@@ -80,7 +80,7 @@ Feature: 'with' clause
         Scenario: 3
           * different steps
       """
-    And a file "test_directory/test_file_3.feature":
+    And the following feature has been modeled in the repository:
       """
       Feature: A feature with lots of outlines
 
@@ -102,7 +102,7 @@ Feature: 'with' clause
           | param |
           | value |
       """
-    And a file "test_directory/test_file_4.feature":
+    And the following feature has been modeled in the repository:
       """
       Feature: A feature with a mix of tests
 
@@ -115,7 +115,6 @@ Feature: 'with' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'with' to limit the objects from which to return attributes
@@ -165,10 +164,10 @@ Feature: 'with' clause
     Then the following values are returned:
       | name                             |
       | A test feature                   |
+      | Test 1                           |
       | A feature with lots of scenarios |
       | A feature with lots of outlines  |
       | A feature with a mix of tests    |
-      | Test 1                           |
 
   Scenario: Using the 'with' clause multiple times
     When the following query is executed:

data/testing/cucumber/step_definitions/setup_steps.rb

@@ -23,3 +23,21 @@ Given(/^the models provided by CukeModeler$/) do
     end
   end
 end
+
+Given(/^a repository to query$/) do
+  @root_directory_model = CukeModeler::Directory.new
+  @repository = CQL::Repository.new(@root_directory_model)
+end
+
+And(/^the following feature has been modeled in the repository:$/) do |text|
+  file_model = CukeModeler::FeatureFile.new
+
+  # CukeModeler::FeatureFile had a different interface in 0.x
+  if file_model.respond_to?(:feature=)
+    file_model.feature = CukeModeler::Feature.new(text)
+  else
+    file_model.features << CukeModeler::Feature.new(text)
+  end
+
+  @root_directory_model.feature_files << file_model
+end

data/testing/cucumber/step_definitions/verification_steps.rb

@@ -1,15 +1,17 @@
 Then(/^the following values are returned:$/) do |values|
+  expected_keys = values.raw.first
   expected_results = values.hashes
-  expected_results.each { |result| result['source_line'] = result['source_line'].to_i if result['source_line'] }
-  expected_results.each { |result| result['scenario_line'] = result['scenario_line'].to_i if result['scenario_line'] }
-  expected_results.each { |result| result['tags'] = eval(result['tags']) if result['tags'] }
-  expected_results.each { |result| result['scenario_tags'] = eval(result['scenario_tags']) if result['scenario_tags'] }
 
   expected_results.each do |result|
-    result.each_pair { |key, value| result[key] = value.sub('path/to', @default_file_directory) if value =~ /path\/to/ }
+    result.each_pair { |key, value| result[key] = value.to_i if value =~ /^\d+$/ }
   end
 
-  expect(@query_results).to match_array(expected_results)
+
+  @query_results.each_with_index do |result, index|
+    # Key order doesn't matter and Ruby 1.8.7 does not retain hash key ordering, so sorting them for consistency
+    expect(result.keys.sort).to eq(expected_keys.sort)
+    expect(result).to eq(expected_results[index])
+  end
 end
 
 # Then(/^all of them can be queried for additional information$/) do
@@ -45,8 +47,10 @@ Then(/^the following code executes without error:$/) do |code_text|
 end
 
 Then(/^all of them can be queried$/) do |code_text|
+  original_text = code_text
+
   @available_model_classes.each do |clazz|
-    code_text.gsub!('<model_class>', clazz.to_s)
+    code_text = original_text.gsub('<model_class>', clazz.to_s)
 
     expect(clazz.new).to respond_to(:query)
 

data/testing/gemfiles/cuke_modeler0.gemfile

@@ -20,6 +20,10 @@ if RUBY_VERSION =~ /^1\./
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+
+  if RbConfig::CONFIG['host_os'].downcase =~ /mswin|msys|mingw32/
+    gem 'ffi', '< 1.9.15' # The 'ffi' gem, for Windows, requires Ruby 2.x on/after this version
+  end
 end
 
 if RUBY_VERSION =~ /^2\.[23456789]/

data/testing/gemfiles/cuke_modeler1.gemfile

@@ -20,6 +20,10 @@ if RUBY_VERSION =~ /^1\./
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+
+  if RbConfig::CONFIG['host_os'].downcase =~ /mswin|msys|mingw32/
+    gem 'ffi', '< 1.9.15' # The 'ffi' gem, for Windows, requires Ruby 2.x on/after this version
+  end
 end
 
 if RUBY_VERSION =~ /^2\.[23456789]/

data/testing/rspec/spec/dsl_spec.rb

@@ -183,6 +183,7 @@ describe 'an object that uses the DSL' do
           select :self
           select name
           select :self
+          as 'foo', 'bar', 'baz'
           from scenarios
         end
 
@@ -192,12 +193,45 @@ describe 'an object that uses the DSL' do
               select
               select name
               select
+              as 'foo', 'bar', 'baz'
               from scenarios
             end
         ).to eq(base_result)
       end
 
     end
+
+
+    describe 'duplicate selections' do
+
+      let(:warning_message) { "Multiple selections made without using an 'as' clause\n" }
+
+      it "warns if the same attribute is selected more than once without an 'as' clause being used" do
+        gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+        expect {
+          gs.query do
+            select :model, :model, :model
+            from :all
+          end
+        }.to output(warning_message).to_stderr
+      end
+
+      it "does not warn if the same attribute is selected more than once and an 'as' clause is used" do
+        gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+
+        expect {
+          gs.query do
+            select :model, :model, :model
+            # Usage of the clause is sufficient. Not going to try and count the mappings or anything like that.
+            as foo
+            from :all
+          end
+        }.to_not output(warning_message).to_stderr
+      end
+
+    end
+
   end
 
   describe "from" do

data/testing/rspec/spec/line_filterable_specs.rb

@@ -44,7 +44,7 @@ shared_examples_for 'a line filterable target set' do |target_type, test_data|
         select name
         from scenarios
         with line 7
-      end }.to raise_error(ArgumentError, "Can only match a String or Regexp. Got Fixnum.")
+      end }.to raise_error(ArgumentError, /^Can only match a String or Regexp. Got (?:Fixnum|Integer)\.$/)
 
     end
 

data/testing/rspec/spec/name_filterable_specs.rb

@@ -44,7 +44,7 @@ shared_examples_for 'a name filterable target set' do |target_type, test_data|
         select name
         from scenarios
         with name 7
-      end }.to raise_error(ArgumentError, "Can only match a String or Regexp. Got Fixnum.")
+      end }.to raise_error(ArgumentError, /^Can only match a String or Regexp. Got (?:Fixnum|Integer)\.$/)
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Eric Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuke_modeler
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A gem providing functionality to query a Cucumber test suite.