cucumber_factory 1.14.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdeea41c773feb6d2c05b8166797af8a6793393937c525e68a43973d4d26f5eb
-  data.tar.gz: 39dd9632417d2181dc873a262a93305bc75ead63e0ac244b1851865c477ee99e
+  metadata.gz: c9be7d49c33814f02f79d18b4a92eb3f5af05de9bd8b8b0a38305e2113763e0c
+  data.tar.gz: a446cbe7440b4fb9f0841133dd655d1fd332e2eace463297d484fa40d5849ffd
 SHA512:
-  metadata.gz: b8c7851c81677ddbce263a03b5e7cdca73d57611198c084168f7fda3c5f24ebd489fdead26b02a3086385919fc979735932ef1062b4e196ebd305a64b43dbc7b
-  data.tar.gz: 548ac3a75c7c7c1db66e43f4ebae7c140de13215bc9a5f0bf6795ebcd059be28fba1bd820d5fe078162afbd61fbdb21d6621b7b5186ec507f45ce01371216f43
+  metadata.gz: 2bb70ead6e5bcb857d6c887ae4b5ec5a1f0b95f93d550c1e90a45c97c2a88f16733f4abf47fa5ded2242400c2e97e40d2a6c70835439b2b273ed290831af236e
+  data.tar.gz: c5dc17e7f963b9a7c5a0e6d1e128bc5024a5e547737e4f1148e60ee47b3dbf48d7a7db5422e5481ddaae0558092cd7faaa957ea370de233bfc5bff7f94904087

data/.travis.yml

@@ -4,32 +4,31 @@ rvm:
   - 2.5.3
 
 gemfile:
-  - gemfiles/Gemfile.cucumber-1.3
-  - gemfiles/Gemfile.cucumber-2.4
-  - gemfiles/Gemfile.cucumber-3.0
-  - gemfiles/Gemfile.cucumber-3.1
+  - Gemfile.cucumber-1.3
+  - Gemfile.cucumber-2.4
+  - Gemfile.cucumber-3.0
+  - Gemfile.cucumber-3.1
 
 matrix:
   exclude:
-    - gemfile: gemfiles/Gemfile.cucumber-3.1
+    - gemfile: Gemfile.cucumber-3.1
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.cucumber-3.1
+    - gemfile: Gemfile.cucumber-3.1
       rvm: 2.1.10 # cucumber 3 wants ruby >= 2.2
-    - gemfile: gemfiles/Gemfile.cucumber-3.0
+    - gemfile: Gemfile.cucumber-3.0
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.cucumber-3.0
+    - gemfile: Gemfile.cucumber-3.0
       rvm: 2.1.10 # cucumber 3 wants ruby >= 2.2
-    - gemfile: gemfiles/Gemfile.cucumber-2.4
+    - gemfile: Gemfile.cucumber-2.4
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.cucumber-1.3
+    - gemfile: Gemfile.cucumber-1.3
       rvm: 2.5.3 # doesn't work with old RSpec
-    - gemfile: gemfiles/Gemfile.cucumber-1.3
+    - gemfile: Gemfile.cucumber-1.3
       rvm: 2.1.10 # doesn't work with old RSpec
 
 install:
   # Replace default Travis CI bundler script with a version that doesn't
   # explode when lockfile doesn't match recently bumped version
-  - gem update --system
   - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 
 before_script:

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+## 1.15.0 - 2019-02-08
+
+### Breaking changes
+
+- Moved gem's code from `Cucumber` module into `CucumberFactory` module.
+- Instead of calling `Cucumber::Factory.add_steps(self)`, `require 'cucumber_factory/add_steps'` instead.
+
+
+## 1.14.2 - 2018-10-31
+
+### Compatible changes
+
+- Replace deprecated `Fixnum` with `Integer`
+
+
+## 1.14.1 - 2018-10-26
+
+### Compatible changes
+
+- Allow to refer to previously set foreign keys
+
+
+## 1.14.0 - 2018-10-26
+
+### Compatible changes
+
+- Allow to set numbers without quotes
+- Support array fields out of the box
+- Allow to set has_many associations with square bracket notation
+
+
+## 1.13.0 - 2018-04-26
+
+### Compatible changes
+
+- Support multi line attribute assignment
+
+
+## 1.12.0 - 2018-04-26
+
+### Compatible changes
+
+- Support for Cucumber 3.0 and 3.1
+
+
+## Previous releases
+
+- See [GitHub](https://github.com/makandra/cucumber_factory/commits/master)

data/Gemfile

@@ -1 +1 @@
-./gemfiles/Gemfile.cucumber-2.4
+./Gemfile.cucumber-2.4

data/{gemfiles/Gemfile.cucumber-1.3 → Gemfile.cucumber-1.3}

@@ -14,4 +14,4 @@ gem 'database_cleaner', '~>1.0.0'
 gem 'gemika'
 
 # Gem under test
-gem 'cucumber_factory', :path => '..'
+gem 'cucumber_factory', :path => '.'

data/{gemfiles/Gemfile.cucumber-1.3.lock → Gemfile.cucumber-1.3.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: .
   specs:
-    cucumber_factory (1.14.2)
+    cucumber_factory (1.15.0)
       activerecord
       activesupport
       cucumber

data/{gemfiles/Gemfile.cucumber-2.4 → Gemfile.cucumber-2.4}

@@ -13,4 +13,4 @@ gem 'database_cleaner'
 gem 'gemika'
 
 # Gem under test
-gem 'cucumber_factory', :path => '..'
+gem 'cucumber_factory', :path => '.'

data/{gemfiles/Gemfile.cucumber-2.4.lock → Gemfile.cucumber-2.4.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: .
   specs:
-    cucumber_factory (1.14.2)
+    cucumber_factory (1.15.0)
       activerecord
       activesupport
       cucumber

data/{gemfiles/Gemfile.cucumber-3.0 → Gemfile.cucumber-3.0}

@@ -13,4 +13,4 @@ gem 'database_cleaner'
 gem 'gemika'
 
 # Gem under test
-gem 'cucumber_factory', :path => '..'
+gem 'cucumber_factory', :path => '.'

data/{gemfiles/Gemfile.cucumber-3.0.lock → Gemfile.cucumber-3.0.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: .
   specs:
-    cucumber_factory (1.14.2)
+    cucumber_factory (1.15.0)
       activerecord
       activesupport
       cucumber

data/{gemfiles/Gemfile.cucumber-3.1 → Gemfile.cucumber-3.1}

@@ -13,4 +13,4 @@ gem 'database_cleaner'
 gem 'gemika'
 
 # Gem under test
-gem 'cucumber_factory', :path => '..'
+gem 'cucumber_factory', :path => '.'

data/{gemfiles/Gemfile.cucumber-3.1.lock → Gemfile.cucumber-3.1.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: .
   specs:
-    cucumber_factory (1.14.2)
+    cucumber_factory (1.15.0)
       activerecord
       activesupport
       cucumber

data/Gemfile.lock

@@ -1 +1 @@
-./gemfiles/Gemfile.cucumber-2.4.lock
+./Gemfile.cucumber-2.4.lock

data/README.md

@@ -180,7 +180,7 @@ In your `Gemfile` say:
 
 Now create a file `features/step_definitions/factory_steps.rb`, which just says
 
-    Cucumber::Factory.add_steps(self)
+    require 'cucumber_factory/add_steps'
 
 Now run `bundle install` and restart your server.
 

data/lib/cucumber_factory.rb

@@ -12,5 +12,19 @@ end
 require 'cucumber_priority'
 
 # Gem
-require 'cucumber/factory'
+require 'cucumber_factory/build_strategy'
+require 'cucumber_factory/factory'
 require 'cucumber_factory/switcher'
+
+module Cucumber
+  module Factory
+    module_function
+
+    def add_steps(main)
+      warn "Using `Cucumber::Factory.add_steps(self)` is deprecated. Use `require 'cucumber_factory/add_steps'` instead."
+
+      add_steps_filepath = File.join(File.dirname(__FILE__), 'cucumber_factory/add_steps.rb')
+      main.instance_eval(File.read(add_steps_filepath))
+    end
+  end
+end

data/lib/cucumber_factory/add_steps.rb

@@ -0,0 +1 @@
+CucumberFactory::Factory.add_steps(self)

data/lib/cucumber_factory/build_strategy.rb

@@ -0,0 +1,108 @@
+module CucumberFactory
+
+  # wraps machinist / factory_bot / ruby object logic
+
+  class BuildStrategy
+
+    class << self
+
+      def from_prose(model_prose, variant_prose)
+        # don't use \w which depends on the system locale
+        underscored_model_name = model_prose.gsub(/[^A-Za-z0-9_\/]+/, "_")
+        if variant_prose.present?
+          variants = /\((.*?)\)/.match(variant_prose)[1].split(/\s*,\s*/)
+          variants = variants.collect { |variant| variant.downcase.gsub(" ", "_") }
+        else
+          variants = []
+        end
+
+        if factory_bot_strategy = factory_bot_strategy(underscored_model_name, variants)
+          factory_bot_strategy
+        else
+          model_class = underscored_model_name.camelize.constantize
+          machinist_strategy(model_class, variants) ||
+            active_record_strategy(model_class) ||
+            ruby_object_strategy(model_class)
+        end
+      end
+
+      private
+
+      def factory_bot_strategy(factory_name, variants)
+        factory_class   = ::FactoryBot  if defined?(FactoryBot)
+        factory_class ||= ::FactoryGirl if defined?(FactoryGirl)
+        return unless factory_class
+
+        variants = variants.map(&:to_sym)
+        factory_name = factory_name.to_s.underscore.gsub('/', '_').to_sym
+
+        factory = factory_class.factories[factory_name]
+
+        if factory.nil? && variants.present? && factory = factory_class.factories[variants[0]]
+          factory_name, *variants = variants
+        end
+
+        if factory
+          new(factory.build_class) do |attributes|
+            # Cannot have additional scalar args after a varargs
+            # argument in Ruby 1.8 and 1.9
+            args = []
+            args += variants
+            args << attributes
+            factory_class.create(factory_name, *args)
+          end
+        end
+
+      end
+
+      def machinist_strategy(model_class, variants)
+        if model_class.respond_to?(:make)
+
+          new(model_class) do |attributes|
+            if variants.present?
+              variants.size == 1 or raise 'Machinist only supports a single variant per blueprint'
+              model_class.make(variants.first.to_sym, attributes)
+            else
+              model_class.make(attributes)
+            end
+          end
+
+        end
+      end
+
+      def active_record_strategy(model_class)
+        if model_class.respond_to?(:create!)
+
+          new(model_class) do |attributes|
+            model = model_class.new
+            CucumberFactory::Switcher.assign_attributes(model, attributes)
+            model.save!
+            model
+          end
+
+        end
+      end
+
+      def ruby_object_strategy(model_class)
+        new(model_class) do |attributes|
+          model_class.new(attributes)
+        end
+      end
+
+    end
+
+
+    attr_reader :model_class
+
+    def initialize(model_class, &block)
+      @model_class = model_class
+      @create_proc = block
+    end
+
+    def create_record(attributes)
+      @create_proc.call(attributes)
+    end
+
+  end
+
+end

data/lib/{cucumber → cucumber_factory}/factory.rb

@@ -1,7 +1,5 @@
-require 'cucumber/factory/build_strategy'
-
-module Cucumber
-  class Factory
+module CucumberFactory
+  module Factory
     class Error < StandardError; end
 
     ATTRIBUTES_PATTERN = '( with the .+?)?( (?:which|who|that) is .+?)?'
@@ -22,7 +20,7 @@ module Cucumber
 
     CLEAR_NAMED_RECORDS_STEP_DESCRIPTOR = {
       :kind => :Before,
-      :block => proc { Cucumber::Factory.send(:reset_named_records, self) }
+      :block => proc { CucumberFactory::Factory.send(:reset_named_records, self) }
     }
 
     # We cannot use vararg blocks in the descriptors in Ruby 1.8, as explained by
@@ -32,26 +30,26 @@ module Cucumber
     NAMED_CREATION_STEP_DESCRIPTOR = {
       :kind => :Given,
       :pattern => /^#{NAMED_RECORD_PATTERN}#{ATTRIBUTES_PATTERN}?$/,
-      :block => lambda { |a1, a2, a3, a4, a5| Cucumber::Factory.send(:parse_named_creation, self, a1, a2, a3, a4, a5) }
+      :block => lambda { |a1, a2, a3, a4, a5| CucumberFactory::Factory.send(:parse_named_creation, self, a1, a2, a3, a4, a5) }
     }
 
     CREATION_STEP_DESCRIPTOR = {
       :kind => :Given,
       :pattern => /^#{RECORD_PATTERN}#{ATTRIBUTES_PATTERN}$/,
-      :block => lambda { |a1, a2, a3, a4| Cucumber::Factory.send(:parse_creation, self, a1, a2, a3, a4) }
+      :block => lambda { |a1, a2, a3, a4| CucumberFactory::Factory.send(:parse_creation, self, a1, a2, a3, a4) }
     }
 
     NAMED_CREATION_STEP_DESCRIPTOR_WITH_TEXT_ATTRIBUTES = {
       :kind => :Given,
       :pattern => /^"#{NAMED_RECORD_PATTERN}#{ATTRIBUTES_PATTERN}#{TEXT_ATTRIBUTES_PATTERN}?$/,
-      :block => lambda { |a1, a2, a3, a4, a5, a6| Cucumber::Factory.send(:parse_named_creation, self, a1, a2, a3, a4, a5, a6) },
+      :block => lambda { |a1, a2, a3, a4, a5, a6| CucumberFactory::Factory.send(:parse_named_creation, self, a1, a2, a3, a4, a5, a6) },
       :priority => true
     }
 
     CREATION_STEP_DESCRIPTOR_WITH_TEXT_ATTRIBUTES = {
       :kind => :Given,
       :pattern => /^#{RECORD_PATTERN}#{ATTRIBUTES_PATTERN}#{TEXT_ATTRIBUTES_PATTERN}$/,
-      :block => lambda { |a1, a2, a3, a4, a5| Cucumber::Factory.send(:parse_creation, self, a1, a2, a3, a4, a5) },
+      :block => lambda { |a1, a2, a3, a4, a5| CucumberFactory::Factory.send(:parse_creation, self, a1, a2, a3, a4, a5) },
       :priority => true
     }
 
@@ -94,12 +92,12 @@ module Cucumber
       def set_named_record(world, name, record)
         named_records(world)[name] = record
       end
-  
+
       def parse_named_creation(world, name, raw_model, raw_variant, raw_attributes, raw_boolean_attributes, raw_multiline_attributes = nil)
         record = parse_creation(world, raw_model, raw_variant, raw_attributes, raw_boolean_attributes, raw_multiline_attributes)
         set_named_record(world, name, record)
       end
-    
+
       def parse_creation(world, raw_model, raw_variant, raw_attributes, raw_boolean_attributes, raw_multiline_attributes = nil)
         build_strategy = BuildStrategy.from_prose(raw_model, raw_variant)
         model_class = build_strategy.model_class

data/lib/cucumber_factory/version.rb

@@ -1,3 +1,3 @@
 module CucumberFactory
-  VERSION = '1.14.2'
+  VERSION = '1.15.0'
 end

data/spec/cucumber_factory/factory/build_strategy_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Cucumber::Factory::BuildStrategy do
+describe CucumberFactory::BuildStrategy do
 
-  subject { Cucumber::Factory::BuildStrategy }
+  subject { CucumberFactory::BuildStrategy }
 
   # most of the behaviour is integration tested in steps_spec.rb
 

data/spec/support/cucumber_helper.rb

@@ -17,7 +17,8 @@ def prepare_cucumber_example
     @main.extend(Cucumber::RbSupport::RbDsl)
   end
 
-  Cucumber::Factory.add_steps(@main)
+  add_steps_filepath = File.expand_path(File.join(File.dirname(__FILE__), '../../lib/cucumber_factory/add_steps.rb'))
+  @main.instance_eval(File.read(add_steps_filepath))
 end
 
 def invoke_cucumber_step(step, doc_string = nil, data_table = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_factory
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -77,23 +77,25 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
+- Gemfile.cucumber-1.3
+- Gemfile.cucumber-1.3.lock
+- Gemfile.cucumber-2.4
+- Gemfile.cucumber-2.4.lock
+- Gemfile.cucumber-3.0
+- Gemfile.cucumber-3.0.lock
+- Gemfile.cucumber-3.1
+- Gemfile.cucumber-3.1.lock
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - cucumber_factory.gemspec
-- gemfiles/Gemfile.cucumber-1.3
-- gemfiles/Gemfile.cucumber-1.3.lock
-- gemfiles/Gemfile.cucumber-2.4
-- gemfiles/Gemfile.cucumber-2.4.lock
-- gemfiles/Gemfile.cucumber-3.0
-- gemfiles/Gemfile.cucumber-3.0.lock
-- gemfiles/Gemfile.cucumber-3.1
-- gemfiles/Gemfile.cucumber-3.1.lock
-- lib/cucumber/factory.rb
-- lib/cucumber/factory/build_strategy.rb
 - lib/cucumber_factory.rb
+- lib/cucumber_factory/add_steps.rb
+- lib/cucumber_factory/build_strategy.rb
+- lib/cucumber_factory/factory.rb
 - lib/cucumber_factory/switcher.rb
 - lib/cucumber_factory/version.rb
 - spec/cucumber_factory/factory/build_strategy_spec.rb

data/lib/cucumber/factory/build_strategy.rb

@@ -1,110 +0,0 @@
-module Cucumber
-  class Factory
-
-    # wraps machinist / factory_bot / ruby object logic
-
-    class BuildStrategy
-
-      class << self
-
-        def from_prose(model_prose, variant_prose)
-          # don't use \w which depends on the system locale
-          underscored_model_name = model_prose.gsub(/[^A-Za-z0-9_\/]+/, "_")
-          if variant_prose.present?
-            variants = /\((.*?)\)/.match(variant_prose)[1].split(/\s*,\s*/)
-            variants = variants.collect { |variant| variant.downcase.gsub(" ", "_") }
-          else
-            variants = []
-          end
-
-          if factory_bot_strategy = factory_bot_strategy(underscored_model_name, variants)
-            factory_bot_strategy
-          else
-            model_class = underscored_model_name.camelize.constantize
-            machinist_strategy(model_class, variants) ||
-              active_record_strategy(model_class) ||
-              ruby_object_strategy(model_class)
-          end
-        end
-
-        private
-
-        def factory_bot_strategy(factory_name, variants)
-          factory_class   = ::FactoryBot  if defined?(FactoryBot)
-          factory_class ||= ::FactoryGirl if defined?(FactoryGirl)
-          return unless factory_class
-
-          variants = variants.map(&:to_sym)
-          factory_name = factory_name.to_s.underscore.gsub('/', '_').to_sym
-
-          factory = factory_class.factories[factory_name]
-
-          if factory.nil? && variants.present? && factory = factory_class.factories[variants[0]]
-            factory_name, *variants = variants
-          end
-
-          if factory
-            new(factory.build_class) do |attributes|
-              # Cannot have additional scalar args after a varargs
-              # argument in Ruby 1.8 and 1.9
-              args = []
-              args += variants
-              args << attributes
-              factory_class.create(factory_name, *args)
-            end
-          end
-
-        end
-
-        def machinist_strategy(model_class, variants)
-          if model_class.respond_to?(:make)
-
-            new(model_class) do |attributes|
-              if variants.present?
-                variants.size == 1 or raise 'Machinist only supports a single variant per blueprint'
-                model_class.make(variants.first.to_sym, attributes)
-              else
-                model_class.make(attributes)
-              end
-            end
-
-          end
-        end
-
-        def active_record_strategy(model_class)
-          if model_class.respond_to?(:create!)
-
-            new(model_class) do |attributes|
-              model = model_class.new
-              CucumberFactory::Switcher.assign_attributes(model, attributes)
-              model.save!
-              model
-            end
-
-          end
-        end
-
-        def ruby_object_strategy(model_class)
-          new(model_class) do |attributes|
-            model_class.new(attributes)
-          end
-        end
-
-      end
-
-
-      attr_reader :model_class
-
-      def initialize(model_class, &block)
-        @model_class = model_class
-        @create_proc = block
-      end
-
-      def create_record(attributes)
-        @create_proc.call(attributes)
-      end
-
-    end
-
-  end
-end