cql 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe541449ce515566bd3a3483b42f2260829a03e1
-  data.tar.gz: 846f80e853bef0ba8d441187370ce948e6cca50b
+  metadata.gz: ba9e7d8795d805ccd50924027199c698f2365df1
+  data.tar.gz: 0a452146ee7d5ca32764671835de2dcc486addd2
 SHA512:
-  metadata.gz: 5f5bb7cb738155ad68f98b877d4889be5f57b69adec5c37804307aa47d29bde11c7819e3a883994e85ff3b903f636a542a575668b1cac9b299068244e3b08df6
-  data.tar.gz: ee4e8bf2dee1d7aeb0128c65fe3001c1d21c97290b6668384d044de2066880de687a2398040616f8f000eefb6d4aed1ff269a975ae2c8f51e6769ac7364063f6
+  metadata.gz: 703ed14d3880d6017ea2d0699ead3aa22ffb6ee3235071fb095300db35c7754ba857225623265a39e382d8c24b0ec4ca9e547bf04ef16b4ee5fe39037fee3c16
+  data.tar.gz: 9cec568a459073e2bf91bea830b8365748724091592b00eb56df32037393cdad119d6de2d5c1e1a858c564832e6948ffc2e7c82dc480861ec97f26f716e447eb

data/lib/cql.rb

@@ -1,176 +1,11 @@
 require 'cuke_modeler'
 require 'cql/map_reduce'
 require 'cql/queriable'
+require 'cql/query'
+require 'cql/repository'
 
-module CQL
-
-  class Query
-    include Dsl
-    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|
-            @what.each_with_index do |attribute, index|
-              key = determine_key(attribute, index)
-              value = determine_value(element, attribute, index)
-
-              result[key] = value
-            end
-          end
-        end
-      end
-
-    end
-
-    def initialize(directory, &block)
-      # Set root object
-      @data = directory
-
-      # 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
-
-      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)
-
-      # Extract properties from gathered objects
-      @data = format_output(@data)
-    end
-
-
-    private
-
-
-    def format_output(data)
-      format_data(data)
-    end
-
-    def determine_key(attribute, index)
-      key = mapped_attribute(@name_transforms, attribute, index) if @name_transforms
-
-      key || attribute
-    end
-
-    def determine_value(element, attribute, index)
-      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)
-        value = value.call(original_value) if value.is_a?(Proc)
-      end
-
-      value || original_value
-    end
 
-    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, :model
-          val = element
-        else
-          raise(ArgumentError, ":#{attribute} is not a valid attribute for selection.")
-      end
+# The top level namespace for CQL related code.
 
-      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)
-          value = mappings[location]
-        when mappings.is_a?(Hash)
-          if mappings[attribute]
-            value = mappings[attribute][location]
-          end
-        else
-          # todo - add error message
-      end
-
-      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
-
-
-  class Repository
-
-    include Queriable
-
-
-    def initialize(repository_root)
-      case
-        when repository_root.is_a?(String)
-          root = CukeModeler::Directory.new(repository_root)
-        when repository_root.class.to_s =~ /CukeModeler/
-          root = repository_root
-        else
-          raise(ArgumentError, "Don't know how to make a repository from a #{repository_root.class}")
-      end
-
-      @query_root = root
-    end
-
-  end
+module CQL
 end

data/lib/cql/dsl.rb

@@ -1,10 +1,16 @@
 module CQL
+
+  # The Domain Specific Language used for performing queries.
+
   module Dsl
 
+
+    # Any undefined method is assumed to mean its String equivalent, thus allowing a more convenient query syntax.
     def method_missing(method_name)
       method_name.to_s
     end
 
+    # Adds a *transform* clause to the query. See the corresponding Cucumber documentation for details.
     def transform(*attribute_transforms, &block)
       # todo - Still feels like some as/transform code duplication but I think that it would get too meta if I
       # reduced it any further. Perhaps change how the transforms are handled so that there doesn't have to be
@@ -16,13 +22,14 @@ module CQL
       add_transforms(attribute_transforms, @value_transforms)
     end
 
+    # Adds an *as* clause to the query. See the corresponding Cucumber documentation for details.
     def as(*name_transforms)
       prep_variable('name_transforms', name_transforms) unless @name_transforms
 
       add_transforms(name_transforms, @name_transforms)
     end
 
-    #Select clause
+    # Adds a *select* clause to the query. See the corresponding Cucumber documentation for details.
     def select *what
       what = [:self] if what.empty?
 
@@ -30,17 +37,19 @@ module CQL
       @what.concat(what)
     end
 
+    # Adds a *name* filter to the query. See the corresponding Cucumber documentation for details.
     def name *args
       return 'name' if args.size == 0
       CQL::NameFilter.new args[0]
     end
 
+    # Adds a *line* filter to the query. See the corresponding Cucumber documentation for details.
     def line *args
       return 'line' if args.size == 0
       CQL::LineFilter.new args.first
     end
 
-    #from clause
+    # Adds a *from* clause to the query. See the corresponding Cucumber documentation for details.
     def from(*targets)
       @from ||= []
 
@@ -49,7 +58,7 @@ module CQL
       @from.concat(targets)
     end
 
-    #with clause
+    # Adds a *with* clause to the query. See the corresponding Cucumber documentation for details.
     def with(*conditions, &block)
       @filters ||= []
 
@@ -59,7 +68,7 @@ module CQL
       end
     end
 
-    #without clause
+    # Adds a *without* clause to the query. See the corresponding Cucumber documentation for details.
     def without(*conditions, &block)
       @filters ||= []
 
@@ -69,6 +78,7 @@ module CQL
       end
     end
 
+    # Not a part of the public API. Subject to change at any time.
     class Comparison
       attr_accessor :operator, :amount
 
@@ -79,48 +89,62 @@ module CQL
 
     end
 
+    # Adds a *tc* filter to the query. See the corresponding Cucumber documentation for details.
     def tc comparison
       TagCountFilter.new 'tc', comparison
     end
 
+    # Adds a *lc* filter to the query. See the corresponding Cucumber documentation for details.
     def lc comparison
       CQL::SsoLineCountFilter.new('lc', comparison)
     end
 
+    # Adds an *ssoc* filter to the query. See the corresponding Cucumber documentation for details.
     def ssoc comparison
       TestCountFilter.new([CukeModeler::Scenario, CukeModeler::Outline], comparison)
     end
 
+    # Adds an *sc* filter to the query. See the corresponding Cucumber documentation for details.
     def sc comparison
       TestCountFilter.new([CukeModeler::Scenario], comparison)
     end
 
+    # Adds an *soc* filter to the query. See the corresponding Cucumber documentation for details.
     def soc comparison
       TestCountFilter.new([CukeModeler::Outline], comparison)
     end
 
+    # Adds a *gt* filter operator to the query. See the corresponding Cucumber documentation for details.
     def gt amount
       Comparison.new '>', amount
     end
 
+    # Adds a *gte* filter operator to the query. See the corresponding Cucumber documentation for details.
     def gte amount
       Comparison.new '>=', amount
     end
 
+    # Adds an *lt* filter operator to the query. See the corresponding Cucumber documentation for details.
     def lt amount
       Comparison.new '<', amount
     end
 
+    # Adds an *lte* filter operator to the query. See the corresponding Cucumber documentation for details.
     def lte amount
       Comparison.new '<=', amount
     end
 
+    # Adds a *tags* filter to the query. See the corresponding Cucumber documentation for details.
     def tags *tags
       return "tags" if tags.size == 0
 
       TagFilter.new tags
     end
 
+
+    private
+
+
     def translate_shorthand(where)
       where.split('_').map(&:capitalize).join
     end

data/lib/cql/feature_filters.rb

@@ -3,8 +3,10 @@ require 'cql/filters'
 
 module CQL
 
+  # Not a part of the public API. Subject to change at any time.
   class TestCountFilter < TypeCountFilter
 
+    # Counts the numbers of tests of a certain type
     def type_count(feature)
       feature.tests.find_all { |test| types.include?(test.class) }.size
     end

data/lib/cql/filters.rb

@@ -1,5 +1,6 @@
 module CQL
 
+  # Not a part of the public API. Subject to change at any time.
   class TagFilter
     attr_reader :tags
 
@@ -15,6 +16,7 @@ module CQL
       }
     end
 
+    # Filters the input models so that only the desired ones are returned
     def execute(objects, negate)
       method = negate ? :reject : :select
 
@@ -23,6 +25,7 @@ module CQL
 
   end
 
+  # Not a part of the public API. Subject to change at any time.
   class ContentMatchFilter
     attr_reader :pattern
 
@@ -42,6 +45,7 @@ module CQL
 
   end
 
+  # Not a part of the public API. Subject to change at any time.
   class TypeCountFilter
     attr_reader :types, :comparison
 
@@ -50,6 +54,8 @@ module CQL
       @comparison = comparison
     end
 
+    # Not a part of the public API. Subject to change at any time.
+    # Filters the input models so that only the desired ones are returned
     def execute(input, negate)
       method = negate ? :reject : :select
 
@@ -60,8 +66,10 @@ module CQL
 
   end
 
+  # Not a part of the public API. Subject to change at any time.
   class NameFilter < ContentMatchFilter
 
+    # Filters the input models so that only the desired ones are returned
     def execute(input, negate)
       method = negate ? :reject : :select
 
@@ -72,8 +80,11 @@ module CQL
 
   end
 
+
+  # Not a part of the public API. Subject to change at any time.
   class TagCountFilter < TypeCountFilter
 
+    # Counts the numbers of tags on a test
     def type_count(test)
       test.tags.size
     end

data/lib/cql/map_reduce.rb

@@ -6,10 +6,13 @@ require 'cql/dsl'
 
 module CQL
 
+  # Not a part of the public API. Subject to change at any time.
   class MapReduce
 
     extend Dsl
 
+
+    # Recursively gathers all models that match the given targets and filters
     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) }
 

data/lib/cql/model_dsl.rb

@@ -1,13 +1,19 @@
-# todo - add some sore of error/warning if loading with the 0.x cuke_modeler?
+# todo - add some sort of error/warning if loading with the 0.x cuke_modeler?
 
 module CukeModeler
+
+  # A monkey patch that allows models to be queried directly by having them use this gem's query module.
+
   class Model
 
     include CQL::Queriable
 
+
+    # Hanging on to the original method so that it can be invoked and thus ensure that all of the normal, un-patched behavior occurs
     alias_method :original_initialize, :initialize
 
 
+    # Sets itself as the model's *query_root*. Otherwise, as per the un-patched method.
     def initialize(source_text = nil)
       original_initialize(source_text)
 

data/lib/cql/queriable.rb

@@ -1,9 +1,14 @@
 module CQL
+
+  # A mix-in module containing methods used by objects that want to be able to run queries against objects (often themselves).
+
   module Queriable
 
-    attr_accessor :query_root
+    # The object against which the query will be run.
+    attr_accessor :query_root # todo - deprecate this such that queries are always performed against *self*
 
 
+    # Performs a query against the current *query_root*
     def query(&block)
       raise(ArgumentError, 'Query cannot be run. No query root has been set.') unless @query_root
 

data/lib/cql/query.rb

@@ -0,0 +1,154 @@
+module CQL
+
+  # Not a part of the public API. Subject to change at any time.
+  class Query
+
+    include Dsl
+
+    attr_reader :data, :what
+
+
+    def initialize(directory, &block)
+      # Set root object
+      @data = directory
+
+      # 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
+
+      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)
+
+      # Extract properties from gathered objects
+      @data = format_output(@data)
+    end
+
+
+    private
+
+
+    def format_output(data)
+      format_data(data)
+    end
+
+    def format_data data
+      space_data
+
+      Array.new.tap do |result_array|
+        data.each do |element|
+          result_array << Hash.new.tap do |result|
+            @what.each_with_index do |attribute, index|
+              key = determine_key(attribute, index)
+              value = determine_value(element, attribute, index)
+
+              result[key] = value
+            end
+          end
+        end
+      end
+    end
+
+    def determine_key(attribute, index)
+      key = mapped_attribute(@name_transforms, attribute, index) if @name_transforms
+
+      key || attribute
+    end
+
+    def determine_value(element, attribute, index)
+      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)
+        value = value.call(original_value) if value.is_a?(Proc)
+      end
+
+      value || original_value
+    end
+
+    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, :model
+          val = element
+        else
+          raise(ArgumentError, ":#{attribute} is not a valid attribute for selection.")
+      end
+
+      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)
+          value = mappings[location]
+        when mappings.is_a?(Hash)
+          if mappings[attribute]
+            value = mappings[attribute][location]
+          end
+        else
+          raise(ArgumentError, "Unknown mapping type '#{mappings.class}'")
+      end
+
+      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
+end

data/lib/cql/repository.rb

@@ -0,0 +1,24 @@
+module CQL
+
+# A repository is a group of models. See the corresponding Cucumber documentation for details.
+
+  class Repository
+
+    include Queriable
+
+
+    def initialize(repository_root)
+      case
+        when repository_root.is_a?(String)
+          root = CukeModeler::Directory.new(repository_root)
+        when repository_root.class.to_s =~ /CukeModeler/
+          root = repository_root
+        else
+          raise(ArgumentError, "Don't know how to make a repository from a #{repository_root.class}")
+      end
+
+      @query_root = root
+    end
+
+  end
+end

data/lib/cql/sso_filters.rb

@@ -3,16 +3,20 @@ require 'cql/filters'
 
 module CQL
 
+  # Not a part of the public API. Subject to change at any time.
   class SsoLineCountFilter < TypeCountFilter
 
+    # Counts the numbers of steps on a test
     def type_count(test)
       test.steps.size
     end
 
   end
 
+  # Not a part of the public API. Subject to change at any time.
   class LineFilter < ContentMatchFilter
 
+    # Filters the input models so that only the desired ones are returned
     def execute(input, negate)
       method_for_filtering = negate ? :reject : :select
       method_for_text = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :base : :text

data/lib/cql/version.rb

@@ -1,3 +1,4 @@
 module CQL
-  VERSION = '1.4.0'
+  # The current version of the gem
+  VERSION = '1.4.1'
 end

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

@@ -2,12 +2,14 @@ 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
+  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'.
 
@@ -15,8 +17,8 @@ Feature: 'as' 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
 
@@ -36,7 +38,6 @@ Feature: 'as' clause'
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'as' to change the name under which values are returned

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

@@ -4,22 +4,26 @@ Feature: 'from' clause
 
   The following are some example values:
 
-  CukeModeler::Outline  (exact class)
-  outline               (singular)
-  outlines              (pluralized)
-
-    Sample usage:
-      cql_repo.query do
-        select name
-        from scenarios
-      end
+  ````
+  CukeModeler::Outline  # exact class
+  outline               # singular
+  outlines              # pluralized
+  ````
+
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name
+    from scenarios
+  end
+  ````
 
   This clause can be repeated multiple times. The arguments for successive clauses are simply added to the previous arguments.
 
 
   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
 
@@ -39,7 +43,6 @@ Feature: 'from' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'from' to specify what kind of objects from which to return attributes

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

@@ -2,18 +2,20 @@ Feature: 'select' clause
 
   The *select* clause specifies what attributes will be retrieved from the models specified by the *from* clause. Multiple values can be given and they are delimited by a comma. The *select* clause can take any method to which the objects specified by *from* know how to respond. The clause can also be given a special identifier in order to return the underlying models themselves instead of their attributes. If no attributes are specified then the underlying model will be returned instead, just as if the special identifier had been used (it is simply an alternate syntax and may look nicer in some queries).
 
-    Sample usage:
-      cql_repo.query do
-        select name, tags, description_text
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name, tags, description_text
+    from features
+  end
+  ````
 
   This clause can be repeated multiple times. The arguments for successive clauses are simply added to the previous arguments.
 
 
-  Background: A sample Cucumber suite
-    Given a directory "test_directory"
-    And a file "test_directory/test_file_1.feature":
+  Background: Repository with models
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -33,7 +35,6 @@ Feature: 'select' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'select' to specify which attributes of an object to return

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

@@ -2,20 +2,22 @@ Feature: 'transform' clause
 
   The *transform* clause allows you to change the values of the attributes specified by the *select* clause after they are gathered. Value transforming can be done as a list of transformation blocks that are applied in order or as a mapping of specific keys and their transformations.
 
-    Sample usage:
-      cql_repo.query do
-        select name
-        transform { |name| name.upcase }
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name
+    transform { |name| name.upcase }
+    from features
+  end
+  ````
 
   This will return a list of all of the feature names but with all of their names upcased.
 
   This clause can be repeated multiple times. When using lists of transforms, the arguments for successive clauses are simply added to the previous arguments. When using mapped transforms, 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":
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -35,7 +37,6 @@ Feature: 'transform' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'transform' to change values after they are gathered

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

@@ -3,13 +3,15 @@ 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).
 
-    Sample usage:
-      cql_repo.query do
-        select name, tags, description_text
-        from features
-        with { |feature| feature.name =~ /foo/ }
-        with tc lt 3
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    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.
 

data/testing/cucumber/features/dsl.feature

@@ -2,22 +2,25 @@ Feature: DSL
 
   The cql gem uses a DSL to specify queries on a repository object that holds the models which represent a Cucumber test suite. The DSL can query for any attribute that is available on the underlying models.
 
-    Sample usage:
-      cql_repo.query do
-        select name, source_line
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name, source_line
+    from features
+  end
+  ````
 
   Query results are returned as a list of attribute mappings for all of the models found in the repository. The sample query above might return:
 
-    [{'name' => 'Feature 1', 'source_line' => 1},
-    {'name' => 'Feature 2', 'source_line' => 3},
-    {'name' => 'Feature 3', 'source_line' => 10}]
-
+  ````
+  [{'name' => 'Feature 1', 'source_line' => 1},
+  {'name' => 'Feature 2', 'source_line' => 3},
+  {'name' => 'Feature 3', 'source_line' => 10}]
+  ````
 
   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
 
@@ -37,7 +40,7 @@ Feature: DSL
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
+
 
   Scenario: Automatic string conversion
 

data/testing/cucumber/step_definitions/setup_steps.rb

@@ -1,17 +1,5 @@
 Given(/^a directory "([^"]*)"$/) do |partial_directory_path|
-  directory_path = partial_directory_path.include?('path/to') ? process_path(partial_directory_path) : "#{@default_file_directory}/#{partial_directory_path}"
-
-  FileUtils.mkpath(directory_path) unless File.exists?(directory_path)
-end
-
-And(/^a file "([^"]*)":$/) do |partial_file_path, file_text|
-  File.open("#{@default_file_directory}/#{partial_file_path}", 'w') { |file| file.write file_text }
-end
-
-And(/^a repository is made from "([^"]*)"$/) do |partial_path|
-  repo_path = "#{@default_file_directory}/#{partial_path}"
-
-  @repository = CQL::Repository.new(repo_path)
+  create_path(partial_directory_path)
 end
 
 Given(/^the models provided by CukeModeler$/) do

data/testing/cucumber/step_definitions/verification_steps.rb

@@ -41,7 +41,7 @@ Then(/^the result is the same as the result of the following query:$/) do |query
 end
 
 Then(/^the following code executes without error:$/) do |code_text|
-  code_text = process_path(code_text)
+  code_text.sub!('path/to', @temp_dir)
 
   expect { eval(code_text) }.to_not raise_error
 end

data/testing/cucumber/support/env.rb

@@ -3,22 +3,22 @@ unless RUBY_VERSION.to_s < '1.9.0'
   SimpleCov.command_name('cql-cucumber')
 end
 
+require 'tmpdir'
 
 require 'cql'
 require 'cql/model_dsl'
 
 
-Before do
-  @default_file_directory = "#{File.dirname(__FILE__)}/../temp_files"
-
-  FileUtils.mkdir(@default_file_directory)
-end
-
 After do
-  FileUtils.remove_dir(@default_file_directory, true)
+  FileUtils.remove_dir(@temp_dir, true) if @temp_dir
 end
 
 
-def process_path(path)
-  path.sub('path/to', @default_file_directory)
+def create_path(path)
+  @temp_dir ||= Dir.mktmpdir
+  path = path.sub('path/to/', "#{@temp_dir}/")
+
+  Dir.mkdir(path)
+
+  path
 end

data/testing/gemfiles/cuke_modeler0.gemfile

@@ -20,6 +20,7 @@ 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
 
   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

data/testing/gemfiles/cuke_modeler1.gemfile

@@ -20,6 +20,7 @@ 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
 
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Eric Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuke_modeler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,8 @@ files:
 - lib/cql/map_reduce.rb
 - lib/cql/model_dsl.rb
 - lib/cql/queriable.rb
+- lib/cql/query.rb
+- lib/cql/repository.rb
 - lib/cql/sso_filters.rb
 - lib/cql/version.rb
 - testing/cql_test_model.rb