nilify_blanks.rb in nilify_blanks-1.1.0

- old
+ new
@@ -2,46 +2,81 @@
   def self.included(base)
     base.extend ClassMethods
   end
 
   module ClassMethods
+    DEFAULT_TYPES = [:string, :text]
 
+    @@define_nilify_blank_methods_lock = Mutex.new
+
+    # This overrides the underlying rails method that defines attribute methods.
+    # This must be thread safe, just like the underlying method.
+    #
     def define_attribute_methods
+      if super
+        define_nilify_blank_methods
+      end
+    end
+
+    def inherited(child_class)
+      if instance_variable_get(:@_nilify_blanks_options) and !child_class.instance_variable_get(:@_nilify_blanks_options)
+        child_class.nilify_blanks @_nilify_blanks_options
+      end
+
       super
-      define_nilify_blank_methods
     end
 
     def nilify_blanks(options = {})
-      return if self.included_modules.include?(NilifyBlanks::InstanceMethods)
+      return if @_nilify_blanks_options
 
-      include NilifyBlanks::InstanceMethods
+      unless included_modules.include?(NilifyBlanks::InstanceMethods)
+        include NilifyBlanks::InstanceMethods
+      end
 
       @_nilify_blanks_options = options
+
+      # Normally we wait for rails to define attribute methods, but we could be calling this after this has already been done.
+      # If so, let's just immediately generate nilify blanks methods.
+      #
+      if @attribute_methods_generated
+        define_nilify_blank_methods
+      end
+
+      descendants.each do |subclass|
+        subclass.nilify_blanks @_nilify_blanks_options
+      end
     end
 
+
     private
 
     def define_nilify_blank_methods
       return unless @_nilify_blanks_options
+      return if @nilify_blank_methods_generated
 
-      options = @_nilify_blanks_options
-      options[:only] = Array.wrap(options[:only]).map(&:to_s) if options[:only]
-      options[:except] = Array.wrap(options[:except]).map(&:to_s) if options[:except]
+      @@define_nilify_blank_methods_lock.synchronize do
+        options = @_nilify_blanks_options
 
-      cattr_accessor :nilify_blanks_columns
+        options[:only] = Array.wrap(options[:only]).map(&:to_s) if options[:only]
+        options[:except] = Array.wrap(options[:except]).map(&:to_s) if options[:except]
+        options[:types] = options[:types] ? Array.wrap(options[:types]).map(&:to_sym) : DEFAULT_TYPES
 
-      if options[:only]
-        self.nilify_blanks_columns = options[:only].clone
-      else
-        self.nilify_blanks_columns = self.content_columns.select(&:null).map(&:name).map(&:to_s)
-      end
-      self.nilify_blanks_columns -= options[:except] if options[:except]
-      self.nilify_blanks_columns = self.nilify_blanks_columns.map(&:to_s)
+        cattr_accessor :nilify_blanks_columns
 
-      options[:before] ||= :save
-      send("before_#{options[:before]}", :nilify_blanks)
-    end
+        if options[:only]
+          self.nilify_blanks_columns = options[:only].clone
+        else
+          self.nilify_blanks_columns = self.content_columns.select(&:null).select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
+        end
 
+        self.nilify_blanks_columns -= options[:except] if options[:except]
+        self.nilify_blanks_columns = self.nilify_blanks_columns.map(&:to_s)
+
+        options[:before] ||= :save
+        send("before_#{options[:before]}", :nilify_blanks)
+        @nilify_blanks_methods_generated = true
+      end
+    end
   end
 
   module InstanceMethods
     def nilify_blanks
       (self.nilify_blanks_columns || []).each do |column|