pickle 0.5.2 → 0.6.1

data/Rakefile.d/cucumber.rake

@@ -2,7 +2,7 @@ require 'cucumber/rake/task'
 
 desc "Run features"
 Cucumber::Rake::Task.new(:cucumber => [:cucumber_test_app]) do |t|
-  t.cucumber_opts = ['--format', 'pretty', '--require', 'features']
+  t.cucumber_opts = %w[--format pretty --require features -t] + ["'not @wip'"]
 end
 
 desc "setup a rails app for running cucumber"
@@ -13,15 +13,24 @@ end
 
 namespace :cucumber do
   task :setup do
+    current_gemfile = ENV['BUNDLE_GEMFILE']
+    sh "BUNDLE_GEMFILE=#{current_gemfile} bundle show cucumber > /tmp/cukes_version"
+    sh "BUNDLE_GEMFILE=#{current_gemfile} bundle show sqlite3 > /tmp/sqlite_version"
+    cukes_version=File.read('/tmp/cukes_version').split('-').last.chomp
+    sqlite_version=File.read('/tmp/sqlite_version').split('-').last.chomp
+    puts "Versions: Cucumber #{cukes_version}, SQLite #{sqlite_version}."
     Bundler.with_clean_env do
       gemfile = "cucumber_test_app/Gemfile"
       rm_rf "cucumber_test_app"
-      sh "rails new cucumber_test_app --skip-javascript --skip-sprockets"
+      sh "BUNDLE_GEMFILE=#{current_gemfile} bundle exec rails new cucumber_test_app --skip-spring --skip-javascript --skip-sprockets --skip-bootsnap"
+      sh "echo 'gem \"cucumber\", \"~> #{cukes_version}\", :require => false' >> #{gemfile}"
+      sh "sed -i 's/gem .sqlite3./gem \"sqlite3\", \"~> #{sqlite_version}\"/' #{gemfile}"
+      sh "cat #{gemfile} | grep sqli"
       sh "echo 'gem \"cucumber-rails\", :require => false' >> #{gemfile}"
       sh "echo 'gem \"rspec-rails\", \"~>3.0\"' >> #{gemfile}"
-      sh "echo 'gem \"capybara\"' >> #{gemfile}"
+      sh "echo 'gem \"pickle\", path: \"#{__dir__}/..\"' >> #{gemfile}"
       sh "bundle install --gemfile=#{gemfile}"
-      sh "ln -s ../../.. cucumber_test_app/vendor/plugins/pickle"
+      sh "(cd cucumber_test_app ; bundle exec rake db:migrate)"
     end
   end
 end

data/Rakefile.d/repoclean.rake

@@ -0,0 +1,3 @@
+task :repoclean do
+  system "rm -fr pickle-email-* .bundle/ .yardoc/ cucumber_test_app/ doc/ tmp"
+end

data/features/app/app.rb

@@ -90,19 +90,19 @@ end
 # controllers
 class DefaultController < ActionController::Base
   def index
-    render :text => "index: I was invoked with #{request.path}"
+    render :plain => "index: I was invoked with #{request.path}"
   end
-  
+
   def show
-    render :text => "show: I was invoked with #{request.path}"
+    render :plain => "show: I was invoked with #{request.path}"
   end
-  
+
   def new
-    render :text => "new: I was invoked with #{request.path}"
+    render :plain => "new: I was invoked with #{request.path}"
   end
-  
+
   def edit
-    render :text => "edit: I was invoked with #{request.path}"
+    render :plain => "edit: I was invoked with #{request.path}"
   end
 end
 

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.4.2.x

@@ -0,0 +1,13 @@
+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", "~> 4.2.9"
+gem "cucumber", "~> 3.2.0"
+gem "sqlite3", "~> 1.3.6"
+gem "bundler", "~> 1.17"
+
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

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,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", "~> 5.0"
+gem "cucumber-rails"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

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

@@ -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", "~> 3.2"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

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

@@ -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"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

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

@@ -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", "~> 6.0"
+gem "cucumber-rails"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.6.1.x-cukes-3

@@ -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.1.0"
+gem "cucumber", "~> 3.2"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

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

@@ -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.1.0"
+gem "cucumber", "~> 4.1"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.6.1.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.1.0"
+gem "cucumber", "~> 5.0"
+gem "cucumber-rails"
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/gemfiles/Gemfile-rails.6.1.x-cukes-6

@@ -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.1.0"
+gem "cucumber", "~> 6.0"
+gem "cucumber-rails"
+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