cql 1.4.1 → 1.7.0

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

@@ -92,7 +92,7 @@ Feature: 'select' clause
       from scenarios
       """
 
-  Scenario: Repetitive selection
+  Scenario: Using the 'select' clause multiple times
     When the following query is executed:
       """
       select name
@@ -116,7 +116,3 @@ Feature: 'select' clause
       select :self
       from scenarios
       """
-
-# Commented out so that they aren't picked up by Relish
-#  @wip
-#  Scenario: Can select from all types of model

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

@@ -1,7 +1,7 @@
 # todo - Rewrite the scenarios such that they use their own test specific feature files instead of setting up a large suite in the background
 Feature: 'with' clause
 
-  The *with* clause specifies filter conditions that will reduce the number of things targeted by the *from* clause. The *with* clause can take one or more blocks that will filter out any object for which the block does not evaluate to true (using 'without' instead of 'with' will have the opposite effect). Alternatively, mappings of specific *from* targets to their respective filtering blocks can be provided. The *with* clause can also take predefined filters (detailed below).
+  The *with* clause specifies filter conditions that will reduce the number of things targeted by the *from* clause. The *with* clause can take one or more blocks that will filter out any object for which the block does not evaluate to true (using 'without' instead of 'with' will have the opposite effect). Alternatively, mappings of specific *from* targets to their respective filtering blocks can be provided. The *with* clause can also take predefined filters (see corresponding documentation).
 
   Sample usage:
   ````
@@ -9,41 +9,12 @@ Feature: 'with' clause
     select name, tags, description_text
     from features
     with { |feature| feature.name =~ /foo/ }
-    with tc lt 3
   end
   ````
 
   This clause can be repeated multiple times. The arguments for successive clauses are simply added to the previous arguments.
 
 
-  The following filters are supported for models that have tags:
-
-  * tags - Filters out models that do not have the exact set of tags provided.
-  * tc   - (tag count) Filters out models based on the number of tags that they have.
-
-  The following filters are supported for models that have names:
-
-  * name - Filters out models whose name does not match the name provided. Can be a string or regular expression.
-
-  The following filters are supported for models that have steps:
-
-  * line - Filters out models whose steps do not include the provided step (keywords and blocks are ignored). Can be a string or regular expression.
-  * lc   - (line count) Filters out models based on the number of steps that they have.
-
-  The following filters are supported for feature models:
-
-  * sc   - (scenario count) Filters out models based on the number of scenarios that they have.
-  * soc  - (scenario outline count) Filters out models based on the number of outlines that they have.
-  * ssoc - (scenario and scenario outline count) Filters out models based on the total number of scenarios and outlines that they have.
-
-  For count based filters, the following operators are available:
-
-  * lt   (Less than)
-  * lte  (Less than or equals)
-  * gt   (Greater than)
-  * gte  (Greater than or equals)
-
-
   Background: A sample Cucumber suite
     Given a repository to query
     And the following feature has been modeled in the repository:
@@ -161,7 +132,7 @@ Feature: 'with' clause
       """
       select name
       from features, scenarios
-      with scenarios => tags('@tag_1','@tag_2')
+      with scenarios => lambda { |element| element.name == 'Test 1' }
       """
     Then the following values are returned:
       | name                             |
@@ -216,127 +187,6 @@ Feature: 'with' clause
       | A feature with lots of scenarios |
       | A feature with lots of outlines  |
 
-# todo - break out the predefined filters into another feature file?
-  Scenario: Filtering by tags
-    When the following query is executed:
-      """
-      select name
-      from scenarios
-      with tags '@tag_1', '@tag_2'
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 1 |
-
-  Scenario: Filtering by tag count
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with tc gt 2
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 3 |
-
-  Scenario: Filtering by name
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with name 'Test 3'
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 3 |
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with name /Test [12]/
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 1 |
-      | Test 2 |
-
-  Scenario: Filtering by line
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with line 'some steps'
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 1 |
-      | Test 3 |
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with line /other/
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 2 |
-
-  Scenario: Filtering by line count
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with lc gt 1
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 3 |
-
-  Scenario: Filtering by scenario count
-    When the following query is executed:
-      """
-      select name
-      from features
-      with sc gt 2
-      """
-    Then the following values are returned:
-      | name                             |
-      | A feature with lots of scenarios |
-
-  Scenario: Filtering by outline count
-    When the following query is executed:
-      """
-      select name
-      from features
-      with soc gt 2
-      """
-    Then the following values are returned:
-      | name                            |
-      | A feature with lots of outlines |
-
-  Scenario: Filtering by combined test count
-    When the following query is executed:
-      """
-      select name
-      from features
-      with ssoc lt 3
-      """
-    Then the following values are returned:
-      | name                          |
-      | A feature with a mix of tests |
-
-  @wip
-  Scenario: Using the 'lt' count filter
-
-  @wip
-  Scenario: Using the 'lte' count filter
-
-  @wip
-  Scenario: Using the 'gt' count filter
-
-  @wip
-  Scenario: Using the 'gte' count filter
-
   Scenario: Using 'without' for negation
     When the following query is executed:
       """
@@ -350,15 +200,3 @@ Feature: 'with' clause
       from scenarios
       with { |scenario| !(scenario.source_line == 8) }
       """
-    When the following query is executed:
-      """
-      select name
-      from features
-      without ssoc lt 3
-      """
-    Then the result is the same as the result of the following query:
-      """
-      select name
-      from features
-      with ssoc gt 2
-      """

data/testing/cucumber/features/dsl.feature

@@ -56,25 +56,3 @@ Feature: DSL
       select 'name'
       from 'scenarios'
       """
-
-
-# Commented out so that they aren't picked up by Relish
-#
-#  @wip
-#  Scenario: Use 'order_by' to sort the results
-#
-#  # 'and' is a keyword. Some other kind of repeater word would be needed
-#  @wip
-#  Scenario: 'And' can be used instead of repeating the previous keyword
-#    When the following query is executed:
-#      """
-#      select 'name'
-#      and    'source_line'
-#      from CukeModeler::Scenario
-#      and  CukeModeler::Outline
-#      """
-#    Then the following values are returned:
-#      | name   | source_line |
-#      | Test 1 | 3           |
-#      | Test 2 | 6           |
-#      | Test 3 | 9           |

data/testing/cucumber/step_definitions/verification_steps.rb

@@ -2,16 +2,15 @@ Then(/^the following values are returned:$/) do |values|
   expected_keys = values.raw.first
   expected_results = values.hashes
 
+  # Protecting against false positives
+  # Key order doesn't matter and Ruby 1.8.7 does not retain hash key ordering, so sorting them for consistency
+  raise('Invalid result set. Attribute names cannot be repeated.') unless expected_keys.sort == expected_results.first.keys.sort
+
   expected_results.each do |result|
     result.each_pair { |key, value| result[key] = value.to_i if value =~ /^\d+$/ }
   end
 
-
-  @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
+  expect(@query_results).to match_array(expected_results)
 end
 
 # Then(/^all of them can be queried for additional information$/) do

data/testing/gemfiles/cuke_modeler0.gemfile

@@ -7,13 +7,12 @@ gemspec :path => "../../"
 if RUBY_VERSION =~ /^1\.8/
   gem 'cucumber', '< 1.3.0'
   gem 'gherkin', '< 2.12.0'
-  gem 'mime-types', '< 2.0.0' # (For the relish gem) Ruby 1.8.x dropped somewhere in the 2.x series
-  gem 'rest-client', '< 1.7.0' # (For the relish gem) Ruby 1.8.x dropped on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
   gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
 elsif RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
   gem 'mime-types', '< 3.0.0' # Requires Ruby 2.x on/after this version
-  gem 'rest-client', '< 2.0.0' # Requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # Requires Ruby 2.x on/after this version
 end
 
 if RUBY_VERSION =~ /^1\./
@@ -21,14 +20,17 @@ if RUBY_VERSION =~ /^1\./
   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
   gem 'unf_ext', '< 0.0.7.3' # 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]/
   gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
+
+  # The oldest versions of the `cuke_modeler` gem did not properly limit their dependencies
+  # and CukeModeler 0.x can not handle a higher Gherkin 5.x+
+  gem 'gherkin', '< 5.0'
 end
 
 

data/testing/gemfiles/cuke_modeler1.gemfile

@@ -7,13 +7,12 @@ gemspec :path => "../../"
 if RUBY_VERSION =~ /^1\.8/
   gem 'cucumber', '< 1.3.0'
   gem 'gherkin', '< 2.12.0'
-  gem 'mime-types', '< 2.0.0' # (For the relish gem) Ruby 1.8.x dropped somewhere in the 2.x series
-  gem 'rest-client', '< 1.7.0' # (For the relish gem) Ruby 1.8.x dropped on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
   gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
 elsif RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
   gem 'mime-types', '< 3.0.0' # Requires Ruby 2.x on/after this version
-  gem 'rest-client', '< 2.0.0' # Requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # Requires Ruby 2.x on/after this version
 end
 
 if RUBY_VERSION =~ /^1\./
@@ -21,14 +20,13 @@ if RUBY_VERSION =~ /^1\./
   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
   gem 'unf_ext', '< 0.0.7.3' # 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]/
   gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
 end
 
 

data/testing/gemfiles/cuke_modeler2.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../../"
+
+
+# cql can play with pretty much any version of these but they all play differently with Ruby
+if RUBY_VERSION =~ /^1\.8/
+  gem 'cucumber', '< 1.3.0'
+  gem 'gherkin', '< 2.12.0'
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
+  gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
+elsif RUBY_VERSION =~ /^1\./
+  gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # Requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # Requires Ruby 2.x on/after this version
+end
+
+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
+  gem 'unf_ext', '< 0.0.7.3' # Requires Ruby 2.x on/after this version
+end
+
+if RUBY_VERSION =~ /^2\.[23456789]/
+  gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
+end
+
+
+gem 'cuke_modeler', '~> 2.0'

data/testing/gemfiles/cuke_modeler3.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../../"
+
+# Cueumber 4.x doesn't work on all JRubies and this is the only earlier version
+# that is compatible with the `cucumber-gherkin` gem, upon which CukeModler 3.x depends
+gem 'cucumber', '2.2.0'
+
+# The version of CukeModeler being tested
+gem 'cuke_modeler', '~> 3.0'

data/testing/helper_methods.rb

@@ -0,0 +1,13 @@
+module CQL
+  module HelperMethods
+
+    def cuke_modeler?(*versions)
+      versions.include?(cuke_modeler_major_version)
+    end
+
+    def cuke_modeler_major_version
+      Gem.loaded_specs['cuke_modeler'].version.version.match(/^(\d+)\./)[1].to_i
+    end
+
+  end
+end

data/testing/model_helper.rb

@@ -0,0 +1,28 @@
+module CQL
+  module ModelHelper
+
+    def directory_with(*models)
+      directory_model = CukeModeler::Directory.new
+
+      models.each do |model|
+        case
+          when model.is_a?(CukeModeler::Feature)
+            file_model = CukeModeler::FeatureFile.new
+
+            if cuke_modeler?(0)
+              file_model.features = [model]
+            else
+              file_model.feature = model
+            end
+
+            directory_model.feature_files << file_model
+          else
+            raise(ArgumentError, "Don't know how to handle a '#{model.class}'")
+        end
+      end
+
+      directory_model
+    end
+
+  end
+end

data/testing/rspec/spec/clauses/as_clause_spec.rb

@@ -0,0 +1 @@
+#TODO - add some specs for the 'as' clause

data/testing/rspec/spec/clauses/from_clause_spec.rb

@@ -0,0 +1,146 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+
+describe 'an object that uses the DSL' do
+
+
+  let(:nodule) { CQL::Dsl }
+  let(:dsl_enabled_object) { Object.new.extend(nodule) }
+
+
+  describe "from" do
+
+    it 'knows from what to select attributes' do
+      expect(dsl_enabled_object).to respond_to(:from)
+    end
+
+    it 'selects from one or more things' do
+      expect(dsl_enabled_object.method(:from).arity).to eq(-1)
+    end
+
+    it "can handle an empty 'from' clause" do
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
+
+      result = gs.query do
+        select name
+        from
+      end
+
+      expect(result).to eq([])
+    end
+
+    describe "multiple targets" do
+
+      it 'raises an exception for inapplicable attributes' do
+        gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
+
+        expect {
+          gs.query do
+            select name, steps
+            from features
+            from scenarios
+          end
+        }.to raise_error(ArgumentError)
+      end
+
+    end
+
+    describe 'shorthand' do
+
+      it 'should consider an exact match over a pluralization' do
+        plural_class_model = CukeModeler::CqlTestModels.new
+        singular_class_model = CukeModeler::CqlTestModel.new
+
+        plural_class_model.attribute_1 = 'plural'
+        singular_class_model.attribute_1 = 'singular'
+        plural_class_model.children << singular_class_model
+
+        repo = CQL::Repository.new(plural_class_model)
+
+        result = repo.query do
+          select attribute_1
+          from cql_test_model
+        end
+
+        expect(result.first['attribute_1']).to eq('singular')
+      end
+
+      it 'raises an exception if the shorthand form of a class cannot be mapped to a real class' do
+        gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
+
+        expect {
+          gs.query do
+            select name
+            from not_a_real_class
+          end
+        }.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("#{CQL_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
+
+
+    describe 'special scopes' do
+
+      it 'understands the :all scope' do
+        gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
+
+        expect { gs.query do
+          select :model
+          from :all
+        end
+        }.to_not raise_error
+      end
+
+      it 'queries from all models when scoped to :all' do
+        model_1 = CukeModeler::CqlTestModel.new
+        model_2 = CukeModeler::CqlTestModel.new
+        model_3 = CukeModeler::CqlTestModel.new
+
+        model_1.children << model_2
+        model_1.children << model_3
+
+        repo = CQL::Repository.new(model_1)
+
+        result = repo.query do
+          select :model
+          from :all
+        end
+
+        expect(result).to match_array([{:model => model_1},
+                                       {:model => model_2},
+                                       {:model => model_3}])
+      end
+
+    end
+
+  end
+
+
+end