active_tools 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2895e755290fdee6deebf87759443fe717e95de
-  data.tar.gz: 9d2b4743a87b380f67c715a5f67e914385dfb186
+  metadata.gz: f36877ba1612f7582251d82e3e92b6fa6da7d984
+  data.tar.gz: e590d9d69a3851187404b6d3e1b6174be2de860d
 SHA512:
-  metadata.gz: 5525fe85bda2749a3114c353a4a84b3e7b6f5aa2f90bc6032796cf78a576625cf02e947a95fdc99d0bb67d06123c73de8535181e2776315a7b536e024241933b
-  data.tar.gz: 1bbcc9e184b7fd90d587b85a8a1307c629ca41bfccb82793a5794b01016422fc0c6d36fb5a104b6588f5bfa11fd157e01abbaff3602eb2bf9c17e06309c33785
+  metadata.gz: dc1308828f61e57c76f01a5a8e7c6bae3edf10d0fde92d675235c6d0a1c9e066f51a4cbdc7f15143a7e6b5dea9f08efdf532cec57b3cb64f6b05112a871e6056
+  data.tar.gz: c9ec0279cae626e6032a89c378ca167a9803b0faf9d3819b62b64aaec90d08a23c37bb9f15b57813edfcffa6ca079f2d21ba547be9f9fa6da9bb7a431228eacd

data/lib/active_tools/active_record/adaptive_belongs_to.rb

@@ -63,7 +63,7 @@ module ActiveTools
           self.adaptive_options[assoc_name.to_sym] = options.merge(:remote_attributes => attr_map.keys)
           
           class_eval <<-EOV
-            after_validation do
+            before_validation do
               #{adapter_name}.try_nullify
               #{adapter_name}.try_commit
             end

data/lib/active_tools/active_record/with_permalink.rb

@@ -15,9 +15,11 @@ module ActiveTools
           cattr_accessor :with_permalink_options unless defined?(with_permalink_options)
           self.with_permalink_options ||= {}
           self.with_permalink_options[column_name] = options
-
+          
+          uniqueness_options = options[:scope] ? {:scope => Array(options[:scope])} : {}
+          
           validates_presence_of column_name
-          validates_uniqueness_of column_name, options[:scope] ? {:scope => Array(options[:scope])} : {}
+          validates_uniqueness_of column_name, uniqueness_options
 
           before_validation do
             self.with_permalink_options.each do |column_name, options|

data/lib/active_tools/version.rb

@@ -1,3 +1,3 @@
 module ActiveTools
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Valery Kvon