activerecord-define_nils 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjM4MjhjMmRiODg1MzViMmU0ZmJhZTNkNDM0Njk1OTdkN2U2YzY3Mg==
+  data.tar.gz: !binary |-
+    MTY1OGFjNzhjNjUwNGY5Yzk5ZGJiMmE2NGM0ZDVkZGM2MGRjNGVkNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTVmMTk4MTFmY2NhMzk1OWRkMjY4OWI3ZDFmNmNhODRiOTI5Mjk1OGE2YzYx
+    NmUzYTgzZDM1YjcxOWJhOTE1MTM0MDYzZjRiZWEyZmU3OWJlY2RhNzAxZjVj
+    NGNhNmExMjZjZmIyODljNzRkZmI5YjJmZjUxNGI4YzIyOTE1NTU=
+  data.tar.gz: !binary |-
+    MWMyNThlNzMxOWE5NWViYmU4OWJhYjBlZTNkNTQ1OTFkNmU5MWEyMGE2NDIy
+    OGRlNTQxNjMwODE3OTlmZDRiZjllZDNkMmM2YTM2MDg0MmYzODcwNDhiZGEw
+    ZjE3NDJmZDIwYTlmMGE3MjgwYjFkMjE0MjJjMGM2MDI0MmNmNGY=

data/README.md

@@ -47,6 +47,6 @@ Be sure to place `define_nils` above your `belongs_to` associations in the model
 
 ### License
 
-Copyright (c) 2012 Gary S. Weaver, released under the [MIT license][lic].
+Copyright (c) 2013 Gary S. Weaver, released under the [MIT license][lic].
 
 [lic]: http://github.com/garysweaver/activerecord-define_nils/blob/master/LICENSE

data/lib/activerecord-define_nils/model.rb

@@ -23,7 +23,7 @@ module ActiveRecordDefineNils
             class_eval "def #{attr_name}; value = super(); self.nil_definitions && self.nil_definitions[#{attr_sym.inspect}] && self.nil_definitions[#{attr_sym.inspect}].include?(value) ? nil : value; end"
           end
         else
-          raise ArgumentError.new("define_nils must at least supply :as and :for, but got #{options.inspect}")
+          raise ArgumentError.new("define_nils takes a hash with :as and :for keys, but got #{options.inspect}")
         end
       end
 
@@ -34,7 +34,7 @@ module ActiveRecordDefineNils
         self.nil_definitions.keys.each do |attr_sym|
           self.reflections.collect {|association_name, reflection|
             if reflection.macro == :belongs_to && reflection.foreign_key.to_sym == attr_sym
-              class_eval "def #{association_name}; return nil if send(#{attr_sym.inspect}).nil?; super(); end"
+              class_eval "def #{association_name}; return nil if __send__(#{attr_sym.inspect}).nil?; super(); end"
             end
           }
         end
@@ -44,45 +44,39 @@ module ActiveRecordDefineNils
 
     def read_attribute(attr_name)
       value = super(attr_name)
-      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)
+      (@define_nils_no_read_mod ||= false) ? 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
-      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
+      @define_nils_no_read_mod = true
+      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
-
-        result = super
-      ensure
-        remove_instance_variable(:@define_nils_no_read_mod)
       end
-      result
+
+      super
+    ensure
+      @define_nils_no_read_mod = false
     end
 
     def update(*args)
-      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
+      @define_nils_no_read_mod = true
+      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
-        
-        result = super
-      ensure
-        remove_instance_variable(:@define_nils_no_read_mod)
       end
-      result
+      
+      super
+    ensure
+      @define_nils_no_read_mod = false
     end
   end
 end

data/lib/activerecord-define_nils/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-define_nils
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Gary S. Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,26 +41,25 @@ files:
 homepage: https://github.com/garysweaver/activerecord-define_nils
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Define nils for ActiveRecord 3.x/4.x.
 test_files: []