ice_cube 0.8.1 → 0.9.0

data/lib/ice_cube.rb

@@ -13,6 +13,7 @@ module IceCube
   autoload :VERSION, 'ice_cube/version'
 
   autoload :TimeUtil, 'ice_cube/time_util'
+  autoload :FlexibleHash, 'ice_cube/flexible_hash'
 
   autoload :Rule, 'ice_cube/rule'
   autoload :Schedule, 'ice_cube/schedule'

data/lib/ice_cube/flexible_hash.rb

@@ -0,0 +1,24 @@
+require 'delegate'
+
+module IceCube
+
+  # A way to symbolize what's necessary on the fly
+  # Due to the serialization format of ice_cube, this limited implementation
+  # is entirely sufficient
+
+  class FlexibleHash < SimpleDelegator
+
+    def initialize(hash)
+      @underlying = hash
+    end
+
+    def [](key)
+      case key
+      when String then @underlying[key] || @underlying[key.to_sym]
+      else @underlying[key] || @underlying[key.to_s]
+      end
+    end
+
+  end
+
+end

data/lib/ice_cube/rule.rb

@@ -44,7 +44,8 @@ module IceCube
     end
 
     # Convert from a hash and create a rule
-    def self.from_hash(hash)
+    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.until(TimeUtil.deserialize_time(hash[:until])) if hash[:until]
@@ -70,7 +71,7 @@ module IceCube
 
     # Whether this rule requires a full run
     def full_required?
-      !@count.nil?
+      !@count.nil? || (!@interval.nil? && @interval > 1)
     end
 
     # Convenience methods for creating Rules

data/lib/ice_cube/schedule.rb

@@ -21,7 +21,7 @@ module IceCube
 
     # Create a new schedule
     def initialize(start_time = nil, options = {})
-      @start_time = start_time || Time.now
+      @start_time = start_time || TimeUtil.now
       @end_time = options[:end_time]
       @duration = options[:duration]
       @all_recurrence_rules = []
@@ -145,17 +145,17 @@ module IceCube
     end
 
     # The next n occurrences after now
-    def next_occurrences(num, from = Time.now)
+    def next_occurrences(num, from = TimeUtil.now)
       find_occurrences(from + 1, nil, num)
     end
 
     # The next occurrence after now (overridable)
-    def next_occurrence(from = Time.now)
+    def next_occurrence(from = TimeUtil.now)
       find_occurrences(from + 1, nil, 1).first
     end
 
     # The remaining occurrences (same requirements as all_occurrences)
-    def remaining_occurrences(from = Time.now)
+    def remaining_occurrences(from = TimeUtil.now)
       find_occurrences(from)
     end
 
@@ -170,6 +170,13 @@ module IceCube
       !find_occurrences(begin_time, closing_time, 1).empty?
     end
 
+    # Return a boolean indicating if an occurrence is occurring between
+    # two times, inclusive
+    def occurring_between?(begin_time, closing_time)
+      dur = duration || 0
+      occurs_between?(begin_time - dur + 1, closing_time + dur - 1)
+    end
+
     # Return a boolean indicating if an occurrence falls on a certain date
     def occurs_on?(date)
       begin_time = TimeUtil.beginning_of_date(date)
@@ -215,6 +222,7 @@ module IceCube
       # Due to durations, we need to walk up to the end time, and verify in the
       # other direction
       if last_time
+        last_time = terminating_schedule.duration ? last_time + terminating_schedule.duration : last_time
         other_schedule.each_occurrence do |time|
           break if time > last_time
           return true if terminating_schedule.occurring_at?(time)
@@ -243,7 +251,6 @@ module IceCube
       pieces.concat rrules.map { |t| t.to_s }
       pieces.concat exrules.map { |t| "not #{t.to_s}" }
       pieces.concat ed.sort.map { |t| "not on #{t.strftime(IceCube.to_s_time_format)}" }
-      pieces << "until #{end_time.strftime(IceCube.to_s_time_format)}" if end_time
       pieces.join(' / ')
     end
 
@@ -274,7 +281,7 @@ module IceCube
     def to_hash
       data = {}
       data[:start_date] = TimeUtil.serialize_time(start_time)
-      data[:end_time] = end_time if end_time
+      data[:end_time] = TimeUtil.serialize_time(end_time) if end_time
       data[:duration] = duration if duration
       data[:rrules] = recurrence_rules.map(&:to_hash)
       data[:exrules] = exception_rules.map(&:to_hash)
@@ -288,9 +295,10 @@ module IceCube
     end
 
     # Load the schedule from a hash
-    def self.from_hash(data, options = {})
-      data[:start_date] = options[:start_date_override] if options[:start_date_override]
+    def self.from_hash(original_hash, options = {})
+      original_hash[:start_date] = options[:start_date_override] if options[:start_date_override]
       # And then deserialize
+      data = IceCube::FlexibleHash.new(original_hash)
       schedule = IceCube::Schedule.new TimeUtil.deserialize_time(data[:start_date])
       schedule.duration = data[:duration] if data[:duration]
       schedule.end_time = TimeUtil.deserialize_time(data[:end_time]) if data[:end_time]
@@ -315,7 +323,7 @@ module IceCube
     # Determine if the schedule will end
     # @return [Boolean] true if ending, false if repeating forever
     def terminating?
-      end_time || recurrence_rules.all?(&:terminating?)
+      recurrence_rules.empty? || recurrence_rules.all?(&:terminating?)
     end
 
     def self.dump(schedule)
@@ -339,10 +347,6 @@ module IceCube
     def find_occurrences(opening_time, closing_time = nil, limit = nil, &block)
       reset
       answers = []
-      # ensure the bounds are proper
-      if end_time
-        closing_time = end_time unless closing_time && closing_time < end_time
-      end
       opening_time = start_time if opening_time < start_time
       # walk up to the opening time - and off we go
       # If we have rules with counts, we need to walk from the beginning of time,

data/lib/ice_cube/time_util.rb

@@ -18,6 +18,11 @@ module IceCube
       :november => 11, :december => 12
     }
 
+    # Provides a Time.now without the usec
+    def self.now
+      Time.at Time.now.to_i
+    end
+
     # Serialize a time appropriate for storing
     def self.serialize_time(time)
       if defined?(:ActiveSupport) && const_defined?(:ActiveSupport) && time.is_a?(ActiveSupport::TimeWithZone)

data/lib/ice_cube/validated_rule.rb

@@ -39,6 +39,9 @@ module IceCube
               wrapper = TimeUtil::TimeWrapper.new(time, dst_adjust)
               wrapper.add(type, fwd)
               wrapper.clear_below(type)
+              if wrapper.to_time == time
+                wrapper.add(:sec, wrapper.to_time.utc_offset * 2)
+              end
               time = wrapper.to_time
             end
             false
@@ -93,7 +96,11 @@ module IceCube
 
     # Fully replace validations
     def replace_validations_for(key, arr)
-      @validations[key] = arr
+      if arr.nil?
+        @validations.delete(key)
+      else
+        @validations[key] = arr
+      end
     end
 
     # Remove the specified base validations

data/lib/ice_cube/validations/daily_interval.rb

@@ -4,6 +4,7 @@ module IceCube
 
     # Add a new interval validation
     def interval(interval)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:wday, :day)
       self

data/lib/ice_cube/validations/hourly_interval.rb

@@ -3,6 +3,7 @@ module IceCube
   module Validations::HourlyInterval
 
     def interval(interval)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:hour)
       self

data/lib/ice_cube/validations/minutely_interval.rb

@@ -3,6 +3,7 @@ module IceCube
   module Validations::MinutelyInterval
 
     def interval(interval)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:min)
       self

data/lib/ice_cube/validations/monthly_interval.rb

@@ -3,6 +3,7 @@ module IceCube
   module Validations::MonthlyInterval
 
     def interval(interval = 1)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:month)
       self

data/lib/ice_cube/validations/secondly_interval.rb

@@ -3,6 +3,7 @@ module IceCube
   module Validations::SecondlyInterval
 
     def interval(interval)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:sec)
       self

data/lib/ice_cube/validations/until.rb

@@ -41,11 +41,11 @@ module IceCube
       end
 
       def validate(t, schedule)
-        raise UntilExceeded if t > time 
+        raise UntilExceeded if t > time
       end
 
     end
-      
+
   end
 
 end

data/lib/ice_cube/validations/weekly_interval.rb

@@ -5,6 +5,7 @@ module IceCube
   module Validations::WeeklyInterval
 
     def interval(interval, week_start = :sunday)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval, week_start)
       clobber_base_validations(:day)
       self

data/lib/ice_cube/validations/yearly_interval.rb

@@ -3,6 +3,7 @@ module IceCube
   module Validations::YearlyInterval
 
     def interval(interval = 1)
+      @interval = interval
       validations_for(:interval) << Validation.new(interval)
       clobber_base_validations(:year)
     end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,6 +72,7 @@ files:
 - lib/ice_cube/deprecated.rb
 - lib/ice_cube/errors/count_exceeded.rb
 - lib/ice_cube/errors/until_exceeded.rb
+- lib/ice_cube/flexible_hash.rb
 - lib/ice_cube/rule.rb
 - lib/ice_cube/rules/daily_rule.rb
 - lib/ice_cube/rules/hourly_rule.rb