ice_cube 0.5.3 → 0.5.4

data/lib/ice_cube/rule_occurrence.rb

@@ -1,13 +1,12 @@
 module IceCube
   
   class RuleOccurrence
-   
-    include Comparable
-    
-    #allow to be compared to dates
-    def <=>(other)
-      to_time <=> other
-    end
+
+    # allow to be compared to dates (awesome but not used anymore)
+    # include Comparable
+#    def <=>(other)
+#      to_time <=> other
+#    end
     
     def to_time
       @date
@@ -45,8 +44,8 @@ module IceCube
       begin
         return nil if @end_time && date > @end_time
         return nil if @rule.until_date && date > @rule.until_date # until check
-        next unless @rule.in_interval?(date, @start_date) 
         return nil if yield(date)
+        next unless @rule.in_interval?(date, @start_date) 
         return RuleOccurrence.new(@rule, @start_date, @end_time, date, @index + 1)
       end while date = @rule.next_suggestion(date)
     end

data/lib/ice_cube/schedule.rb

@@ -165,7 +165,7 @@ module IceCube
       # adjust to the propert end date
       end_time = @end_time if @end_time && @end_time < end_time
       # collect the occurrences
-      include_dates = SortedSet.new(@rdates)
+      include_dates, exclude_dates = SortedSet.new(@rdates), Set.new(@exdates)
       @rrule_occurrence_heads.each do |rrule_occurrence_head|
         include_dates.merge(rrule_occurrence_head.between(begin_time, end_time))
       end
@@ -173,7 +173,7 @@ module IceCube
         exclude_dates.merge(exrule_occurrence_head.between(begin_time, end_time))
       end
       # reject all of the ones outside of the range
-      include_dates.reject! { |date| (@exdates && @exdates.include?(date)) || date < begin_time || date > end_time }
+      include_dates.reject! { |date| exclude_dates.include?(date) || date < begin_time || date > end_time }
       include_dates.to_a
     end
 

data/lib/ice_cube/validation.rb

@@ -3,14 +3,15 @@ module IceCube
   class Validation
      
     NUMBER_SUFFIX = ['th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th']
-     
-    def adjust(goal, date)
+    SPECIAL_SUFFIX = { 11 => 'th', 12 => 'th', 13 => 'th', 14 => 'th' } 
+    
+    def self.adjust(goal, date)
       return goal if goal.utc_offset == date.utc_offset
       goal - goal.utc_offset + date.utc_offset
     end
     
     # influences by ActiveSupport's to_sentence
-    def sentence(array)
+    def self.sentence(array)
       case array.length
       when 0 ; ''
       when 1 ; array[0].to_s
@@ -19,23 +20,25 @@ module IceCube
       end
     end
     
-    def nice_numbers(array)
+    def self.nice_numbers(array)
       array.sort!
-      sentence array.map { |d| nice_number(d) }
+      self.sentence array.map { |d| nice_number(d) }
     end
     
     private
     
-    def nice_number(number)
+    def self.nice_number(number)
       if number == -1
         'last'
       elsif number < -1
-        number.abs.to_s << NUMBER_SUFFIX[number.abs % 10] << ' to last'
+        suffix = SPECIAL_SUFFIX.include?(number) ? SPECIAL_SUFFIX[number] : NUMBER_SUFFIX[number.abs % 10]
+        number.abs.to_s << suffix << ' to last'
       else
-        number.to_s << NUMBER_SUFFIX[number % 10]  
+        suffix = SPECIAL_SUFFIX.include?(number) ? SPECIAL_SUFFIX[number] : NUMBER_SUFFIX[number.abs % 10]
+        number.to_s << suffix  
       end
     end
     
   end
   
-end
+end

data/lib/ice_cube/validations/day.rb

@@ -21,12 +21,12 @@ module IceCube
       days.compact!
       # go to the closest distance away, the start of that day
       goal = date + days.min * IceCube::ONE_DAY
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
   
     def to_s
       days_dup = (@days - @rule.validations[:day_of_week].keys if @rule.validations[:day_of_week]) || @days # don't list twice
-      'on ' << sentence(days_dup.map { |d| Date::DAYNAMES[d] + 's' }) unless days_dup.empty?
+      'on ' << self.class.sentence(days_dup.map { |d| Date::DAYNAMES[d] + 's' }) unless days_dup.empty?
     end
 
     def to_ical
@@ -36,4 +36,4 @@ module IceCube
   
   end
 
-end
+end

data/lib/ice_cube/validations/day_of_month.rb

@@ -34,11 +34,11 @@ module IceCube
       return nil if distances.empty?
       # return the start of the proper day
       goal = date + distances.min * IceCube::ONE_DAY
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
     
     def to_s
-      'on the ' << nice_numbers(@days_of_month) << (@days_of_month.size == 1 ? ' day' : ' days') << ' of the month' unless @days_of_month.empty?
+      'on the ' << self.class.nice_numbers(@days_of_month) << (@days_of_month.size == 1 ? ' day' : ' days') << ' of the month' unless @days_of_month.empty?
     end
   
     def to_ical

data/lib/ice_cube/validations/day_of_week.rb

@@ -26,7 +26,7 @@ module IceCube
       return nil if !@days_of_week || @days_of_week.empty?
       goal = date
       while goal += IceCube::ONE_DAY
-        return adjust(goal, date) if validate(goal)
+        return self.class.adjust(goal, date) if validate(goal)
       end
     end
 
@@ -34,7 +34,7 @@ module IceCube
       representation = ''
       representation << 'on the '
       representation << @days_of_week.map do |day, occ| 
-        nice_numbers(occ) << ' ' << Date::DAYNAMES[day] << (occ.size != 1 ? 's' : '') unless @days_of_week.empty?
+        self.class.nice_numbers(occ) << ' ' << Date::DAYNAMES[day] << (occ.size != 1 ? 's' : '') unless @days_of_week.empty?
       end.join(' and the ')
       representation
     end

data/lib/ice_cube/validations/day_of_year.rb

@@ -33,11 +33,11 @@ module IceCube
       return nil if distances.empty?
       # return the start of the proper day
       goal = date + distances.min * IceCube::ONE_DAY
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
   
     def to_s
-      'on the ' << nice_numbers(@days_of_year) << (@days_of_year.size == 1 ? ' day' : ' days') << ' of the year' unless @days_of_year.empty?
+      'on the ' << self.class.nice_numbers(@days_of_year) << (@days_of_year.size == 1 ? ' day' : ' days') << ' of the year' unless @days_of_year.empty?
     end
   
     def to_ical

data/lib/ice_cube/validations/hour_of_day.rb

@@ -22,11 +22,11 @@ module IceCube
       # go to the closest distance away, the start of that hour
       closest_hour = hours.min
       goal = date + IceCube::ONE_HOUR * closest_hour
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
 
     def to_s
-      'on the ' << nice_numbers(@hours_of_day) << (@hours_of_day.size == 1 ? ' hour' : ' hours') << ' of the day' unless @hours_of_day.empty?
+      'on the ' << self.class.nice_numbers(@hours_of_day) << (@hours_of_day.size == 1 ? ' hour' : ' hours') << ' of the day' unless @hours_of_day.empty?
     end
 
     def to_ical

data/lib/ice_cube/validations/minute_of_hour.rb

@@ -22,11 +22,11 @@ module IceCube
       # go to the closest distance away, the beginning of that minute
       closest_minute = minutes.min
       goal = date + closest_minute * IceCube::ONE_MINUTE
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
     
     def to_s
-      'on the ' << nice_numbers(@minutes_of_hour) << (@minutes_of_hour.size == 1 ? ' minute' : ' minutes') << ' of the hour' unless @minutes_of_hour.empty?
+      'on the ' << self.class.nice_numbers(@minutes_of_hour) << (@minutes_of_hour.size == 1 ? ' minute' : ' minutes') << ' of the hour' unless @minutes_of_hour.empty?
     end
 
     def to_ical

data/lib/ice_cube/validations/month_of_year.rb

@@ -22,11 +22,11 @@ module IceCube
       # go to the closest distance away
       goal = date
       months.min.times { goal += TimeUtil.days_in_month(goal) * IceCube::ONE_DAY }
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
 
     def to_s
-      'in ' << @months_of_year.map { |m| Date::MONTHNAMES[m] }.join(', ') unless @months_of_year.empty?
+      'in ' << self.class.sentence(@months_of_year.map { |m| Date::MONTHNAMES[m] }) unless @months_of_year.empty?
     end
 
     def to_ical
@@ -35,4 +35,4 @@ module IceCube
     
   end
   
-end
+end

data/lib/ice_cube/validations/second_of_minute.rb

@@ -22,11 +22,11 @@ module IceCube
       # go to the closest distance away
       closest_second = seconds.min
       goal = date + closest_second
-      adjust(goal, date)
+      self.class.adjust(goal, date)
     end
 
     def to_s
-      'on the ' << nice_numbers(@seconds_of_minute) << (@seconds_of_minute.size == 1 ? ' second' : ' seconds') << ' of the minute' unless @seconds_of_minute.empty?
+      'on the ' << self.class.nice_numbers(@seconds_of_minute) << (@seconds_of_minute.size == 1 ? ' second' : ' seconds') << ' of the minute' unless @seconds_of_minute.empty?
     end
 
     def to_ical

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ice_cube
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency