shoulda-callback-matchers 0.2.0 → 0.3.0

data/.ruby-gemset

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

data/.ruby-version

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

data/Appraisals

@@ -1,15 +1,5 @@
-appraise '3.0' do
-  gem 'rails', '~>3.0.0'
-end
-
-appraise '3.1' do
-  gem 'rails', '~>3.1.0'
+appraise '4.0' do
+  gem 'rails', '~>4.0.0'
   gem 'jquery-rails'
   gem 'sass-rails'
-end
-
-appraise '3.2' do
-  gem 'rails', '~>3.2.0'
-  gem 'jquery-rails'
-  gem 'sass-rails'
-end
+end

data/Gemfile.lock

@@ -1,124 +1,120 @@
 PATH
   remote: .
   specs:
-    shoulda-callback-matchers (0.1.0)
-      activesupport (>= 3.0.0)
+    shoulda-callback-matchers (0.2.0)
+      activesupport (>= 4.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
+    arel (4.0.0)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.3.0)
-      mocha (= 0.13.0)
-    builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    atomic (1.1.10)
+    bourne (1.3.2)
+      mocha (= 0.13.2)
+    builder (3.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (~> 0.0.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    ffi (1.9.0)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.13.0)
+    mime-types (1.23)
+    minitest (4.7.5)
+    mocha (0.13.2)
       metaclass (~> 0.0.1)
-    multi_json (1.4.0)
+    multi_json (1.7.7)
+    multi_test (0.0.1)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.0.4)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    sprockets (2.2.2)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/README.md

@@ -15,14 +15,20 @@ Matchers to test before, after and around hooks:
     
 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.
 
-In Rails 3 and Bundler, add the following to your Gemfile:
+In Rails 4 and Bundler, add the following to your Gemfile:
 
     group :test do
-      gem "shoulda-callback-matchers"
+      gem "shoulda-callback-matchers", ">=0.3.0"
     end
 
-    # rspec-rails needs to be in the development group so that Rails generators
-    # work.
+In Rails 3 and Bundler, add version 0.0.2 to your Gemfile:
+
+    group :test do
+      gem "shoulda-callback-matchers", "=0.2.0"
+    end
+
+rspec-rails needs to be in the development group so that Rails generators work.
+
     group :development, :test do
       gem "rspec-rails"
     end

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

@@ -89,7 +89,7 @@ module Shoulda # :nodoc:
             end
           
             def matches_optional_lifecycle?(callback)
-              !@optional_lifecycle || callback.options[:if].include?("self.validation_context == :#{@optional_lifecycle}")
+              !@optional_lifecycle || callback.options[:if].include?("[:#{@optional_lifecycle}].include? self.validation_context")
             end
           
             def condition_phrase

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

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

data/shoulda-callback-matchers.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('activesupport', '>= 3.0.0')
+  s.add_dependency('activesupport', '>= 4.0.0')
 
   s.add_development_dependency('appraisal',   '~> 0.5.0')
   s.add_development_dependency('aruba')

data/spec/shoulda/active_model/callback_matcher_spec.rb

@@ -6,7 +6,6 @@ describe Shoulda::Callback::Matchers::ActiveModel do
     before do
       @model = define_model(:example, :attr  => :string,
                                       :other => :integer) do
-        attr_accessible :attr, :other
         before_create :dance!, :if => :evaluates_to_false!
         after_save  :shake!, :unless => :evaluates_to_true!
       end.new
@@ -30,7 +29,6 @@ describe Shoulda::Callback::Matchers::ActiveModel do
       before do
         @model = define_model(:example, :attr  => :string,
                                         :other => :integer) do
-          attr_accessible :attr, :other
           send(:"before_#{lifecycle}", :dance!, :if => :evaluates_to_false!)
           send(:"after_#{lifecycle}", :shake!, :unless => :evaluates_to_true!)
           send(:"around_#{lifecycle}", :giggle!)
@@ -79,7 +77,6 @@ describe Shoulda::Callback::Matchers::ActiveModel do
     before do
       @model = define_model(:example, :attr  => :string,
                                       :other => :integer) do
-        attr_accessible :attr, :other
         before_validation :dance!, :if => :evaluates_to_false!
         after_validation  :shake!, :unless => :evaluates_to_true!
         before_validation :dress!, :on => :create
@@ -171,7 +168,6 @@ describe Shoulda::Callback::Matchers::ActiveModel do
       before do
         @model = define_model(:example, :attr  => :string,
                                         :other => :integer) do
-          attr_accessible :attr, :other
           send(:"after_#{lifecycle}", :dance!, :if => :evaluates_to_false!)
           send(:"after_#{lifecycle}", :shake!, :unless => :evaluates_to_true!)
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-callback-matchers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Appraisals
 - CONTRIBUTING.md
@@ -168,7 +169,6 @@ files:
 - lib/shoulda/callback/matchers/integrations/rspec.rb
 - lib/shoulda/callback/matchers/integrations/test_unit.rb
 - lib/shoulda/callback/matchers/version.rb
-- shoulda-callback-matchers-0.1.0.gem
 - shoulda-callback-matchers.gemspec
 - spec/fixtures/users.yml
 - spec/shoulda/active_model/callback_matcher_spec.rb
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Making callback tests easy on the fingers and eyes

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@shoulda-callback-matchers