activerecord-define_nils 0.0.1 → 0.0.2

data/lib/activerecord-define_nils/model.rb

@@ -44,33 +44,45 @@ module ActiveRecordDefineNils
 
     def read_attribute(attr_name)
       value = super(attr_name)
-      self.nil_definitions && self.nil_definitions[attr_name.to_sym] && self.nil_definitions[attr_name.to_sym].include?(value) ? nil : value
+      defined?(@define_nils_no_read_mod) ? value : (self.nil_definitions && self.nil_definitions[attr_name.to_sym] && self.nil_definitions[attr_name.to_sym].include?(value) ? nil : value)
     end
 
     private
 
     def create
-      if self.nil_saved_as
-        self.nil_saved_as.each do |column, translated_nil|
-          if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
-            write_attribute(column.to_s, translated_nil)
+      instance_variable_set(:@define_nils_no_read_mod, true)
+      begin
+        if self.nil_saved_as
+          self.nil_saved_as.each do |column, translated_nil|
+            if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
+              write_attribute(column.to_s, translated_nil)
+            end
           end
         end
-      end
 
-      super
+        result = super
+      ensure
+        remove_instance_variable(:@define_nils_no_read_mod)
+      end
+      result
     end
 
     def update(*args)
-      if self.nil_saved_as
-        self.nil_saved_as.each do |column, translated_nil|
-          if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
-            write_attribute(column.to_s, translated_nil)
+      instance_variable_set(:@define_nils_no_read_mod, true)
+      begin
+        if self.nil_saved_as
+          self.nil_saved_as.each do |column, translated_nil|
+            if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
+              write_attribute(column.to_s, translated_nil)
+            end
           end
         end
+        
+        result = super
+      ensure
+        remove_instance_variable(:@define_nils_no_read_mod)
       end
-      
-      super
+      result
     end
   end
 end

data/lib/activerecord-define_nils/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordDefineNils
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-define_nils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord