shoulda-callback-matchers 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c47c82596d5cef0a75c5a359e9f3a2b138f875
-  data.tar.gz: 484f42b9d2cad246fb71748ebfff3ad73977e43e
+  metadata.gz: 36ecd3914a3443c58fd61371532b3e04003f5dea
+  data.tar.gz: 63aa4153512b0f40d245c977a1ecf67ef74af9b0
 SHA512:
-  metadata.gz: e33037b19ace299416fc07695e994aae498672f70864113ad9e8fdb84f22855f285568690aa1831c9ec6d3de14ef037ec9ad43f78eace98de8fe507f1cf99b59
-  data.tar.gz: a6dd677fbdd5778b99b64d01ecb29b8699f6e676c17f38f9a653ae709ab4c3c9465149081b2a37a28370f83d60f10c4ec1c861d4fe8c7817709d77d1548c9813
+  metadata.gz: 8d540b4fbf5a1e2fa7f8b94c55df9f02ffec8c31bc49875daac55be07b112b448b4296631277328bdf044352d4d43e4c3132814d06c429ccce33378604d1cb8f
+  data.tar.gz: 2e6f4830c5af8fcedd2097736d799543eac77c35f72c5895920b22c5364e68be4f9021fd193e7e7fbcbd47e034d1a2e952a3a827afc1c2cc2f0eff29b4ef754b

data/.gitignore

@@ -1,3 +1,7 @@
+.DS_STORE
+.rspec
+.ruby-gemset
+.ruby-version
 test/*/log/*.log
 doc
 coverage
@@ -8,6 +12,7 @@ pkg
 tags
 tmp
 .bundle
+.git
 *.rbc
 *.gem
 gemfiles/*

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - rbx
   - jruby-19mode
   - jruby-20mode
@@ -9,11 +9,8 @@ rvm:
 script: "bundle install && bundle exec rake"
 
 gemfile:
-  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
 
 matrix:
   allow_failures:
-    - rvm: 2.1.0
     - rvm: rbx
-    - rvm: jruby-19mode
-    - rvm: jruby-20mode

data/Appraisals

@@ -1,3 +1,9 @@
+appraise '4.1' do
+  gem 'rails', '~>4.1'
+  gem 'jquery-rails'
+  gem 'sass-rails'
+end
+
 appraise '4.0' do
   gem 'rails', '~>4.0'
   gem 'jquery-rails'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Beat Richartz
+Copyright (c) 2014 Beat Richartz
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,6 +1,12 @@
-Matchers to test before, after and around hooks(currently supports gsymbol and object callbacks):
-    
-Symbol Callbacks:
+#Shoulda Callback Matchers
+[![Gem Version](https://badge.fury.io/rb/shoulda-callback-matchers.svg)](http://badge.fury.io/rb/shoulda-callback-matchers) [![Build Status](https://travis-ci.org/beatrichartz/shoulda-callback-matchers.svg?branch=master)](https://travis-ci.org/beatrichartz/shoulda-callback-matchers) [![Code Climate](https://codeclimate.com/github/beatrichartz/shoulda-callback-matchers.png)](https://codeclimate.com/github/beatrichartz/shoulda-callback-matchers) [![Dependency Status](https://gemnasium.com/beatrichartz/shoulda-callback-matchers.svg)](https://gemnasium.com/beatrichartz/shoulda-callback-matchers)
+
+
+Matchers to test before, after and around hooks(currently supports method and object callbacks):
+
+## Usage
+
+Method Callbacks:
 
     describe Post do
       it { should callback(:count_comments).before(:save) }
@@ -18,10 +24,21 @@ Symbol Callbacks:
 Object Callbacks:
 
     class CallbackClass
-      def before_save{}
-      def after_create{}
-      def before_validation{}
-      def after_find{}
+      def before_save
+        ...
+      end
+			
+      def after_create
+        ...
+      end
+			
+      def before_validation
+        ...
+      end
+			
+      def after_find
+        ...
+      end
     end
     
     describe Post do
@@ -37,12 +54,16 @@ Object Callbacks:
       it { should callback(CallbackClass).before(:destroy) }
     end
 
-Be aware that this tests for the method call and not the method itself. It makes testing via triggering the callback events (validation, save) unnecessary, but you should still test the called procedure seperately.
+This will test:
+- the method call
+- method existence
+
+Either on the model itself or on the callback object. Be aware that obviously this does not test the callback method or object itself. It makes testing via triggering the callback events (validation, save) unnecessary, but you still have to test the called procedure seperately.
 
 In Rails 3 or 4 and Bundler, add the following to your Gemfile:
 
     group :test do
-      gem "shoulda-callback-matchers", "~> 0.4"
+      gem "shoulda-callback-matchers", "~> 1.0"
     end
 
 This gem uses semantic versioning, so you won't have incompability issues with patches.
@@ -61,12 +82,12 @@ This gem is maintained by me and its contributors,
 Shoulda is maintained and funded by [thoughtbot](http://thoughtbot.com/community)
 
 ## Contributors & Contributions
-- @pvertenten
+- @pvertenten (callback objects)
 
 Let's make this gem useful, send me a PR if you've discovered an issue you'd like to fix!
 
 ## License
 
-Shoulda is Copyright © 2006-2012 thoughtbot, inc.
-Callback Matchers is Copyright © 2012 Beat Richartz
+Shoulda is Copyright © 2006-2014 thoughtbot, inc.
+Callback Matchers is Copyright © 2014 Beat Richartz
 It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/ext/mkrf_conf.rb

@@ -1,8 +1,8 @@
 rbx = defined?(RUBY_ENGINE) && 'rbx' == RUBY_ENGINE
 
 def already_installed(dep)
-  !Gem::DependencyInstaller.new(:domain => :local).find_gems_with_sources(dep).empty? ||
-  !Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep).empty?
+  !Gem::DependencyInstaller.new(domain: :local).find_gems_with_sources(dep).empty? ||
+  !Gem::DependencyInstaller.new(domain: :local, prerelease: true).find_gems_with_sources(dep).empty?
 end
 
 if rbx
@@ -27,7 +27,7 @@ if rbx
     inst = Gem::DependencyInstaller.new
     dep.each {|d| inst.install d }
   rescue
-    inst = Gem::DependencyInstaller.new(:prerelease => true)
+    inst = Gem::DependencyInstaller.new(prerelease: true)
     begin
       dep.each {|d| inst.install d }
     rescue Exception => e

data/lib/shoulda-callback-matchers.rb

@@ -1 +1 @@
-require 'shoulda/callback/matchers'
+require_relative 'shoulda/callback/matchers'

data/lib/shoulda/callback/matchers.rb

@@ -1,7 +1,8 @@
-require 'shoulda/callback/matchers/version'
+require_relative 'matchers/version'
+require_relative 'matchers/rails_version_helper'
 
 if defined?(RSpec)
-  require 'shoulda/callback/matchers/integrations/rspec'
+  require_relative 'matchers/integrations/rspec'
 end
 
-require 'shoulda/callback/matchers/integrations/test_unit'
+require_relative 'matchers/integrations/test_unit'

data/lib/shoulda/callback/matchers/active_model.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Shoulda # :nodoc:
   module Callback # :nodoc:
     module Matchers # :nodoc:
@@ -17,16 +19,18 @@ module Shoulda # :nodoc:
         #   it { should callback(:method).before(:validation).unless(:should_it_not?) }
         #   it { should callback(CallbackClass).before(:validation).unless(:should_it_not?) }
         #
-        def callback(method)
-          CallbackMatcher.new(method)
+        def callback method
+          CallbackMatcher.new method
         end
 
         class CallbackMatcher # :nodoc:
+          include RailsVersionHelper
                 
-          def initialize(method)
+          def initialize method
             @method = method
           end
         
+          # @todo replace with %i() as soon as 1.9 is deprecated
           [:before, :after, :around].each do |hook|
             define_method hook do |lifecycle|
               @hook = hook
@@ -45,46 +49,39 @@ module Shoulda # :nodoc:
             end
           end
         
-          def on(optional_lifecycle)
+          def on optional_lifecycle
             unless @lifecycle == :validation
-              @failure_message = "The .on option is only valid for the validation lifecycle and cannot be used with #{@lifecycle}, use with .before(:validation) or .after(:validation)"
-            else
-              @optional_lifecycle = optional_lifecycle
+              raise UsageError.new("The .on option is only valid for the validation lifecycle and cannot be used with #{@lifecycle}, use with .before(:validation) or .after(:validation)")
             end
+            
+            @optional_lifecycle = optional_lifecycle
           
             self
           end
 
-          def matches?(subject)
-            unless @lifecycle
-              @failure_message = "callback #{@method} can not be tested against an undefined lifecycle, use .before, .after or .around"
-              false
-            else
-              callbacks = subject.send(:"_#{@lifecycle}_callbacks").dup
-              callbacks = callbacks.select do |callback|
-                subject.respond_to?(callback.filter) &&
-                is_callback?(subject, callback) && 
-                callback.kind == @hook && 
-                matches_conditions?(callback) && 
-                matches_optional_lifecycle?(callback)
-              end
-              callbacks.size > 0
+          def matches? subject
+            check_preconditions!
+            
+            callbacks = subject.send :"_#{@lifecycle}_callbacks"
+            callbacks.any? do |callback|
+              has_callback?(subject, callback) &&
+              matches_hook?(callback) && 
+              matches_conditions?(callback) && 
+              matches_optional_lifecycle?(callback) &&
+              callback_method_exists?(subject, callback)
             end
           end
-
-          def is_callback?(subject, callback)
-            is_callback_object?(subject, callback) || is_callback_symbol?(subject, callback)
-          end
           
-          def is_callback_symbol?(subject, callback)
-            callback.filter == @method
-          end
-
-          def is_callback_object?(subject, callback)
-            @method.kind_of?(Class) && 
-            callback.filter.match(/^_callback/) && 
-            subject.respond_to?("#{callback.filter}_object") && 
-            subject.send("#{callback.filter}_object").class == @method 
+          def callback_method_exists? object, callback
+            if is_class_callback?(object, callback) && !callback_object(object, callback).respond_to?(:"#{@hook}_#{@lifecycle}", true)
+              @failure_message = "callback #{@method} is listed as a callback #{@hook} #{@lifecycle}#{optional_lifecycle_phrase}#{condition_phrase}, but the given object does not respond to #{@hook}_#{@lifecycle} (using respond_to?(:#{@hook}_#{@lifecycle}, true)"
+              false
+            elsif !is_class_callback?(object, callback) && !object.respond_to?(callback.filter, true)
+              @failure_message = "callback #{@method} is listed as a callback #{@hook} #{@lifecycle}#{optional_lifecycle_phrase}#{condition_phrase}, but the model does not respond to #{@method} (using respond_to?(:#{@method}, true)"
+              false
+            else
+              true
+            end
           end
         
           def failure_message
@@ -98,34 +95,106 @@ module Shoulda # :nodoc:
           def description
             "callback #{@method} #{@hook} #{@lifecycle}#{optional_lifecycle_phrase}#{condition_phrase}"
           end
+          
+          
 
           private
           
-            def matches_conditions?(callback)
-              !@condition || callback.options[@condition_type].include?(@condition)
+          def check_preconditions!
+            check_lifecycle_present!
+          end
+          
+          def check_lifecycle_present!
+            unless @lifecycle
+              raise UsageError.new("callback #{@method} can not be tested against an undefined lifecycle, use .before, .after or .around")
             end
+          end
           
-            def matches_optional_lifecycle?(callback)
+          def precondition_failed?
+            @failure_message.present?
+          end
+          
+          def matches_hook? callback
+            callback.kind == @hook
+          end
+
+          def has_callback? subject, callback
+            has_callback_object?(subject, callback) || has_callback_method?(callback) || has_callback_class?(callback)
+          end
+          
+          def has_callback_method? callback
+            callback.filter == @method
+          end
+          
+          def has_callback_class? callback
+            class_callback_required? && callback.filter.is_a?(@method)
+          end
+
+          def has_callback_object? subject, callback
+            callback.filter.respond_to?(:match) &&
+            callback.filter.match(/\A_callback/) && 
+            subject.respond_to?(:"#{callback.filter}_object") && 
+            callback_object(subject, callback).class == @method 
+          end
+          
+          def matches_conditions? callback
+            if rails_4_1?
+              !@condition || callback.instance_variable_get(:"@#{@condition_type}").include?(@condition)
+            else
+              !@condition || callback.options[@condition_type].include?(@condition)
+            end
+          end
+        
+          def matches_optional_lifecycle? callback
+            if rails_4_1?
+              if_conditions = callback.instance_variable_get(:@if)
+              !@optional_lifecycle || if_conditions.include?(lifecycle_context_string) || active_model_proc_matches_optional_lifecycle?(if_conditions)
+            else
               !@optional_lifecycle || callback.options[:if].include?(lifecycle_context_string)
             end
+          end
+        
+          def condition_phrase
+            " #{@condition_type} #{@condition} evaluates to #{@condition_type == :if ? 'true' : 'false'}" if @condition
+          end
+        
+          def optional_lifecycle_phrase
+            " on #{@optional_lifecycle}" if @optional_lifecycle
+          end
           
-            def condition_phrase
-              " #{@condition_type} #{@condition} evaluates to #{@condition_type == :if ? 'true' : 'false'}" if @condition
+          def lifecycle_context_string
+            if rails_4?
+              "[:#{@optional_lifecycle}].include? self.validation_context"
+            else
+              "self.validation_context == :#{@optional_lifecycle}"
             end
+          end
           
-            def optional_lifecycle_phrase
-              " on #{@optional_lifecycle}" if @optional_lifecycle
+          def active_model_proc_matches_optional_lifecycle? if_conditions
+            if_conditions.select{|i| i.is_a? Proc }.any? do |condition|
+              condition.call OpenStruct.new validation_context: @optional_lifecycle
             end
-            
-            def lifecycle_context_string
-              if ActiveRecord::VERSION::MAJOR == 4
-                "[:#{@optional_lifecycle}].include? self.validation_context"
-              else
-                "self.validation_context == :#{@optional_lifecycle}"
-              end
+          end
+          
+          def class_callback_required?
+            !@method.is_a?(Symbol) && !@method.is_a?(String)
+          end
+          
+          def is_class_callback? subject, callback
+            !callback_object(subject, callback).is_a?(Symbol) && !callback_object(subject, callback).is_a?(String)
+          end
+          
+          def callback_object subject, callback
+            if rails_3? && !callback.filter.is_a?(Symbol)
+              subject.send("#{callback.filter}_object")
+            else
+              callback.filter
             end
+          end
 
         end
+        
+        UsageError = Class.new NameError
       end
     end
   end

data/lib/shoulda/callback/matchers/integrations/test_unit.rb

@@ -1,15 +1,17 @@
 # :enddoc:
 
+include Shoulda::Callback::Matchers::RailsVersionHelper
+
 # in environments where test/unit is not required, this is necessary
 unless defined?(Test::Unit::TestCase)
   begin
-    require 'test/unit/testcase'
+    require rails_4_1? ? 'minitest' : 'test/unit/testcase'
   rescue LoadError
     # silent
   end
 end
 
-if defined?(ActiveRecord)
+if defined?(::ActiveRecord)
   require 'shoulda/callback/matchers/active_model'
 
   module Test
@@ -20,7 +22,7 @@ if defined?(ActiveRecord)
       end
     end
   end
-elsif defined?(ActiveModel)
+elsif defined?(::ActiveModel)
   require 'shoulda/callback/matchers/active_model'
   
   module Test

data/lib/shoulda/callback/matchers/rails_version_helper.rb

@@ -0,0 +1,46 @@
+# :enddoc:
+module Shoulda
+  module Callback
+    module Matchers
+      module RailsVersionHelper
+        def rails_4_1?
+          rails_4? && minor_version_equals?(1)
+        end
+  
+        def rails_4_0?
+          rails_4? && vminor_version_equals?(0)
+        end
+  
+        def rails_4?
+          major_version_equals? 4
+        end
+  
+        def rails_3?
+          major_version_equals? 3
+        end
+        
+        private
+        
+        def major_version_equals? number
+          if active_record?
+            ActiveRecord::VERSION::MAJOR == number
+          else
+            ActiveModel::VERSION::MAJOR == number
+          end
+        end
+        
+        def minor_version_equals? number
+          if active_record?
+            ActiveRecord::VERSION::MINOR == number
+          else
+            ActiveModel::VERSION::MINOR == number
+          end
+        end
+        
+        def active_record?
+          defined?(::ActiveRecord)
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/callback/matchers/version.rb

@@ -1,7 +1,7 @@
 module Shoulda
   module Callback
     module Matchers
-      VERSION = '0.4.0'.freeze
+      VERSION = '1.0.0'.freeze
     end
   end
 end

data/shoulda-callback-matchers.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('appraisal',   '~> 0.5')
   s.add_development_dependency('aruba')
-  s.add_development_dependency('bourne',      '~> 1.3')
   s.add_development_dependency('bundler',     '>= 1.1')
   s.add_development_dependency('rails',       '>= 3')
   s.add_development_dependency('rake',        '~> 10')

data/spec/shoulda/active_model/callback_matcher_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+  require 'spec_helper'
 
 describe Shoulda::Callback::Matchers::ActiveModel do
   
   context "invalid use" do
     before do
-      @callback_object_class = define_model(:callback) do
+      @callback_object_class = define_model :callback do
           define_method("before_create"){}
           define_method("after_save"){}
       end
@@ -13,35 +13,30 @@ describe Shoulda::Callback::Matchers::ActiveModel do
                                       :other => :integer) do
         before_create :dance!, :if => :evaluates_to_false!
         after_save  :shake!, :unless => :evaluates_to_true!
+        after_create :wiggle!
         before_create callback_object, :if => :evaluates_to_false!
         after_save  callback_object, :unless => :evaluates_to_true!
+        after_create callback_object
         define_method(:shake!){}
         define_method(:dance!){}
       end.new
+      
     end
-    it "should return a meaningful failure message when used without a defined lifecycle" do
-      matcher = callback(:dance!)
-      matcher.matches?(@model).should be_false
-      matcher.failure_message.should == "callback dance! can not be tested against an undefined lifecycle, use .before, .after or .around"
-      matcher.negative_failure_message.should == "callback dance! can not be tested against an undefined lifecycle, use .before, .after or .around"
+    it "should return a meaningful error when used without a defined lifecycle" do
+      lambda { callback(:dance!).matches? :foo }.should raise_error Shoulda::Callback::Matchers::ActiveModel::UsageError,
+        "callback dance! can not be tested against an undefined lifecycle, use .before, .after or .around"
     end
-    it "should return a meaningful failure message when used with an optional lifecycle without the original lifecycle being validation" do
-      matcher = callback(:dance!).after(:create).on(:save)
-      matcher.matches?(@model).should be_false
-      matcher.failure_message.should == "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
-      matcher.negative_failure_message.should == "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
+    it "should return a meaningful error when used with an optional lifecycle without the original lifecycle being validation" do
+      lambda { callback(:dance!).after(:create).on(:save) }.should raise_error Shoulda::Callback::Matchers::ActiveModel::UsageError,
+        "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
     end
-    it "should return a meaningful failure message when used without a defined lifecycle" do
-      matcher = callback(@callback_object_class)
-      matcher.matches?(@model).should be_false
-      matcher.failure_message.should == "callback Callback can not be tested against an undefined lifecycle, use .before, .after or .around"
-      matcher.negative_failure_message.should == "callback Callback can not be tested against an undefined lifecycle, use .before, .after or .around"
+    it "should return a meaningful error when used without a defined lifecycle" do
+      lambda { callback(@callback_object_class).matches? :foo }.should raise_error Shoulda::Callback::Matchers::ActiveModel::UsageError,
+        "callback Callback can not be tested against an undefined lifecycle, use .before, .after or .around"
     end
-    it "should return a meaningful failure message when used with an optional lifecycle without the original lifecycle being validation" do
-      matcher = callback(@callback_object_class).after(:create).on(:save)
-      matcher.matches?(@model).should be_false
-      matcher.failure_message.should == "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
-      matcher.negative_failure_message.should == "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
+    it "should return a meaningful error when used with an optional lifecycle without the original lifecycle being validation" do
+      lambda { callback(@callback_object_class).after(:create).on(:save) }.should raise_error Shoulda::Callback::Matchers::ActiveModel::UsageError,
+        "The .on option is only valid for the validation lifecycle and cannot be used with create, use with .before(:validation) or .after(:validation)"
     end
   end
   
@@ -54,10 +49,17 @@ describe Shoulda::Callback::Matchers::ActiveModel do
           define_method("after_#{lifecycle}"){}
           define_method("around_#{lifecycle}"){}
         end
-
+        
         callback_object = @callback_object_class.new
+        
+        @other_callback_object_class = define_model(:other_callback) do
+          define_method("after_#{lifecycle}"){}
+          define_method("around_#{lifecycle}"){}
+        end
 
-        @callback_object_not_found_class = define_model(:callback_not_fount) do
+        other_callback_object = @other_callback_object_class.new
+        
+        @callback_object_not_found_class = define_model(:callback_not_found) do
           define_method("before_#{lifecycle}"){}
           define_method("after_#{lifecycle}"){}
           define_method("around_#{lifecycle}"){}
@@ -68,9 +70,13 @@ describe Shoulda::Callback::Matchers::ActiveModel do
           send(:"before_#{lifecycle}", :dance!, :if => :evaluates_to_false!)
           send(:"after_#{lifecycle}", :shake!, :unless => :evaluates_to_true!)
           send(:"around_#{lifecycle}", :giggle!)
+          send(:"before_#{lifecycle}", :wiggle!)
+          
           send(:"before_#{lifecycle}", callback_object, :if => :evaluates_to_false!)
           send(:"after_#{lifecycle}", callback_object, :unless => :evaluates_to_true!)
           send(:"around_#{lifecycle}", callback_object)
+          send(:"before_#{lifecycle}", other_callback_object)
+          
           define_method(:shake!){}
           define_method(:dance!){}
           define_method(:giggle!){}
@@ -115,6 +121,16 @@ describe Shoulda::Callback::Matchers::ActiveModel do
           matcher = callback(@callback_object_class).before(lifecycle)
           matcher.description.should == "callback Callback before #{lifecycle}"
         end
+        it "should have a meaningful error if it fails with an inexistent method on a model" do
+          matcher = callback(:wiggle!).before(lifecycle)
+          matcher.matches?(@model).should be_false
+          matcher.failure_message.should == "callback wiggle! is listed as a callback before #{lifecycle}, but the model does not respond to wiggle! (using respond_to?(:wiggle!, true)"
+        end
+        it "should have a meaningful error if it fails with an inexistent method on a callback class" do
+          matcher = callback(@other_callback_object_class).before(lifecycle)
+          matcher.matches?(@model).should be_false
+          matcher.failure_message.should == "callback OtherCallback is listed as a callback before #{lifecycle}, but the given object does not respond to before_#{lifecycle} (using respond_to?(:before_#{lifecycle}, true)"
+        end
       end
       context "with conditions" do
         it "should match the if condition" do
@@ -169,7 +185,7 @@ describe Shoulda::Callback::Matchers::ActiveModel do
       callback_object = @callback_object_class.new
       callback_object2 = @callback_object_class2.new
 
-      @callback_object_not_found_class = define_model(:callback_not_fount) do
+      @callback_object_not_found_class = define_model(:callback_not_found) do
         define_method("before_validation"){}
         define_method("after_validation"){}
       end
@@ -338,7 +354,7 @@ describe Shoulda::Callback::Matchers::ActiveModel do
     end
   end
   
-  [:initialize, :find, :touch].each do |lifecycle|
+  [:initialize, :find, :touch, :rollback, :commit].each do |lifecycle|
     
     context "on #{lifecycle}" do
       before do
@@ -353,7 +369,7 @@ describe Shoulda::Callback::Matchers::ActiveModel do
         callback_object = @callback_object_class.new
         callback_object2 = @callback_object_class2.new
 
-        @callback_object_not_found_class = define_model(:callback_not_fount) do
+        @callback_object_not_found_class = define_model(:callback_not_found) do
           define_method("after_#{lifecycle}"){}
         end
 

data/spec/spec_helper.rb

@@ -1,26 +1,34 @@
-# Create Rails environment based on the version given from Appraisal
-TESTAPP_ROOT = File.join(File.dirname(__FILE__), '..', 'tmp', 'aruba', 'testapp')
-FileUtils.rm_rf(TESTAPP_ROOT) if File.exists?(TESTAPP_ROOT)
-`rails new #{TESTAPP_ROOT}`
+require 'logger'
+
+LOGGER = Logger.new STDOUT
+TESTAPP_ROOT = Pathname.new File.expand_path('../tmp/aruba/testapp', __FILE__)
+FileUtils.rm_rf TESTAPP_ROOT if File.exists? TESTAPP_ROOT
 
 ENV['RAILS_ENV'] = 'test'
-ENV['BUNDLE_GEMFILE'] ||= TESTAPP_ROOT + '/Gemfile'
+ENV['BUNDLE_GEMFILE'] ||= TESTAPP_ROOT.join('Gemfile')
+
+LOGGER.info "Generating Rails app in #{TESTAPP_ROOT}..."
+`rails new #{TESTAPP_ROOT}`
+LOGGER.info "Done"
 
-require "#{TESTAPP_ROOT}/config/environment"
-require 'bourne'
+require TESTAPP_ROOT.join('config', 'environment')
 require 'shoulda-callback-matchers'
 require 'rspec/rails'
 
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
+PROJECT_ROOT = Pathname.new File.expand_path('../..', __FILE__)
+$LOAD_PATH << PROJECT_ROOT.join('lib')
 
-$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
-
-Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }
+Dir[PROJECT_ROOT.join('spec', 'support', '**', '*.rb')].each do |file|
+  require file
+end
 
 # Run the migrations
+LOGGER.info "Running the migrations for the testapp..."
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
+LOGGER.info "Done"
 
 RSpec.configure do |config|
-  config.mock_with :mocha
-end
+  config.include ClassBuilder
+  config.include ModelBuilder
+end

data/spec/support/class_builder.rb

@@ -1,5 +1,5 @@
 module ClassBuilder
-  def self.included(example_group)
+  def self.included example_group
     example_group.class_eval do
       after do
         teardown_defined_constants
@@ -7,18 +7,9 @@ module ClassBuilder
     end
   end
 
-  def define_class(class_name, base = Object, &block)
-    class_name = class_name.to_s.camelize
-
-    # FIXME: ActionMailer 3.2 calls `name.underscore` immediately upon
-    # subclassing. Class.new.name == nil. So, Class.new(ActionMailer::Base)
-    # errors out since it's trying to do `nil.underscore`. This is very ugly but
-    # allows us to test against ActionMailer 3.2.x.
-    eval <<-A_REAL_CLASS_FOR_ACTION_MAILER_3_2
-    class ::#{class_name} < #{base}
-    end
-    A_REAL_CLASS_FOR_ACTION_MAILER_3_2
-
+  def define_class class_name, base = Object, &block
+    Object.const_set class_name, Class.new(base)
+    
     Object.const_get(class_name).tap do |constant_class|
       constant_class.unloadable
 
@@ -35,8 +26,4 @@ module ClassBuilder
   def teardown_defined_constants
     ActiveSupport::Dependencies.clear
   end
-end
-
-RSpec.configure do |config|
-  config.include ClassBuilder
-end
+end

data/spec/support/model_builder.rb

@@ -12,17 +12,12 @@ module ModelBuilder
   end
 
   def create_table(table_name, options = {}, &block)
-    connection = ActiveRecord::Base.connection
-
-    begin
-      connection.execute("DROP TABLE IF EXISTS #{table_name}")
-      connection.create_table(table_name, options, &block)
-      @created_tables << table_name
-      connection
-    rescue Exception => e
-      connection.execute("DROP TABLE IF EXISTS #{table_name}")
-      raise e
-    end
+    connection.create_table(table_name, options, &block)
+    @created_tables << table_name
+    connection
+  rescue Exception => e
+    drop_table(table_name)
+    raise e
   end
 
   def define_model_class(class_name, &block)
@@ -60,14 +55,16 @@ module ModelBuilder
   end
 
   def drop_created_tables
-    connection = ActiveRecord::Base.connection
-
     @created_tables.each do |table_name|
-      connection.execute("DROP TABLE IF EXISTS #{table_name}")
+      drop_table(table_name)
     end
   end
-end
-
-RSpec.configure do |config|
-  config.include ModelBuilder
+  
+  def drop_table table_name
+    connection.execute("DROP TABLE IF EXISTS #{table_name}")
+  end
+  
+  def connection
+    @connection ||= ActiveRecord::Base.connection
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-callback-matchers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,10 +115,7 @@ extensions:
 - ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
-- .ruby-gemset
-- .ruby-version
 - .travis.yml
 - Appraisals
 - CONTRIBUTING.md
@@ -147,12 +130,11 @@ files:
 - lib/shoulda/callback/matchers/active_model.rb
 - lib/shoulda/callback/matchers/integrations/rspec.rb
 - lib/shoulda/callback/matchers/integrations/test_unit.rb
+- lib/shoulda/callback/matchers/rails_version_helper.rb
 - lib/shoulda/callback/matchers/version.rb
 - shoulda-callback-matchers.gemspec
-- spec/fixtures/users.yml
 - spec/shoulda/active_model/callback_matcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_model_versions.rb
 - spec/support/class_builder.rb
 - spec/support/model_builder.rb
 homepage: http://github.com/beatrichartz/shoulda-callback-matchers
@@ -180,9 +162,7 @@ signing_key:
 specification_version: 4
 summary: Making callback tests easy on the fingers and eyes
 test_files:
-- spec/fixtures/users.yml
 - spec/shoulda/active_model/callback_matcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_model_versions.rb
 - spec/support/class_builder.rb
 - spec/support/model_builder.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-should-callback-matchers

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3

data/spec/fixtures/users.yml

@@ -1,6 +0,0 @@
-first:
-  id: 1
-  name: Some dude
-  age: 2
-  email: none@none.com
-  ssn: 123456789

data/spec/support/active_model_versions.rb

@@ -1,9 +0,0 @@
-RSpec.configure do |c|
-  def active_model_3_1?
-    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1
-  end
-
-  def active_model_3_2?
-    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 2
-  end
-end