Serialize and deserialize week start day

README.md

@@ -166,6 +166,9 @@ schedule.add_recurrence_rule Rule.weekly(2).day(:monday, :tuesday)
 
 # for programatic convenience (same as above)
 schedule.add_recurrence_rule Rule.weekly(2).day(1, 2)
+
+# specifying a weekly interval with a different first weekday (defaults to Sunday)
+schedule.add_recurrence_rule Rule.weekly(2, :monday)
 ```
 
 ### Monthly (by day of month)

lib/ice_cube/rule.rb

@@ -48,6 +48,7 @@ def self.from_hash(original_hash)
       hash = IceCube::FlexibleHash.new original_hash
       return nil unless match = hash[:rule_type].match(/\:\:(.+?)Rule/)
       rule = IceCube::Rule.send(match[1].downcase.to_sym, hash[:interval] || 1)
+      rule.interval(hash[:interval] || 1, TimeUtil.daynum_to_symbol(hash[:week_start] || 0)) if match[1] == "Weekly"
       rule.until(TimeUtil.deserialize_time(hash[:until])) if hash[:until]
       rule.count(hash[:count]) if hash[:count]
       hash[:validations] && hash[:validations].each do |key, value|

lib/ice_cube/time_util.rb

@@ -99,6 +99,13 @@ def self.week_start(sym)
     def self.normalize_weekday(daynum, week_start)
       (daynum - symbol_to_day(week_start)) % 7
     end
+
+    # Convert day number to day symbol
+    def self.daynum_to_symbol(daynum)
+      raise "No such day number: #{daynum}" unless (0..6).include?(daynum)
+      day = DAYS.invert[daynum]
+      day
+    end
 
     # Return the count of the number of times wday appears in the month,
     # and which of those time falls on

lib/ice_cube/validations/weekly_interval.rb

@@ -5,11 +5,17 @@ module IceCube
   module Validations::WeeklyInterval
 
     def interval(interval, week_start = :sunday)
+      @week_start = week_start
       @interval = interval
       validations_for(:interval) << Validation.new(interval, week_start)
       clobber_base_validations(:day)
       self
     end
+
+    def week_start
+      @week_start
+    end
+
 
     class Validation
 
@@ -33,6 +39,7 @@ def build_ical(builder)
 
       def build_hash(builder)
         builder[:interval] = interval
+        builder[:week_start] = TimeUtil.symbol_to_day(week_start)
       end
 
       def initialize(interval, week_start)

spec/examples/to_yaml_spec.rb

@@ -269,6 +269,18 @@
     rule = IceCube::Rule.from_yaml rule.to_yaml
     rule.occurrence_count.should == 5
   end
+
+  it 'should be able to bring a Rule to_yaml and back with an undefined week start' do
+    rule = IceCube::Rule.weekly(2)
+    rule = IceCube::Rule.from_yaml rule.to_yaml
+    rule.week_start.should == :sunday
+  end
+
+  it 'should be able to bring a Rule to_yaml and back with a week start defined' do
+    rule = IceCube::Rule.weekly.interval(2, :monday)
+    rule = IceCube::Rule.from_yaml rule.to_yaml
+    rule.week_start.should == :monday
+  end
 
   it 'should be able to bring in a schedule with a rule from hash with symbols or strings' do
     time = Time.zone.now