ice_cube 0.6.4 → 0.6.5

data/lib/ice_cube/schedule.rb

@@ -6,7 +6,7 @@ module IceCube
 
     alias :end_date :end_time
     alias :start_time :start_date
-      
+
     def initialize(start_date, options = {})
       @rrule_occurrence_heads = []
       @exrule_occurrence_heads = []
@@ -43,11 +43,12 @@ module IceCube
     end
 
     # Create a schedule from a hash created by instance.to_hash
-    def self.from_hash(hash)
+    def self.from_hash(hash, hash_options = {})
       options = {}
       options[:duration] = hash[:duration] if hash.has_key?(:duration)
       options[:end_time] = TimeUtil.deserialize_time(hash[:end_time]) if hash.has_key?(:end_time)
-      schedule = Schedule.new(TimeUtil.deserialize_time(hash[:start_date]), options)
+      start_date = hash_options[:start_date_override] || TimeUtil.deserialize_time(hash[:start_date])
+      schedule = Schedule.new(start_date, options)
       hash[:rrules].each { |rr| schedule.add_recurrence_rule Rule.from_hash(rr) }
       hash[:exrules].each { |ex| schedule.add_exception_rule Rule.from_hash(ex) }
       hash[:rdates].each { |rd| schedule.add_recurrence_date TimeUtil.deserialize_time(rd) }
@@ -56,14 +57,14 @@ module IceCube
     end
 
     # Create a schedule from a yaml string created by instance.to_yaml
-    def self.from_yaml(str)
-      from_hash(YAML::load(str))
+    def self.from_yaml(str, hash_options = {})
+      from_hash(YAML::load(str), hash_options)
     end
 
     TIME_FORMAT = '%B %e, %Y'
     SEPARATOR = ' / '
     NEWLINE = "\n"
-    
+
     # use with caution
     # incomplete and not entirely tested - no time representation in dates
     # there's a lot that can happen here
@@ -87,9 +88,9 @@ module IceCube
       representation_pieces.concat @rrule_occurrence_heads.map { |r| "RRULE:#{r.rule.to_ical}" } if @rrule_occurrence_heads
       representation_pieces.concat @exrule_occurrence_heads.map { |r| "EXRULE:#{r.rule.to_ical}" } if @exrule_occurrence_heads
       representation_pieces << "DTEND#{TimeUtil.ical_format(@end_time)}" if @end_time
-      representation_pieces.join(NEWLINE)      
+      representation_pieces.join(NEWLINE)
     end
-    
+
     def occurring_at?(time)
       return false if @exdates.include?(time)
       return true if @rdates.include?(time)
@@ -103,7 +104,7 @@ module IceCube
       dates = occurrences(date)
       dates.last == date
     end
-    
+
     # Determine whether a given date appears in the times returned by the schedule
     def occurs_on?(date)
       if defined?(ActiveSupport::TimeWithZone) && @start_date.is_a?(ActiveSupport::TimeWithZone)
@@ -113,14 +114,14 @@ module IceCube
       time_format = @start_date.utc? ? :utc : :local
       self.occurrences_between(Time.send(time_format, date.year, date.month, date.day, 0, 0, 0), Time.send(time_format, date.year, date.month, date.day, 23, 59, 59)).any?
     end
-        
-    # Return all possible occurrences 
+
+    # Return all possible occurrences
     # In order to make this call, all rules in the schedule must have
     # either an until date or an occurrence count
     def all_occurrences
       find_occurrences { |head| head.all_occurrences }
     end
-    
+
     # Find all occurrences until a certain date
     def occurrences(end_date)
       end_date = @end_time if @end_time && @end_time < end_date
@@ -132,7 +133,7 @@ module IceCube
       raise ArgumentError.new('Schedule must have an end_time to use remaining_occurrences') unless @end_time
       occurrences_between(from, @end_time)
     end
-    
+
     # Find next scheduled occurrence
     def next_occurrence(from = Time.now)
       next_occurrences(1, from).first
@@ -168,7 +169,7 @@ module IceCube
       @exrule_occurrence_heads << RuleOccurrence.new(rule, @start_date, @end_time)
     end
 
-    def exrules 
+    def exrules
       @exrule_occurrence_heads.map { |h| h.rule }
     end
 
@@ -180,7 +181,7 @@ module IceCube
     # Add an individual date exception to this schedule
     def add_exception_date(date)
       @exdates << date unless date.nil?
-    end   
+    end
 
     def occurrences_between(begin_time, end_time)
       # adjust to the propert end date
@@ -203,16 +204,16 @@ module IceCube
     alias exdate add_exception_date
     alias exrule add_exception_rule
 
-    
+
     private
-      
+
     # We know that start_date is a time with zone - so check referencing
     # The date in that time zone
     def active_support_occurs_on?(date)
       time = Time.zone.parse(date.to_s) # date.to_time.in_time_zone(@start_date.time_zone)
       occurrences_between(time.beginning_of_day, time.end_of_day).any?
     end
-        
+
     # tell if, from a list of rule_occurrence heads, a certain time is occurring
     def any_occurring_at?(what, time)
       return false if @start_time && time < @start_time
@@ -224,7 +225,7 @@ module IceCube
         end
       end
     end
-      
+
     # Find all occurrences (following rules and exceptions) from the schedule's start date to end_date.
     # Use custom methods to say when to end
     def find_occurrences
@@ -241,7 +242,7 @@ module IceCube
       include_dates.reject! { |date| exclude_dates.include?(date) }
       include_dates.to_a
     end
-   
+
   end
 
 end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ice_cube
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2011-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency