Merge pull request joelmoss#4 from pathable/default-value

Add default option.

lib/bitmask_attributes.rb

@@ -10,6 +10,12 @@ def bitmask(attribute, options={}, &extension)
         raise ArgumentError, "Must provide an Array :as option"
       end
 
+      if default = options[:default]
+        after_initialize do
+          send("#{attribute}=", default) unless send("#{attribute}?")
+        end
+      end
+
       bitmask_definitions[attribute] = Definition.new(attribute, options[:as].to_a,options[:null].nil? || options[:null], options[:zero_value], &extension)
       bitmask_definitions[attribute].install_on(self)
     end
@@ -34,4 +40,4 @@ def base_class_bitmasks
   end
 end
 
-ActiveRecord::Base.send :include, BitmaskAttributes
+ActiveRecord::Base.send :include, BitmaskAttributes

test/bitmask_attributes_test.rb

@@ -312,6 +312,13 @@ def assert_stored(record, *values)
     end
   end
 
+  should "accept a default value option" do
+    assert_equal DefaultValue.new.default_sym, [:y]
+    assert_equal DefaultValue.new.default_array, [:y, :z]
+    assert_equal DefaultValue.new(:default_sym => :x).default_sym, [:x]
+    assert_equal DefaultValue.new(:default_array => [:x]).default_array, [:x]
+  end
+
   context_with_classes 'Campaign with null attributes',CampaignWithNull,CompanyWithNull
   context_with_classes 'Campaign without null attributes',CampaignWithoutNull,CompanyWithoutNull
   context_with_classes 'SubCampaign with null attributes',SubCampaignWithNull,CompanyWithNull

test/support/models.rb

@@ -15,6 +15,9 @@
   create_table :company_without_nulls do |t|
     t.string :name
   end
+  create_table :default_values do |t|
+    t.integer :default_sym, :default_array
+  end
 end
 
 # Pseudo models for testing purposes
@@ -55,4 +58,9 @@ def worked?
 end
 
 class SubCampaignWithoutNull < CampaignWithNull
-end
+end
+
+class DefaultValue < ActiveRecord::Base
+  bitmask :default_sym, :as => [:x, :y, :z], :default => :y
+  bitmask :default_array, :as => [:x, :y, :z], :default => [:y, :z]
+end