ginjo-rfm 2.1.4 → 2.1.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ginjo-Rfm 2.1.5
+
+* Fixed bug preventing validation callbacks from running.
+
 ## Ginjo-Rfm 2.1.4
 
 * Fixed bug where nil value list would raise exception.

data/lib/rfm/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/lib/rfm/base.rb

@@ -169,7 +169,8 @@ module Rfm
       include ActiveModel::Validations
       include ActiveModel::Serialization
       extend ActiveModel::Callbacks
-      define_model_callbacks(:create, :update, :destroy, :validate)
+      include ActiveModel::Validations::Callbacks
+      define_model_callbacks(:create, :update, :destroy)
     rescue LoadError, StandardError
     	def run_callbacks(*args)
     		yield
@@ -332,8 +333,7 @@ module Rfm
     
     # Save record modifications to database (with callbacks & validations). If record cannot be saved will raise error.
     def save!
-      #return unless @mods.size > 0
-      raise "Record Invalid" unless valid? rescue nil
+      #raise "Record Invalid" unless valid? rescue nil
       if @record_id
         self.update
       else
@@ -345,7 +345,7 @@ module Rfm
     def save
       save!
     rescue
-      (self.errors[:base] rescue []) << $!
+      # (self.errors[:base] rescue []) << $!
       return nil
     end
 	  
@@ -400,7 +400,7 @@ module Rfm
     end
     
     def create
-      #return unless @mods.size > 0
+      raise "Record not valid" unless valid?
       run_callbacks :create do
         return unless @mods.size > 0
   	    merge_rfm_result self.class.create_from_new(@mods)
@@ -409,8 +409,8 @@ module Rfm
   	end
   	
     def update(mod_id=nil)
-      #return unless @mods.size > 0 and record_id
-      return false unless record_id
+      raise "Record not valid" unless valid?
+      return false unless record_id 
   	  run_callbacks :update do
   	    return unless @mods.size > 0
   	    unless mod_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ginjo-rfm
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -265,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2515295562877348572
+      hash: -1648802043392305173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: