pickle 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1e30b140a40e358ef640c8a4468900f10ddc30
-  data.tar.gz: 8a1a5ce613b46e0ad108a14e5c9f18aadbdce58f
+  metadata.gz: b58eef50218f9337a561a6bb1037202cc200fc2a
+  data.tar.gz: 4ef8f88b81920ea1e5297a10dc1407d61f4cba71
 SHA512:
-  metadata.gz: 9fb3b8d43dd6c71a1d77dbe4033b5cb802f798377b3815b3a907a98dfd4a603c569a558e7db36029df188709be4339a4bd725bd0cf626a98e46be994b739f076
-  data.tar.gz: e395427019f47d25df0385f16a0d712f5450b4198b83f0530d067dc0b944f2f02688e12fab0649ef74695a6e26388c9e6ac87ba77ce4335b91eb5c24f6486c9d
+  metadata.gz: 0dd3d6376c5c8d7372935fc15d451e69c975155461003679e7bdfc6e82bb31775d3fb112eb2d7c2f4eb415591aa50b10ba72028ce68f3f9e4077ef63bda1d9d5
+  data.tar.gz: cece36b98a29a5b44c3751f6a592cbf8a2cca0d48e25f97e8ca97d599a55f689a310b1b94288da2cf5d89a193a58860a75aefba7dc5d6f673bd6d0087a9f890b

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.3
+* small fix to pickle_path_for_resources_action_segment
+* update for fabrication adapter with protected method klass
+
 == 0.5.2
 * replace alias_method_chain by Module#prepend
   eliminating deprecation warnings when using with Rails 5

data/Rakefile.d/cucumber.rake

@@ -16,7 +16,7 @@ namespace :cucumber do
     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 exec rails new cucumber_test_app --skip-javascript --skip-sprockets"
       sh "echo 'gem \"cucumber-rails\", :require => false' >> #{gemfile}"
       sh "echo 'gem \"rspec-rails\", \"~>3.0\"' >> #{gemfile}"
       sh "echo 'gem \"capybara\"' >> #{gemfile}"

data/features/step_definitions/email_steps.rb

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

data/features/step_definitions/pickle_steps.rb

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

data/features/support/email.rb

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

data/lib/pickle/adapter.rb

@@ -153,7 +153,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/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/version.rb

@@ -1,3 +1,3 @@
 module Pickle
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/pickle/path_spec.rb

@@ -4,7 +4,7 @@ require 'pickle/path'
 
 describe Pickle::Path do
   include Pickle::Path
-  
+
   describe "#path_to_pickle, when the model doesn't exist" do
     before do
       allow(self).to receive(:model).and_return(nil)
@@ -12,81 +12,81 @@ describe Pickle::Path do
     it "('that user', :extra => 'new comment') should raise the error raised by model!" do
       expect { path_to_pickle "that user", "new comment" }.to raise_error(RuntimeError, 'Could not figure out a path for ["that user", "new comment"] {}')
     end
-    
+
   end
-  
+
   describe "#path_to_pickle" do
     describe "when model returns a user" do
       let :user_class do
         double 'User', :name => 'User'
       end
-      
+
       let :user do
         double 'user', :class => user_class
       end
-      
+
       before do
         allow(self).to receive(:model).and_return(user)
       end
-    
+
       it "('a user', 'the user: \"fred\"') should retrieve 'a user', and 'the user: \"fred\"' models" do
         expect(self).to receive(:model).with('a user')
         expect(self).to receive(:model).with('the user: "fred"')
         allow(self).to receive(:user_user_path).and_return('the path')
         expect(path_to_pickle('a user', 'the user: "fred"')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'foo') should return foo_user_path(<user>)" do
         expect(self).to receive(:foo_user_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :action => 'foo')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'foo') should raise informative error if foo_user_path not defined" do
         expect(self).to receive(:foo_user_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :action => 'foo') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :segment => 'foo') should return user_foo_path(<user>)" do
         expect(self).to receive(:user_foo_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :segment => 'foo')).to eq('the path')
       end
-    
+
       it "('a user', :segment => 'foo') should raise informative error if foo_user_path not defined" do
         expect(self).to receive(:user_foo_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :segment => 'foo') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :action => 'new', :segment => 'comment') should return new_user_comment_path(<user>)" do
         expect(self).to receive(:new_user_comment_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :segment => 'comment', :action => 'new')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'new', :segment => 'comment') should raise informative error if new_user_comment_path not defined" do
         expect(self).to receive(:new_user_comment_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :action => 'new', :segment => 'comment') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :extra => 'new comment') should return new_user_comment_path(<user>)" do
         expect(self).to receive(:new_user_comment_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :extra => 'new comment')).to eq('the path')
       end
-    
+
       it "('a user', :extra => 'new comment') should raise informative error if new_user_comment_path not defined" do
         expect(self).to receive(:new_user_comment_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :extra => 'new comment') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-      
+
       describe "when args is a list of pickle and non pickle models" do
         before do
           allow(self).to receive(:model).with("account").and_return(nil)
         end
-      
+
         it "('account', 'the user') should return account_user_path(<user>)" do
           expect(self).to receive(:account_user_path).with(user).and_return("the path")
           expect(path_to_pickle('account', 'the user')).to eq('the path')
         end
       end
-      
+
       describe "(private API)" do
         it "('a user', :extra => 'new ish comment') should try combinations of 'new', 'ish', 'comment'" do
           expect(self).to receive(:pickle_path_for_resources_action_segment).with([user], '', 'new_ish_comment').once
@@ -97,5 +97,24 @@ describe Pickle::Path do
         end
       end
     end
+
+    describe "when model returns namespaced user" do
+      let :user_class do
+        double 'User', :name => 'Admin::User'
+      end
+
+      let :user do
+        double 'user', :class => user_class
+      end
+
+      before do
+        allow(self).to receive(:model).and_return(user)
+      end
+
+      it "('a user', :action => 'foo') should return foo_admin_user_path(<user>)" do
+        expect(self).to receive(:foo_admin_user_path).with(user).and_return('the path')
+        expect(path_to_pickle('a user', :action => 'foo')).to eq('the path')
+      end
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickle
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ian White
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: pickle
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Easy model creation and reference in your cucumber features.

data/features/step_definitions/email_steps.rb

@@ -1,65 +0,0 @@
-# this file generated by script/generate pickle email
-#
-# add email mappings in features/support/email.rb
-
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-
-Before do
-  ActionMailer::Base.deliveries.clear
-end
-
-# Clear the deliveries array, useful if your background sends email that you want to ignore
-Given(/^all emails? (?:have|has) been delivered$/) do
-  ActionMailer::Base.deliveries.clear
-end
-
-Given(/^(\d)+ emails? should be delivered$/) do |count|
-  expect(emails.size).to eq(count.to_i)
-end
-
-When(/^(?:I|they) follow "([^"]*?)" in #{capture_email}$/) do |link, email_ref|
-  visit_in_email(email(email_ref), link)
-end
-
-When(/^(?:I|they) click the first link in #{capture_email}$/) do |email_ref|
-  click_first_link_in_email(email(email_ref))
-end
-
-Then(/^(\d)+ emails? should be delivered to (.*)$/) do |count, to|
-  actual = emails("to: \"#{email_for(to)}\"").size
-  expect(actual).to eq(count.to_i), "Expected #{count} emails but encountered #{actual} delivered to #{to}"
-end
-
-Then(/^(\d)+ emails? should be delivered with #{capture_fields}$/) do |count, fields|
-  actual = emails(fields).size
-  expect(actual).to eq(count.to_i), "Expected #{count} emails but encountered #{actual} to be delivered with #{fields}"
-end
-
-Then(/^#{capture_email} should be delivered to (.+)$/) do |email_ref, to|
-  expect(email(email_ref, "to: \"#{email_for(to)}\"")).not_to be_nil, "Failed to find #{email_ref} delivered to: #{to}"
-end
-
-Then(/^#{capture_email} should not be delivered to (.+)$/) do |email_ref, to|
-  expect(email(email_ref, "to: \"#{email_for(to)}\"")).to be_nil, "Unexpectedly found #{email_ref} delivered to: #{to}"
-end
-
-Then(/^#{capture_email} should have #{capture_fields}$/) do |email_ref, fields|
-  expect(email(email_ref, fields)).not_to be_nil, "Failed to find #{fields} in #{email_ref}"
-end
-
-Then(/^#{capture_email} should contain "(.*)"$/) do |email_ref, text|
-  expect(email(email_ref).body).to match(/#{text}/), "Failed to find \"#{text}\" in #{email_ref}"
-end
-
-Then(/^#{capture_email} should not contain "(.*)"$/) do |email_ref, text|
-  expect(email(email_ref).body).not_to match(/#{text}/), "Unexpectedly found \"#{text}\" in #{email_ref}"
-end
-
-Then(/^#{capture_email} should link to (.+)$/) do |email_ref, page|
-  expect(email(email_ref).body).to match(/#{path_to(page)}/), "Failed to find link to #{page} in #{email_ref}"
-end
-
-Then(/^show me the emails?$/) do
-  save_and_open_emails
-end

data/features/step_definitions/pickle_steps.rb

@@ -1,105 +0,0 @@
-# this file generated by script/generate pickle
-
-# create a model
-Given(/^#{capture_model} exists?(?: with #{capture_fields})?$/) do |name, fields|
-  create_model(name, fields)
-end
-
-# create n models
-Given(/^(\d+) #{capture_plural_factory} exist(?: with #{capture_fields})?$/) do |count, plural_factory, fields|
-  create_models(count, plural_factory.singularize, fields)
-end
-
-# create models from a table
-Given(/^the following #{capture_plural_factory} exists?:?$/) do |plural_factory, table|
-  create_models_from_table(plural_factory, table)
-end
-
-# find a model
-Then(/^#{capture_model} should exist(?: with #{capture_fields})?$/) do |name, fields|
-  find_model!(name, fields)
-end
-
-# not find a model
-Then(/^#{capture_model} should not exist(?: with #{capture_fields})?$/) do |name, fields|
-  expect(find_model(name, fields)).to be_nil
-end
-
-# find models with a table
-Then(/^the following #{capture_plural_factory} should exist:?$/) do |plural_factory, table|
-  expect(find_models_from_table(plural_factory, table)).not_to be_any(&:nil?)
-end
-
-# not find models with a table
-Then(/^the following #{capture_plural_factory} should not exists?:?$/) do |plural_factory, table|
-  find_models_from_table(plural_factory, table).should be_all(&:nil?)
-end
-
-# find exactly n models
-Then(/^(\d+) #{capture_plural_factory} should exist(?: with #{capture_fields})?$/) do |count, plural_factory, fields|
-  expect(find_models(plural_factory.singularize, fields).size).to eq(count.to_i)
-end
-
-# assert equality of models
-Then(/^#{capture_model} should be #{capture_model}$/) do |a, b|
-  expect(model!(a)).to eq(model!(b))
-end
-
-# assert model is in another model's has_many assoc
-Then(/^#{capture_model} should be (?:in|one of|amongst) #{capture_model}(?:'s)? (\w+)$/) do |target, owner, association|
-  expect(model!(owner).send(association)).to include(model!(target))
-end
-
-# assert model is not in another model's has_many assoc
-Then(/^#{capture_model} should not be (?:in|one of|amongst) #{capture_model}(?:'s)? (\w+)$/) do |target, owner, association|
-  expect(model!(owner).send(association)).not_to include(model!(target))
-end
-
-# assert model is another model's has_one/belongs_to assoc
-Then(/^#{capture_model} should be #{capture_model}(?:'s)? (\w+)$/) do |target, owner, association|
-  expect(model!(owner).send(association)).to eq(model!(target))
-end
-
-# assert model is not another model's has_one/belongs_to assoc
-Then(/^#{capture_model} should not be #{capture_model}(?:'s)? (\w+)$/) do |target, owner, association|
-  expect(model!(owner).send(association)).not_to eq(model!(target))
-end
-
-# assert model.predicate?
-Then(/^#{capture_model} should (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
-    expect(model!(name)).to send("have_#{predicate.gsub(' ', '_')}")
-  else
-    expect(model!(name)).to send("be_#{predicate.gsub(' ', '_')}")
-  end
-end
-
-# assert not model.predicate?
-Then(/^#{capture_model} should not (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
-    expect(model!(name)).not_to send("have_#{predicate.gsub(' ', '_')}")
-  else
-    expect(model!(name)).not_to send("be_#{predicate.gsub(' ', '_')}")
-  end
-end
-
-# expect(model.attribute).to eq(value)
-# expect(model.attribute).not_to eq(value)
-Then(/^#{capture_model}'s (\w+) (should(?: not)?) be #{capture_value}$/) do |name, attribute, expectation, expected|
-  actual_value  = model(name).send(attribute)
-  expectation   = expectation.gsub("should", "to").gsub(" ", "_")
-
-  case expected
-  when 'nil', 'true', 'false'
-    expect(actual_value).send(expectation, eq(eval(expected)))
-  when /^[+-]?[0-9_]+(\.\d+)?$/
-    expect(actual_value).send(expectation, eq(expected.to_f))
-  else
-    expect(actual_value.to_s).send(expectation, eq(eval(expected)))
-  end
-end
-
-# assert size of association
-Then /^#{capture_model} should have (\d+) (\w+)$/ do |name, size, association|
-  expect(model!(name).send(association).size).to eq(size.to_i)
-end

data/features/support/email.rb

@@ -1,21 +0,0 @@
-module EmailHelpers
-  # Maps a name to an email address. Used by email_steps
-
-  def email_for(to)
-    case to
-  
-    # add your own name => email address mappings here
-  
-    when /^#{capture_model}$/
-      model($1).email
-  
-    when /^"(.*)"$/
-      $1
-  
-    else
-      to
-    end
-  end
-end
-
-World(EmailHelpers)