ice_cube 0.7.11 → 0.8.0

data/lib/ice_cube/rule.rb

@@ -97,8 +97,8 @@ module IceCube
       end
 
       # Weekly Rule
-      def weekly(interval = 1)
-        WeeklyRule.new(interval)
+      def weekly(interval = 1, week_start = :sunday)
+        WeeklyRule.new(interval, week_start)
       end
 
       # Monthly Rule

data/lib/ice_cube/rules/weekly_rule.rb

@@ -4,8 +4,8 @@ module IceCube
 
     include Validations::WeeklyInterval
 
-    def initialize(interval = 1)
-      interval(interval)
+    def initialize(interval = 1, week_start = :sunday)
+      interval(interval, week_start)
       schedule_lock(:wday, :hour, :min, :sec)
     end
 

data/lib/ice_cube/time_util.rb

@@ -64,6 +64,18 @@ module IceCube
       day
     end
 
+    # Convert a symbol to an ical day (SU, MO)
+    def self.week_start(sym)
+      raise "No such day: #{sym}" unless DAYS.keys.include?(sym)
+      day = sym.to_s.upcase[0..1]
+      day
+    end
+
+    # Convert weekday from base sunday to the schedule's week start.
+    def self.normalize_weekday(daynum, week_start)
+      (daynum - symbol_to_day(week_start)) % 7
+    end
+
     # Return the count of the number of times wday appears in the month,
     # and which of those time falls on
     def self.which_occurrence_in_month(time, wday)
@@ -93,7 +105,7 @@ module IceCube
     def self.days_in_month_year(month, year)
       is_leap?(year) ? LEAP_YEAR_MONTH_DAYS[month - 1] : COMMON_YEAR_MONTH_DAYS[month - 1]
     end
-    
+
     # Number of days in a year
     def self.days_in_year(time)
       is_leap?(time.year) ? 366 : 365
@@ -190,7 +202,7 @@ module IceCube
           yield
         end
       end
- 
+
       def clear_sec
         @time -= @time.sec
       end

data/lib/ice_cube/validations/weekly_interval.rb

@@ -4,14 +4,15 @@ module IceCube
 
   module Validations::WeeklyInterval
 
-    def interval(interval)
-      validations_for(:interval) << Validation.new(interval)
+    def interval(interval, week_start = :sunday)
+      validations_for(:interval) << Validation.new(interval, week_start)
       clobber_base_validations(:day)
+      self
     end
 
     class Validation
 
-      attr_reader :interval
+      attr_reader :interval, :week_start
 
       def type
         :day
@@ -25,6 +26,7 @@ module IceCube
         builder['FREQ'] << 'WEEKLY'
         unless interval == 1
           builder['INTERVAL'] << interval
+          builder['WKST'] << TimeUtil.week_start(week_start)
         end
       end
 
@@ -32,15 +34,19 @@ module IceCube
         builder[:interval] = interval
       end
 
-      def initialize(interval)
+      def initialize(interval, week_start)
         @interval = interval
+        @week_start = week_start
       end
 
       def validate(time, schedule)
         date = Date.new(time.year, time.month, time.day)
         st = schedule.start_time
         start_date = Date.new(st.year, st.month, st.day)
-        weeks = ((date - date.wday) - (start_date - start_date.wday)) / 7
+        weeks = (
+          (date - TimeUtil.normalize_weekday(date.wday, week_start)) - 
+          (start_date - TimeUtil.normalize_weekday(start_date.wday, week_start))
+        ) / 7
         unless weeks % interval == 0
           (interval - (weeks % interval)) * 7
         end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.7.11'
+  VERSION = '0.8.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-03-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353556988740 !ruby/object:Gem::Requirement
+  requirement: &70300114106600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353556988740
+  version_requirements: *70300114106600
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70353556988100 !ruby/object:Gem::Requirement
+  requirement: &70300114105840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70353556988100
+  version_requirements: *70300114105840
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70353556986140 !ruby/object:Gem::Requirement
+  requirement: &70300114105260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353556986140
+  version_requirements: *70300114105260
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com