custom_rspec_matchers 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    custom_rspec_matchers (0.0.1)
+    custom_rspec_matchers (0.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       rake

data/README.rdoc

@@ -7,16 +7,26 @@ This project contains a few custom rspec matchers that we have built to help us
   describe Duck do
 	
     it { should have_after_create_callback(:after_create_callback) }
-	it { should have_around_create_callback(:around_create_callback) }
-	it { should have_before_create_callback(:before_create_callback) }
+	  it { should have_around_create_callback(:around_create_callback) }
+	  it { should have_before_create_callback(:before_create_callback) }
 	  
-	it { should have_after_save_callback(:after_save_callback) }
-	it { should have_around_save_callback(:around_save_callback) }
-	it { should have_before_save_callback(:before_save_callback) }
+	  it { should have_after_save_callback(:after_save_callback) }
+	  it { should have_around_save_callback(:around_save_callback) }
+	  it { should have_before_save_callback(:before_save_callback) }
 	  
-	it { should have_after_update_callback(:after_update_callback) }
-	it { should have_around_update_callback(:around_update_callback) }
-	it { should have_before_update_callback(:before_update_callback) }
+	  it { should have_after_update_callback(:after_update_callback) }
+	  it { should have_around_update_callback(:around_update_callback) }
+	  it { should have_before_update_callback(:before_update_callback) }
+
+	  it { should have_after_validation_callback(:after_validation_callback) }
+    it { should have_before_validation_callback(:before_validation_callback) }
+  
+    it { should have_after_validation_on_create_callback(:after_validation_on_create_callback) }
+    it { should have_before_validation_on_create_callback(:before_validation_on_create_callback) }
+
+    it { should have_after_validation_on_update_callback(:after_validation_on_update_callback) }
+    it { should have_before_validation_on_update_callback(:before_validation_on_update_callback) }
+	
 	
   end
 

data/custom_rspec_matchers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "custom_rspec_matchers"
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kenny ortmann", "matt simpson", "amos king"]
   s.email       = ['kenny.ortmann@gmail.com', 'matt.simpson@asolutions.com', 'amos.king@asolutions.com']

data/lib/custom_rspec_matchers/matchers/callback_matcher.rb

@@ -21,6 +21,30 @@ module CustomRspecMatchers
       end
     end
     
+    def have_after_validation_callback(method)
+      CallbackMatcher.new(:after, :validation, method)
+    end
+    
+    def have_before_validation_callback(method)
+      CallbackMatcher.new(:before, :validation, method)
+    end
+    
+    def have_after_validation_on_create_callback(method)
+      CallbackMatcher.new(:after, :validation_on_create, method)
+    end
+    
+    def have_before_validation_on_create_callback(method)
+      CallbackMatcher.new(:before, :validation_on_create, method)
+    end
+    
+    def have_after_validation_on_update_callback(method)
+      CallbackMatcher.new(:after, :validation_on_update, method)
+    end
+    
+    def have_before_validation_on_update_callback(method)
+      CallbackMatcher.new(:before, :validation_on_update, method)
+    end
+    
     def have_after_create_callback(method)
       CallbackMatcher.new(:after, :create, method)
     end

data/spec/custom_rspec_matchers/models/duck_spec.rb

@@ -14,4 +14,13 @@ describe Duck do
   it { should have_around_update_callback(:around_update_callback) }
   it { should have_before_update_callback(:before_update_callback) }
 
+  it { should have_after_validation_callback(:after_validation_callback) }
+  it { should have_before_validation_callback(:before_validation_callback) }
+  
+  it { should have_after_validation_on_create_callback(:after_validation_on_create_callback) }
+  it { should have_before_validation_on_create_callback(:before_validation_on_create_callback) }
+
+  it { should have_after_validation_on_update_callback(:after_validation_on_update_callback) }
+  it { should have_before_validation_on_update_callback(:before_validation_on_update_callback) }
+
 end

data/spec/fixtures/models/duck.rb

@@ -1,6 +1,6 @@
 class Duck
   extend ActiveModel::Callbacks
-  define_model_callbacks :create, :update, :save
+  define_model_callbacks :create, :update, :save, :validation, :validation_on_create, :validation_on_update
   after_create :after_create_callback
   around_create :around_create_callback
   before_create :before_create_callback
@@ -13,4 +13,13 @@ class Duck
   around_update :around_update_callback
   before_update :before_update_callback
   
+  before_validation :before_validation_callback
+  after_validation :after_validation_callback
+  
+  before_validation_on_create :before_validation_on_create_callback
+  after_validation_on_create :after_validation_on_create_callback
+
+  before_validation_on_update :before_validation_on_update_callback
+  after_validation_on_update :after_validation_on_update_callback
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - kenny ortmann