object_attorney 2.10.5 → 2.10.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGIzZmNlNzdmNDU4ODQzY2RmNzcxNWJjNjkyYTAzYTZiN2E3Y2ZmNg==
+    NGI5YjAyYzdlODkyZWZhMjNlNGJjNzljNDI3YmRkYmY0NzRiMjFmMQ==
   data.tar.gz: !binary |-
-    NTk0MDJlYzNjYzE1ZDY4MWU1ZmJiZjBhMTU4NTRlZDcwNTJiMzZiZA==
+    MDc0OTc4MGQ0ZDY4NWNhYTQyYTUyMDYxZTg3NWQ4NzQzM2NhYmI3Ng==
 SHA512:
   metadata.gz: !binary |-
-    YmRlNjFmYjczMDY0ZTNhNDkxNTRhMDhjOTg5OWZlN2U4ZTYxMWEzNjAyMTBm
-    ZGRhYTRiMWNjZGQ1ZTkzNjk3NTgyMzU0OGMzM2I5OTFmZTBhYmUxMzZkNzM4
-    OTE3OTkyYjgxMTQ4ZjlhY2U4MzIxYTk5ZTkwZDFiNjZkOTFiYWI=
+    NTBkNmRhNjBkM2RkMTBiMWY3ZjYzZTVkMjc5Yjg4OWE5ZWYxZjhkY2ExZDE5
+    NjEwMmQzZWUyMDg1ZWI4YWJiZDQzNTFkNjU3Zjc4Y2UzZDViZjcwZTI0OWYx
+    NzY3ZWJkODFmZmRkYzgxNzJiZjU3MjU2NjNhZTc2Y2U1ZTA5NWU=
   data.tar.gz: !binary |-
-    OGE5MTQ1MTljNjQwZGY2MDEzNzFhMGU2MGU5MjQ2ODM4ZjhmOWVkMTY5MWRl
-    NGRiMzRiOTc1NzlkZjFhYjllNjgxNDk1OTA5NTQ0MmVlMjU1NDEwNmUzYjFm
-    MzEyNDg0OTU2MjVmYmNjYWYyNTk4OGEzODQ2ZTc1M2I1NDAxNWI=
+    ZTNlMzMwNmQyOTIwZTNhZjJkMDZlMjAxOTQzYjEzYWVmMzIxOTU0MDlhZjdh
+    ZjQ1MGM0OTAwOGI3Y2JmNTFhNTlhNDA0MDc1OTg0YzQ3NzBhN2Q4Y2UwMTE1
+    ODRkMWNjMmFhYmNhYTkxZGVkMjE5ZDkwOTM4ZDViOWNkMTk4MDE=

data/lib/object_attorney/helpers.rb

@@ -4,6 +4,10 @@ module ObjectAttorney
 
     extend self
 
+    def marked_for_destruction?(object)
+      object.respond_to?(:marked_for_destruction?) ? object.marked_for_destruction? : false
+    end
+
     def is_integer?(string)
       string.match(/^(\d)+$/)
     end

data/lib/object_attorney/nested_objects.rb

@@ -84,7 +84,7 @@ module ObjectAttorney
     private #################### PRIVATE METHODS DOWN BELOW ######################
 
     def populate_foreign_key(origin, destination, reflection, macro)
-      return nil if represented_object.blank? || check_if_marked_for_destruction?(destination) || reflection.macro != macro
+      return nil if represented_object.blank? || Helpers.marked_for_destruction?(destination) || reflection.macro != macro
 
       reflection.set_relational_keys(origin, destination)
     end

data/lib/object_attorney/orm_handlers/smooth_operator.rb

@@ -28,7 +28,7 @@ module ObjectAttorney
         if object == self || object == represented_object
           represented_object.present? ? represented_object.send(save_method, options).ok? : true
         else
-          save_method = :destroy if check_if_marked_for_destruction?(object)
+          save_method = :destroy if Helpers.marked_for_destruction?(object)
           object.send(save_method, options).ok?
         end
       end

data/lib/object_attorney/record.rb

@@ -39,7 +39,7 @@ module ObjectAttorney
       if object == self
         represented_object.present? ? represented_object.send(save_method) : true
       else
-        save_method = :destroy if check_if_marked_for_destruction?(object)
+        save_method = :destroy if Helpers.marked_for_destruction?(object)
         object.send(save_method)
       end
     end
@@ -54,7 +54,7 @@ module ObjectAttorney
 
     def populate_nested_imposed_errors
       nested_objects.each do |reflection, nested_object|
-        next if nested_object.marked_for_destruction?
+        next if Helpers.marked_for_destruction?(nested_object)
         
         nested_object.populate_imposed_errors
         
@@ -112,12 +112,6 @@ module ObjectAttorney
 
     end
 
-    private #################### PRIVATE METHODS DOWN BELOW ######################
-
-    def check_if_marked_for_destruction?(object)
-      object.respond_to?(:marked_for_destruction?) ? object.marked_for_destruction? : false
-    end
-
   end
   
 end

data/lib/object_attorney/validations.rb

@@ -13,7 +13,7 @@ module ObjectAttorney
     end
     
     def override_validations?
-      marked_for_destruction?
+      Helpers.marked_for_destruction?(self)
     end
 
     def clear_imposed_errors

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.10.5"
+  VERSION = "2.10.6"
 end

data/not_used/nested_uniqueness_validator.rb

@@ -7,7 +7,7 @@ module ActiveModel
         uniq_value, existing_objects, first_element = options[:uniq_value], [], nil
 
         record.send(attr_name).each do |object|
-          next if object.marked_for_destruction?
+          next if Helpers.marked_for_destruction?(object)
 
           first_element = object if first_element.nil?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.10.6
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler