amfetamine 0.2.3 → 0.2.4

data/lib/amfetamine/base.rb

@@ -11,7 +11,7 @@ module Amfetamine
     include ActiveModel::Conversion
 
     #Callbacks
-    define_model_callbacks :create, :save
+    define_model_callbacks :create, :save, :validation
 
 
     # amfetamine
@@ -148,8 +148,10 @@ module Amfetamine
 
     # Checks to see if an object is valid or not
     def valid?
-      errors.clear
-      run_validations!
+      run_callbacks(:validation) do
+        errors.clear
+        run_validations!
+      end
     end
 
     # We need to redefine this so it doesn't check on object_id

data/lib/amfetamine/version.rb

@@ -1,3 +1,3 @@
 module Amfetamine
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/amfetamine/callbacks_spec.rb

@@ -29,6 +29,14 @@ describe "Callbacks" do
       dummy.save
     end
   end
+
+  context "validate" do
+    it "should work" do
+      dummy = build(:dummy)
+      dummy.should_receive(:"action_before_validate")
+      dummy.valid?
+    end
+  end
 end
 
 

data/spec/dummy/dummy.rb

@@ -12,6 +12,8 @@ class Dummy < Amfetamine::Base
   before_save :action_before_save
   after_save :action_after_save
 
+  before_validation :action_before_validate
+
 
   # Needed for proper ID tracking
   def initialize(args={})
@@ -37,4 +39,7 @@ class Dummy < Amfetamine::Base
   def action_after_save
   end
 
+  def action_before_validate
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amfetamine
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346377471580 !ruby/object:Gem::Requirement
+  requirement: &70200179931600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377471580
+  version_requirements: *70200179931600
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70346377471140 !ruby/object:Gem::Requirement
+  requirement: &70200179929820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377471140
+  version_requirements: *70200179929820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70346377470720 !ruby/object:Gem::Requirement
+  requirement: &70200179946680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377470720
+  version_requirements: *70200179946680
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70346377470300 !ruby/object:Gem::Requirement
+  requirement: &70200179941740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377470300
+  version_requirements: *70200179941740
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70346377469880 !ruby/object:Gem::Requirement
+  requirement: &70200179939100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377469880
+  version_requirements: *70200179939100
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70346377469460 !ruby/object:Gem::Requirement
+  requirement: &70200179961500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377469460
+  version_requirements: *70200179961500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70346377469040 !ruby/object:Gem::Requirement
+  requirement: &70200179960040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377469040
+  version_requirements: *70200179960040
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &70346377102220 !ruby/object:Gem::Requirement
+  requirement: &70200179958400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346377102220
+  version_requirements: *70200179958400
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70346377101780 !ruby/object:Gem::Requirement
+  requirement: &70200179957160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346377101780
+  version_requirements: *70200179957160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70346377101260 !ruby/object:Gem::Requirement
+  requirement: &70200179969160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346377101260
+  version_requirements: *70200179969160
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70346377100740 !ruby/object:Gem::Requirement
+  requirement: &70200179990040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346377100740
+  version_requirements: *70200179990040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70346377100100 !ruby/object:Gem::Requirement
+  requirement: &70200179985880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346377100100
+  version_requirements: *70200179985880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346377099400 !ruby/object:Gem::Requirement
+  requirement: &70200179997720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346377099400
+  version_requirements: *70200179997720
 description: Wraps REST to objects, provides caching and makes your app go Bzzz!
 email:
 - timon@exvo.com