pickle 0.5.1 → 0.6.0

data/features/app/factories.rb

@@ -1,13 +1,13 @@
 # Factories
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   sequence :fork_name do |n|
     "fork %d04" % n
   end
 
   factory :fork do |f|
-    f.name { FactoryGirl.generate(:fork_name) }
+    f.name { FactoryBot.generate(:fork_name) }
   end
 
   factory :tine do |t|
@@ -16,10 +16,10 @@ FactoryGirl.define do
 
   factory :rusty_tine, :class => Tine do |t|
     t.association :fork
-    t.rusty true
+    t.rusty { true }
   end
 
   factory :fancy_fork, :class => Fork do |t|
-    t.name { "Fancy " + FactoryGirl.generate(:fork_name) }
+    t.name { "Fancy " + FactoryBot.generate(:fork_name) }
   end
 end

data/features/email/email.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: I can test emails are sent
   In order write features with emails as outcomes
   As a feature writer

data/features/step_definitions/email_steps.rb

@@ -0,0 +1 @@
+../../rails_generators/pickle/templates/email_steps.rb

data/features/step_definitions/extra_email_steps.rb

@@ -1,12 +1,12 @@
 Given(/^an email "(.*?)" with body: "(.*?)" is delivered to (.+?)$/) do |subject, body, to|
-  Notifier.email(to, subject, body).deliver
+  Notifier.email(to, subject, body).deliver_now
 end
 
 Given(/^an email with a link "(.+?)" to (.+?) is delivered to (.+?)$/) do |text, page, to|
-  body = "some text <a href='http://example.com/#{path_to(page)}'>#{text}</a> more text" 
-  Notifier.email(to, "example", body).deliver
+  body = "some text <a href='http://example.com/#{path_to(page)}'>#{text}</a> more text"
+  Notifier.email(to, "example", body).deliver_now
 end
 
 Given(/^#{capture_model}'s email is delivered$/) do |model|
-  Notifier.user_email(model!(model)).deliver
-end
+  Notifier.user_email(model!(model)).deliver_now
+end

data/features/step_definitions/pickle_steps.rb

@@ -0,0 +1 @@
+../../rails_generators/pickle/templates/pickle_steps.rb

data/features/support/email.rb

@@ -0,0 +1 @@
+../../rails_generators/pickle/templates/email.rb

data/features/support/env.rb

@@ -1,14 +1,20 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
 ENV["RAILS_ENV"] ||= "test"
 ENV["RAILS_ROOT"] ||= File.expand_path(File.dirname(__FILE__) + '/../../cucumber_test_app')
 
+Bundler.setup
+
+require 'simplecov'
+require 'codecov'
+SimpleCov.formatter = SimpleCov::Formatter::Codecov
+
 require 'capybara'
 require 'cucumber/rails'
 Capybara.default_selector = :css
 ActionController::Base.allow_rescue = false
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :truncation

data/features/support/pickle.rb

@@ -7,9 +7,9 @@
 #    require 'machinist/active_record' # or your chosen adaptor
 #    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
 #
-# For FactoryGirl add: features/support/factory_girl.rb
+# For FactoryBot add: features/support/factory_bot.rb
 #
-#    require 'factory_girl'
+#    require 'factory_bot'
 #    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
 #
 # For Fabrication, just include it in the adapter list when configuring pickle as explained below.

data/gemfiles/Gemfile-rails.5.0.x

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 5.0.2"
+gem "cucumber", "~> 3.2.0"
+gem "sqlite3", "~> 1.3.6"
+
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.5.1.x

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 5.1.0"
+gem "cucumber", "~> 3.2"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.5.2.x

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 5.2.0"
+gem "cucumber", "~> 3.2.0"
+
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.5.2.x-cukes-4

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 5.2.0"
+gem "cucumber", "~> 4.0"
+
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.5.2.x-cukes-5

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 5.2.0"
+gem "cucumber", "~> 5.0"
+gem "cucumber-rails", github: 'cucumber/cucumber-rails', branch: 'cucumber5'
+
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.6.0.x

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "activerecord", "~> 6.0.0"
+gem "cucumber", "~> 4.1"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.6.0.x-cukes-5

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", "~> 6.0.0"
+gem "cucumber", "~> 5.0"
+gem "cucumber-rails", github: 'cucumber/cucumber-rails', branch: 'cucumber5'
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.edge

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
+gemspec :path => ".."
+
+gem "rails", :github => "rails/rails"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/lib/pickle.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'pickle/version'
 require 'pickle/adapter'
 require 'pickle/config'

data/lib/pickle/adapter.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext'
-
 module Pickle
   # Abstract Factory adapter class, if you have a factory type setup, you
   # can easily create an adaptor to make it work with Pickle.
@@ -100,11 +98,11 @@ module Pickle
     end
 
     # factory-girl adapter
-    class FactoryGirl < Adapter
+    class FactoryBot < Adapter
       def self.factories
-        if defined? ::FactoryGirl
+        if defined? ::FactoryBot
           factories = []
-          ::FactoryGirl.factories.each do |factory|
+          ::FactoryBot.factories.each do |factory|
             factory.names.each do |name|
               factories << new(factory, name)
             end
@@ -116,7 +114,7 @@ module Pickle
       end
 
       def initialize(factory, factory_name)
-        if defined? ::FactoryGirl
+        if defined? ::FactoryBot
           @klass, @name = factory.build_class, factory_name.to_s
         else
           @klass, @name = factory.build_class, factory.factory_name.to_s
@@ -124,16 +122,16 @@ module Pickle
       end
 
       def create(attrs = {})
-        if defined? ::FactoryGirl
-          ::FactoryGirl.create(@name, attrs)
+        if defined? ::FactoryBot
+          ::FactoryBot.create(@name, attrs)
         else
           Factory(@name, attrs)
         end
       end
 
       def build(attrs = {})
-        if defined? ::FactoryGirl
-          ::FactoryGirl.build(@name, attrs)
+        if defined? ::FactoryBot
+          ::FactoryBot.build(@name, attrs)
         else
           Factory.build(@name, attrs)
         end
@@ -153,7 +151,7 @@ module Pickle
 
       def initialize(factory)
         if defined? ::Fabrication
-          @klass, @name = factory[1].klass, factory[0].to_s
+          @klass, @name = factory[1].send(:klass), factory[0].to_s
         end
       end
 

data/lib/pickle/config.rb

@@ -11,7 +11,7 @@ module Pickle
     end
 
     def adapters
-      @adapters ||= [:machinist, :factory_girl, :fabrication, :orm]
+      @adapters ||= [:machinist, :factory_bot, :fabrication, :orm]
     end
 
     def adapter_classes

data/lib/pickle/path.rb

@@ -36,7 +36,7 @@ module Pickle
     def pickle_path_for_resources_action_segment(resources, action, segment)
       action.blank? or action = action.downcase.gsub(' ','_')
       segment.blank? or segment = segment.downcase.gsub(' ','_')
-      resource_names = resources.map{|s| s.is_a?(Symbol) ? s.to_s : s.class.name.underscore}.join("_")
+      resource_names = resources.map{|s| s.is_a?(Symbol) ? s.to_s : s.class.name.underscore.gsub('/', '_')}.join("_")
       models = resources.reject{|s| s.is_a?(Symbol)}
       parts = [action, resource_names, segment].reject(&:blank?)
       send("#{parts.join('_')}_path", *models) rescue nil

data/lib/pickle/session.rb

@@ -1,5 +1,19 @@
 module Pickle
   module Session
+    module PickleParserMethods
+      def method_missing(method, *args, &block)
+        if pickle_parser.respond_to?(method)
+          pickle_parser.send(method, *args, &block)
+        else
+          super(method, *args, &block)
+        end
+      end
+
+      def respond_to?(method, include_private = false)
+        super(method, include_private) || pickle_parser.respond_to?(method, include_private)
+      end
+    end
+
     class ModelNotKnownError < RuntimeError
       attr_reader :name
 
@@ -27,12 +41,7 @@ module Pickle
 
     protected
       def proxy_to_pickle_parser(world_class)
-        world_class.class_eval do
-          unless methods.include?('method_missing_with_pickle_parser')
-            alias_method_chain :method_missing, :pickle_parser
-            alias_method_chain :respond_to?, :pickle_parser
-          end
-        end
+        world_class.send(:prepend, PickleParserMethods)
       end
     end
 
@@ -153,10 +162,6 @@ module Pickle
       end
     end
 
-    def respond_to_with_pickle_parser?(method, include_private = false)
-      respond_to_without_pickle_parser?(method, include_private) || pickle_parser.respond_to?(method, include_private)
-    end
-
   protected
     def create_or_build_model(method, count, pickle_ref, fields = nil)
       factory, label = *parse_model(pickle_ref)
@@ -171,14 +176,6 @@ module Pickle
       end
     end
 
-    def method_missing_with_pickle_parser(method, *args, &block)
-      if pickle_parser.respond_to?(method)
-        pickle_parser.send(method, *args, &block)
-      else
-        method_missing_without_pickle_parser(method, *args, &block)
-      end
-    end
-
     def pickle_parser=(parser)
       parser.session = self
       @pickle_parser = parser

data/lib/pickle/session/parser.rb

@@ -2,8 +2,18 @@ module Pickle
   module Session
     # add ability to parse model names as fields, using a session
     module Parser
+      module ParseFieldWithModel
+        def parse_field(field)
+          if session && field =~ /^(\w+): #{capture_model}$/
+            {$1 => session.model!($2)}
+          else
+            super(field)
+          end
+        end
+      end
+
       def self.included(parser_class)
-        parser_class.alias_method_chain :parse_field, :model
+        parser_class.send(:prepend,  ParseFieldWithModel)
       end
 
       attr_accessor :session
@@ -12,14 +22,6 @@ module Pickle
         "(?:\\w+: (?:#{match_model}|#{match_value}))"
       end
 
-      def parse_field_with_model(field)
-        if session && field =~ /^(\w+): #{capture_model}$/
-          {$1 => session.model!($2)}
-        else
-          parse_field_without_model(field)
-        end
-      end
-
       def parse_hash(hash)
         hash.inject({}) do |parsed, (key, val)|
           if session && val =~ /^#{capture_model}$/

data/lib/pickle/version.rb

@@ -1,3 +1,3 @@
 module Pickle
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/pickle.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.version = Pickle::VERSION.dup
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
-  s.authors = ["Ian White", "James Le Cuirot"]
+  s.authors = ["Ian White", "James Le Cuirot", "Mathieu Jobin"]
   s.description = "Easy model creation and reference in your cucumber features"
   s.summary = "Easy model creation and reference in your cucumber features."
-  s.email = ["ian.w.white@gmail.com", "chewi@aura-online.co.uk"]
+  s.email = ["ian.w.white@gmail.com", "chewi@aura-online.co.uk", "mathieu.jobin@gmail.com"]
   s.homepage = "https://github.com/ianwhite/pickle"
 
   s.rubyforge_project = "pickle"
@@ -18,21 +18,22 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-  
-  s.add_dependency "cucumber", ">=0.8"
+
+  s.add_dependency "cucumber", ">=3.0", "< 6.0"
   s.add_dependency "rake"
-   
+
   s.add_development_dependency "rack"
   s.add_development_dependency "bundler"
   s.add_development_dependency "git"
   s.add_development_dependency "yard"
   s.add_development_dependency "rspec-rails", "~>3.0"
-  s.add_development_dependency "rails", "~>3.1.0"
+  s.add_development_dependency "rails", ">= 4.2.0", "< 7.0"
   s.add_development_dependency "cucumber-rails"
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "factory_bot"
   s.add_development_dependency "fabrication", '~> 2.0'
-  s.add_development_dependency "machinist", "~>2.0"
+  s.add_development_dependency "machinist" # , "~>2.0"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "capybara"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "codecov"
 end

data/rails_generators/pickle/templates/pickle.rb

@@ -7,9 +7,9 @@
 #    require 'machinist/active_record' # or your chosen adaptor
 #    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
 #
-# For FactoryGirl add: features/support/factory_girl.rb
+# For FactoryBot add: features/support/factory_bot.rb
 #
-#    require 'factory_girl'
+#    require 'factory_bot'
 #    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
 #
 # For Fabrication, just include it in the adapter list when configuring pickle as explained below.

data/spec/pickle/adapter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require 'active_record'
-require 'factory_girl'
+require 'factory_bot'
 require 'fabrication'
 require 'machinist/active_record'
 require 'pickle/adapters/active_record'
@@ -58,17 +58,17 @@ describe Pickle::Adapter do
       end
     end
 
-    describe 'FactoryGirl' do
+    describe 'FactoryBot' do
       before do
-        allow(Pickle::Adapter::FactoryGirl).to receive(:model_classes).and_return([One, One::Two, Three])
-
-        if defined? ::FactoryGirl
-          @orig_factories = ::FactoryGirl.factories.dup
-          ::FactoryGirl.factories.clear
-          ::FactoryGirl::Syntax::Default::DSL.new.factory(:one, :class => One) {}
-          ::FactoryGirl::Syntax::Default::DSL.new.factory(:two, :class => One::Two) {}
-          @factory1 = ::FactoryGirl.factories[:one]
-          @factory2 = ::FactoryGirl.factories[:two]
+        allow(Pickle::Adapter::FactoryBot).to receive(:model_classes).and_return([One, One::Two, Three])
+
+        if defined? ::FactoryBot
+          @orig_factories = ::FactoryBot.factories.dup
+          ::FactoryBot.factories.clear
+          ::FactoryBot::Syntax::Default::DSL.new.factory(:one, :class => One) {}
+          ::FactoryBot::Syntax::Default::DSL.new.factory(:two, :class => One::Two) {}
+          @factory1 = ::FactoryBot.factories[:one]
+          @factory2 = ::FactoryBot.factories[:two]
         else
           @orig_factories, Factory.factories = Factory.factories, {}
           Factory.define(:one, :class => One) {}
@@ -79,23 +79,23 @@ describe Pickle::Adapter do
       end
 
       after do
-        if defined? ::FactoryGirl
-          ::FactoryGirl.factories.clear
-          @orig_factories.each {|f| ::FactoryGirl.factories.add(f) }
+        if defined? ::FactoryBot
+          ::FactoryBot.factories.clear
+          @orig_factories.each {|f| ::FactoryBot.factories.add(f) }
         else
           Factory.factories = @orig_factories
         end
       end
 
       it ".factories should create one for each factory" do
-        expect(Pickle::Adapter::FactoryGirl).to receive(:new).with(@factory1, @factory1.name).once
-        expect(Pickle::Adapter::FactoryGirl).to receive(:new).with(@factory2, @factory2.name).once
-        Pickle::Adapter::FactoryGirl.factories
+        expect(Pickle::Adapter::FactoryBot).to receive(:new).with(@factory1, @factory1.name).once
+        expect(Pickle::Adapter::FactoryBot).to receive(:new).with(@factory2, @factory2.name).once
+        Pickle::Adapter::FactoryBot.factories
       end
 
       describe ".new(factory, factory_name)" do
         before do
-          @factory = Pickle::Adapter::FactoryGirl.new(@factory1, @factory1.name)
+          @factory = Pickle::Adapter::FactoryBot.new(@factory1, @factory1.name)
         end
 
         it "should have name of factory_name" do
@@ -106,7 +106,7 @@ describe Pickle::Adapter do
           expect(@factory.klass).to eq(One)
         end
 
-        unless defined? ::FactoryGirl
+        unless defined? ::FactoryBot
           it "#create(attrs) should call Factory(<:key>, attrs)" do
             expect(Factory).to receive(:create).with("one", {:key => "val"})
             @factory.create(:key => "val")