ice_cube 0.2.8 → 0.2.8.1

data/lib/ice_cube/rule.rb

@@ -124,7 +124,7 @@ module IceCube
     # get a very meaningful string representation of this rule
     def to_s_base(singular, plural)
       representation = ''
-      representation = 'Every ' << ((@interval == 1) ? singular : "#{@interval} #{plural}")
+      representation = (@interval == 1 ? singular : plural)
       representation << @validation_types.values.map { |v| ' ' + v.send(:to_s) }.join()
       representation
     end

data/lib/ice_cube/rules/daily_rule.rb

@@ -14,7 +14,7 @@ module IceCube
     end
        
     def to_s
-      to_s_base 'day', 'days'
+      to_s_base 'Daily', "Every #{@interval} days"
     end
         
     protected

data/lib/ice_cube/rules/hourly_rule.rb

@@ -14,7 +14,7 @@ module IceCube
     end
         
     def to_s
-      to_s_base 'hour', 'hours'
+      to_s_base 'Hourly', "Every #{@interval} hours"
     end
         
     protected

data/lib/ice_cube/rules/minutely_rule.rb

@@ -14,7 +14,7 @@ module IceCube
     end
         
     def to_s
-      to_s_base 'minute', 'minutes'
+      to_s_base 'Minutely', "Every #{@interval} minutes"
     end
         
     protected

data/lib/ice_cube/rules/monthly_rule.rb

@@ -18,7 +18,7 @@ module IceCube
     end
     
     def to_s
-      to_s_base 'month', 'months'
+      to_s_base 'Monthly', "Every #{@interval} months"
     end
     
     protected

data/lib/ice_cube/rules/secondly_rule.rb

@@ -14,7 +14,7 @@ module IceCube
     end
         
     def to_s
-      to_s_base 'second', 'seconds'
+      to_s_base 'Secondly', "Every #{@interval} seconds"
     end
         
     protected

data/lib/ice_cube/rules/weekly_rule.rb

@@ -16,7 +16,7 @@ module IceCube
     end
     
     def to_s
-      to_s_base 'week', 'weeks'
+      to_s_base 'Weekly', "Every #{@interval} weeks"
     end
     
     protected

data/lib/ice_cube/rules/yearly_rule.rb

@@ -18,7 +18,7 @@ module IceCube
     end
     
     def to_s
-      to_s_base 'year', 'years'
+      to_s_base 'Yearly', "Every #{@interval} years"
     end
     
     protected

data/lib/ice_cube/validation.rb

@@ -9,8 +9,19 @@ module IceCube
       goal - goal.utc_offset + date.utc_offset
     end
     
+    # influences by ActiveSupport's to_sentence
+    def sentence(array)
+      case array.length
+      when 0 ; ''
+      when 1 ; array[0].to_s
+      when 2 ; "#{array[0]} and #{array[1]}"
+      else ; "#{array[0...-1].join(', ')}, and #{array[-1]}"
+      end
+    end
+    
     def nice_numbers(array)
-      array.map { |d| nice_number(d) }.join(', ')
+      array.sort!
+      sentence array.map { |d| nice_number(d) }
     end
     
     private

data/lib/ice_cube/validations/day.rb

@@ -26,7 +26,7 @@ module IceCube
   
     def to_s
       days_dup = (@days - @rule.validations[:day_of_week].keys if @rule.validations[:day_of_week]) || @days # don't list twice
-      'on every ' << days_dup.map { |d| Date::DAYNAMES[d] }.join(', ') unless days_dup.empty?
+      'on ' << sentence(days_dup.map { |d| Date::DAYNAMES[d] + 's' }) unless days_dup.empty?
     end
 
     def to_ical

data/lib/ice_cube/validations/day_of_month.rb

@@ -38,7 +38,7 @@ module IceCube
     end
     
     def to_s
-      'on the ' << nice_numbers(@days_of_month.sort) << (@days_of_month.count == 1 ? ' day' : ' days') << ' of the month' unless @days_of_month.empty?
+      'on the ' << nice_numbers(@days_of_month) << (@days_of_month.count == 1 ? ' day' : ' days') << ' of the month' unless @days_of_month.empty?
     end
   
     def to_ical

data/lib/ice_cube/validations/day_of_year.rb

@@ -37,7 +37,7 @@ module IceCube
     end
   
     def to_s
-      'on the ' << nice_numbers(@days_of_year.sort) << (@days_of_year.count == 1 ? ' day' : ' days') << ' of the year' unless @days_of_year.empty?
+      'on the ' << nice_numbers(@days_of_year) << (@days_of_year.count == 1 ? ' day' : ' days') << ' of the year' unless @days_of_year.empty?
     end
   
     def to_ical

data/lib/ice_cube/validations/hour_of_day.rb

@@ -26,7 +26,7 @@ module IceCube
     end
 
     def to_s
-      'on the ' << nice_numbers(@hours_of_day.sort) << (@hours_of_day.count == 1 ? ' hour' : ' hours') << ' of the day' unless @hours_of_day.empty?
+      'on the ' << nice_numbers(@hours_of_day) << (@hours_of_day.count == 1 ? ' hour' : ' hours') << ' of the day' unless @hours_of_day.empty?
     end
 
     def to_ical

data/lib/ice_cube/validations/minute_of_hour.rb

@@ -26,7 +26,7 @@ module IceCube
     end
     
     def to_s
-      'on the ' << nice_numbers(@minutes_of_hour.sort) << (@minutes_of_hour.count == 1 ? ' minute' : ' minutes') << ' of the hour' unless @minutes_of_hour.empty?
+      'on the ' << nice_numbers(@minutes_of_hour) << (@minutes_of_hour.count == 1 ? ' minute' : ' minutes') << ' of the hour' unless @minutes_of_hour.empty?
     end
 
     def to_ical

data/lib/ice_cube/validations/second_of_minute.rb

@@ -26,7 +26,7 @@ module IceCube
     end
 
     def to_s
-      'on the ' << nice_numbers(@seconds_of_minute.sort) << (@seconds_of_minute.count == 1 ? ' second' : ' seconds') << ' of the minute' unless @seconds_of_minute.empty?
+      'on the ' << nice_numbers(@seconds_of_minute) << (@seconds_of_minute.count == 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.2.8"
+  VERSION = "0.2.8.1"
 
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 8
-  version: 0.2.8
+  - 1
+  version: 0.2.8.1
 platform: ruby
 authors: 
 - John Crepezzi
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency