pickle 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.3.2
+
+* 3 minor improvements
+  * Document how to use machinist named blueprints [Christopher Darroch]
+  * Email links now visit the url, rather than just the path, this allows for features that
+    make use of the domain to function correctly
+  * Deprecation warnings for Rails 3 removed [Brian Rose & Kevin Olsen]
+
+
 == 0.3.1
 
 * 1 major improvement

data/README.rdoc

@@ -93,10 +93,7 @@ you've written, you can just do stuff like
   Then a user should exist with name: "Fred"
   And that user should be activated # this uses rspec predicate matchers
 
-==== Machinst: require your blueprints and reset Shams
-
-(The latest version of pickle supports {multiple blueprints}[http://github.com/notahat/machinist/commit/d6492e6927a8aa1819926e48b22377171fd20496], for
-earlier versions of machinist use pickle <= 0.1.10)
+==== Machinist: require your blueprints and reset Shams
 
 In your <tt>features/support/env.rb</tt> add the following lines at the bottom
 
@@ -114,7 +111,7 @@ If that doesn't solve loading issues then require your factories.rb file directl
 
 === Using with an ORM other than ActiveRecord or DataMapper
 
-Pickle can be used with any Modeling library provided there is an adapter written for it.
+Pickle can be used with any modelling library provided there is an adapter written for it.
 
 Adapters are very simple and exist a module or class with the name "PickleAdapter" available to the class.  For example
 
@@ -187,6 +184,35 @@ You can refer to other models in the fields
     | Fred  | false     |
     | Ethel | true      |
 
+===== Named machinist blueprints
+
+"Given <b> a <i>named</i> model</b> exists with <b>fields</b>"
+
+The latest version of pickle supports {named machinist blueprints}[http://github.com/notahat/machinist/commit/d6492e6927a8aa1819926e48b22377171fd20496].
+
+If you had the following blueprints:
+
+  User.blueprint do
+    name
+    email
+  end
+  
+  User.blueprint(:super_admin) do
+    role { "admin" }
+  end
+  
+  User.blueprint(:activated) do
+    activated { true }
+  end
+
+You could create a user with pickle by simply adding the name of the blueprint before the model:
+
+  Given a super admin user exists
+  And an activated user exists with name: "Fred"
+
+This is much nicer than having to set up common configurations in your steps all the time, and far more readable to boot.
+
+
 ==== Then steps
 
 ===== Asserting existence of models
@@ -302,6 +328,8 @@ To run the features (rails 2.3 only ATM):
 
 The following people have made Pickle better:
 
+* Brian Rose & Kevin Olsen
+* {Christopher Darroch}[http://github.com/chrisdarroch]
 * {Szymon Nowak}[http://github.com/szimek]
 * {H.J. Blok}[http://github.com/hjblok]
 * {Daniel Neighman}[http://github.com/hassox]

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/pickle/adapters/active_record.rb

@@ -18,7 +18,13 @@ class ActiveRecord::Base
 
     # Gets a list of the available models for this adapter
     def self.model_classes
-      ::ActiveRecord::Base.__send__(:subclasses).select do |klass|
+      begin
+        klasses = ::ActiveRecord::Base.__send__(:descendants) # Rails 3
+      rescue
+        klasses = ::ActiveRecord::Base.__send__(:subclasses) # Rails 2
+      end
+
+      klasses.select do |klass|
         !klass.abstract_class? && klass.table_exists? && !except_classes.include?(klass.name)
       end
     end

data/lib/pickle/email.rb

@@ -25,8 +25,7 @@ module Pickle
 
     def click_first_link_in_email(email)
       link = links_in_email(email).first
-      request_uri = URI::parse(link).request_uri
-      visit request_uri
+      visit link
     end
 
   protected
@@ -60,15 +59,14 @@ module Pickle
     # e.g. confirm in http://confirm
     def parse_email_for_explicit_link(email, regex)
       regex = /#{Regexp.escape(regex)}/ unless regex.is_a?(Regexp)
-      url = links_in_email(email).detect { |link| link =~ regex }
-      URI::parse(url).request_uri if url
+      links_in_email(email).detect { |link| link =~ regex }
     end
 
     # e.g. Click here in  <a href="http://confirm">Click here</a>
     def parse_email_for_anchor_text_link(email, link_text)
-      email.body =~ %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?#{link_text}[^<]*?</a>}
-      URI.split($~[1])[5..-1].compact!.join("?").gsub("&amp;", "&")
-      # sub correct ampersand after rails switches it (http://dev.rubyonrails.org/ticket/4002)
+      if match_data = email.body.match(%r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?#{link_text}[^<]*?</a>})
+        match_data[1]
+      end
     end
 
     def links_in_email(email, protos=['http', 'https'])

data/pickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]
-  s.date = %q{2010-07-31}
+  s.date = %q{2010-08-05}
   s.description = %q{Easy model creation and reference in your cucumber features}
   s.email = %q{ian.w.white@gmail.com}
   s.extra_rdoc_files = [

data/spec/pickle/adapter_spec.rb

@@ -7,11 +7,11 @@ require 'pickle/adapters/active_record'
 
 describe Pickle::Adapter do
   it ".factories should raise NotImplementedError" do
-    lambda{ Pickle::Adapter.factories }.should raise_error(NotImplementedError)
+    lambda { Pickle::Adapter.factories }.should raise_error(NotImplementedError)
   end
 
   it "#create should raise NotImplementedError" do
-    lambda{ Pickle::Adapter.new.create }.should raise_error(NotImplementedError)
+    lambda { Pickle::Adapter.new.create }.should raise_error(NotImplementedError)
   end
 
   describe ".model_classes" do
@@ -26,7 +26,7 @@ describe Pickle::Adapter do
       klass4 = Class.new(ActiveRecord::Base)
       klass5 = Class.new(ActiveRecord::Base)
       klass6 = Class.new(ActiveRecord::Base)
-      [klass1, klass2,klass3,klass4, klass5, klass6].each{|k| k.stub!(:table_exists?).and_return(true)}
+      [klass1, klass2, klass3, klass4, klass5, klass6].each { |k| k.stub!(:table_exists?).and_return(true) }
 
       klass2.stub!(:name).and_return("CGI::Session::ActiveRecordStore::Session")
       klass3.stub!(:name).and_return("ActiveRecord::SessionStore::Session")
@@ -39,37 +39,60 @@ describe Pickle::Adapter do
 
   describe "adapters: " do
     before do
-      @klass1 = returning(Class.new(ActiveRecord::Base)) {|k| k.stub!(:name).and_return('One')}
-      @klass2 = returning(Class.new(ActiveRecord::Base)) {|k| k.stub!(:name).and_return('One::Two')}
-      @klass3 = returning(Class.new(ActiveRecord::Base)) {|k| k.stub!(:name).and_return('Three')}
+      @klass1 = returning(Class.new(ActiveRecord::Base)) { |k| k.stub!(:name).and_return('One') }
+      @klass2 = returning(Class.new(ActiveRecord::Base)) { |k| k.stub!(:name).and_return('One::Two') }
+      @klass3 = returning(Class.new(ActiveRecord::Base)) { |k| k.stub!(:name).and_return('Three') }
     end
 
     describe 'ActiveRecord' do
-      before do
-        ActiveRecord::Base::PickleAdapter.stub!(:model_classes).and_return([@klass1, @klass2, @klass3])
-      end
 
-      it ".factories should create one for each active record class" do
-        Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass1).once
-        Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass2).once
-        Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass3).once
-        Pickle::Adapter::ActiveRecord.factories
+#DEPRECATION WARNING: subclasses is deprecated and will be removed from Rails 3.0 (use descendants instead). (called from __send__ at /Users/pivotal/workspace/factorylabs/protosite/vendor/cache/ruby/1.8/gems/pickle-0.3.1/lib/pickle/adapters/active_record.rb:21)
+
+      describe ".model_classes" do
+        it "calls .descendants" do
+          ::ActiveRecord::Base.should_receive(:descendants).and_return([])
+          ::ActiveRecord::Base.should_not_receive(:subclasses).and_return([])
+
+          ActiveRecord::Base::PickleAdapter.model_classes
+        end
+
+        it "calls .subclasses when .descendants doesn't respond" do
+          ::ActiveRecord::Base.should_receive(:subclasses).and_return([])
+
+          ActiveRecord::Base::PickleAdapter.model_classes
+        end
+
       end
 
-      describe ".new(Class)" do
+      describe 'with class stubs' do
         before do
-          @factory = Pickle::Adapter::ActiveRecord.new(@klass2)
+          ActiveRecord::Base::PickleAdapter.stub!(:model_classes).and_return([@klass1, @klass2, @klass3])
         end
 
-        it "should have underscored (s/_) name of Class as #name" do
-          @factory.name.should == 'one_two'
+        it ".factories should create one for each active record class" do
+          Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass1).once
+          Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass2).once
+          Pickle::Adapter::ActiveRecord.should_receive(:new).with(@klass3).once
+          Pickle::Adapter::ActiveRecord.factories
         end
 
-        it "#create(attrs) should call Class.create!(attrs)" do
-          @klass2.should_receive(:create!).with({:key => "val"})
-          @factory.create(:key => "val")
+        describe ".new(Class)" do
+          before do
+            @factory = Pickle::Adapter::ActiveRecord.new(@klass2)
+          end
+
+          it "should have underscored (s/_) name of Class as #name" do
+            @factory.name.should == 'one_two'
+          end
+
+          it "#create(attrs) should call Class.create!(attrs)" do
+            @klass2.should_receive(:create!).with({:key => "val"})
+            @factory.create(:key => "val")
+          end
         end
       end
+
+
     end
 
     describe 'FactoryGirl' do

data/spec/pickle/email_spec.rb

@@ -143,17 +143,17 @@ describe Pickle::Email do
     end
 
     it "should find a link for http://example.com/page" do
-      should_receive(:visit).with('/page')
+      should_receive(:visit).with('http://example.com/page')
       visit_in_email(@email1, 'http://example.com/page')
     end
 
     it "should find a link for \"example page\"" do
-      should_receive(:visit).with('/page')
+      should_receive(:visit).with('http://example.com/page')
       visit_in_email(@email1, 'example page')
     end
 
     it "should follow the first link in an email" do
-      should_receive(:visit).with('/page')
+      should_receive(:visit).with('http://example.com/page')
       click_first_link_in_email(@email1)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pickle
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ian White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 +01:00
+date: 2010-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: []