attr_bucket 0.2.0 → 0.2.1

data/lib/attr_bucket.rb

@@ -1,6 +1,11 @@
 module AttrBucket
   def self.included(base) #:nodoc:
     base.extend ClassMethods
+    base.class_attribute :bucketed_attributes
+    base.bucketed_attributes = []
+    base.instance_eval do
+      alias_method_chain :assign_multiparameter_attributes, :attr_bucket
+    end
   end
 
   private
@@ -8,10 +13,10 @@ module AttrBucket
   # Retrieve the attribute bucket, or if it's not yet a Hash,
   # initialize it as one.
   def get_attr_bucket(name)
-    unless read_attribute(name).is_a?(Hash)
-      write_attribute(name, {})
+    unless self[name].is_a?(Hash)
+      self[name] = {}
     end
-    read_attribute(name)
+    self[name]
   end
 
   def valid_class(value, type)
@@ -30,6 +35,17 @@ module AttrBucket
     end
   end
 
+  # We have to override assign_multiparameter_attributes to catch
+  # dates/times for bucketed columns and handle them ourselves
+  # before passing the remainder on for ActiveRecord::Base to handle.
+  def assign_multiparameter_attributes_with_attr_bucket(pairs)
+    bucket_pairs = pairs.select {|p| self.class.bucketed_attributes.include?(p.first.split('(').first)}
+    extract_callstack_for_multiparameter_attributes(bucket_pairs).each do |name, value|
+      send(name + '=', value)
+    end
+    assign_multiparameter_attributes_without_attr_bucket(pairs - bucket_pairs)
+  end
+
   # Swipe the nifty column typecasting from the column class
   # underlying the bucket column, or use the call method of
   # the object supplied for +type+ if it responds to call.
@@ -47,10 +63,10 @@ module AttrBucket
       when :integer   then value.to_i rescue value ? 1 : 0
       when :float     then value.to_f
       when :decimal   then column_class.value_to_decimal(value)
-      when :datetime  then column_class.string_to_time(value)
-      when :timestamp then column_class.string_to_time(value)
-      when :time      then column_class.string_to_dummy_time(value)
-      when :date      then column_class.string_to_date(value)
+      when :datetime  then cast_to_time(value, column_class)
+      when :timestamp then cast_to_time(value, column_class)
+      when :time      then cast_to_time(value, column_class, true)
+      when :date      then cast_to_date(value, column_class)
       when :binary    then column_class.binary_to_string(value)
       when :boolean   then column_class.value_to_boolean(value)
       else value
@@ -61,6 +77,27 @@ module AttrBucket
     typecasted
   end
 
+  def cast_to_date(value, column_class)
+    if value.is_a?(Array)
+      begin
+        values = value.collect { |v| v.nil? ? 1 : v }
+        Date.new(*values)
+      rescue ArgumentError => e
+        Time.time_with_datetime_fallback(self.class.default_timezone, *values).to_date
+      end
+    else
+      column_class.string_to_date(value)
+    end
+  end
+
+  def cast_to_time(value, column_class, dummy_time = false)
+    if value.is_a?(Array)
+      Time.time_with_datetime_fallback(self.class.default_timezone, *value)
+    else
+      dummy_time ? column_class.string_to_dummy_time(value) : column_class.string_to_time(value)
+    end
+  end
+
   module ClassMethods
     private
 
@@ -118,6 +155,7 @@ module AttrBucket
     alias :i_has_a_bucket :attr_bucket
 
     def define_bucket_reader(bucket_name, attr_name) #:nodoc:
+      self.bucketed_attributes += [attr_name.to_s]
       define_method attr_name do
         get_attr_bucket(bucket_name)[attr_name]
       end unless method_defined? attr_name

data/lib/attr_bucket/version.rb

@@ -1,3 +1,3 @@
 module AttrBucket
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/attr_bucket_spec.rb

@@ -91,12 +91,18 @@ describe AttrBucket do
       @o.salary.should eq 50000.23
     end
 
-    it 'typecasts to Time for :datetime' do
+    it 'typecasts to Time for :datetime as string' do
       @o.hired_at = '2011-01-01 08:00:00'
       @o.hired_at.should be_a Time
       @o.hired_at.should eq Time.parse '2011-01-01 08:00:00'
     end
 
+    it 'typecasts to Time for :datetime as array' do
+      @o.hired_at = [2011, 1, 1, 8, 0]
+      @o.hired_at.should be_a Time
+      @o.hired_at.should eq Time.local(2011, 1, 1, 8, 0)
+    end
+
     it 'typecasts to Time for :timestamp' do
       @o.stamp = '2011-01-01 08:00:00'
       @o.stamp.should be_a Time
@@ -109,12 +115,18 @@ describe AttrBucket do
       @o.workday_starts_at.should eq Time.parse '2000-01-01 08:00:00'
     end
 
-    it 'typecasts to Date for :date in string format' do
+    it 'typecasts to Date for :date as string' do
       @o.birthday = '1977/8/29'
       @o.birthday.should be_a Date
       @o.birthday.should eq Date.new(1977, 8, 29)
     end
 
+    it 'typecasts to Date for :date as array' do
+      @o.birthday = [1977,8,29]
+      @o.birthday.should be_a Date
+      @o.birthday.should eq Date.new(1977, 8, 29)
+    end
+
     it 'typecasts to String for :binary' do
       @o.binary_data = File.read(__FILE__)
       @o.binary_data.should be_a String

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ernie Miller