Cleanup method order: build_hash, build_ical last

Author: avit

lib/ice_cube/validations/day_of_month.rb

@@ -32,12 +32,6 @@ def build_s(builder)
         builder.piece(:day_of_month) << StringBuilder.nice_number(day)
       end
 
-      StringBuilder.register_formatter(:day_of_month) do |entries|
-        str = "on the #{StringBuilder.sentence(entries)} "
-        str << (entries.size == 1 ? 'day of the month' : 'days of the month')
-        str
-      end
-
       def build_hash(builder)
         builder.validations_array(:day_of_month) << day
       end
@@ -46,6 +40,12 @@ def build_ical(builder)
         builder['BYMONTHDAY'] << day
       end
 
+      StringBuilder.register_formatter(:day_of_month) do |entries|
+        str = "on the #{StringBuilder.sentence(entries)} "
+        str << (entries.size == 1 ? 'day of the month' : 'days of the month')
+        str
+      end
+
     end
 
   end

lib/ice_cube/validations/day_of_week.rb

@@ -46,8 +46,10 @@ def build_s(builder)
         builder.piece(:day_of_week) << "#{StringBuilder.nice_number(occ)} #{Date::DAYNAMES[day]}"
       end
 
-      StringBuilder.register_formatter(:day_of_week) do |segments|
-        'on the ' + segments.join(' and ')
+      def build_hash(builder)
+        builder.validations[:day_of_week] ||= {}
+        arr = (builder.validations[:day_of_week][day] ||= [])
+        arr << occ
       end
 
       def build_ical(builder)
@@ -57,10 +59,8 @@ def build_ical(builder)
         builder['BYDAY'] << "#{occ}#{ical_day}"
       end
 
-      def build_hash(builder)
-        builder.validations[:day_of_week] ||= {}
-        arr = (builder.validations[:day_of_week][day] ||= [])
-        arr << occ
+      StringBuilder.register_formatter(:day_of_week) do |segments|
+        'on the ' + segments.join(' and ')
       end
 
     end

lib/ice_cube/validations/day_of_year.rb

@@ -37,12 +37,6 @@ def build_s(builder)
         builder.piece(:day_of_year) << StringBuilder.nice_number(day)
       end
 
-      StringBuilder.register_formatter(:day_of_year) do |entries|
-        str = "on the #{StringBuilder.sentence(entries)} "
-        str << (entries.size == 1 ? 'day of the year' : 'days of the year')
-        str
-      end
-
       def build_hash(builder)
         builder.validations_array(:day_of_year) << day
       end
@@ -51,6 +45,12 @@ def build_ical(builder)
         builder['BYYEARDAY'] << day
       end
 
+      StringBuilder.register_formatter(:day_of_year) do |entries|
+        str = "on the #{StringBuilder.sentence(entries)} "
+        str << (entries.size == 1 ? 'day of the year' : 'days of the year')
+        str
+      end
+
     end
 
   end

lib/ice_cube/validations/hour_of_day.rb

@@ -29,11 +29,6 @@ def type
         :hour
       end
 
-      StringBuilder.register_formatter(:hour_of_day) do |segments|
-        str = "on the #{StringBuilder.sentence(segments)} "
-        str << (segments.size == 1 ? 'hour of the day' : 'hours of the day')
-      end
-
       def build_s(builder)
         builder.piece(:hour_of_day) << StringBuilder.nice_number(hour)
       end
@@ -46,6 +41,11 @@ def build_ical(builder)
         builder['BYHOUR'] << hour
       end
 
+      StringBuilder.register_formatter(:hour_of_day) do |segments|
+        str = "on the #{StringBuilder.sentence(segments)} "
+        str << (segments.size == 1 ? 'hour of the day' : 'hours of the day')
+      end
+
     end
 
   end

lib/ice_cube/validations/minute_of_hour.rb

@@ -28,11 +28,6 @@ def type
         :min
       end
 
-      StringBuilder.register_formatter(:minute_of_hour) do |segments|
-        str = "on the #{StringBuilder.sentence(segments)} "
-        str << (segments.size == 1 ? 'minute of the hour' : 'minutes of the hour')
-      end
-
       def build_s(builder)
         builder.piece(:minute_of_hour) << StringBuilder.nice_number(minute)
       end
@@ -45,6 +40,11 @@ def build_ical(builder)
         builder['BYMINUTE'] << minute
       end
 
+      StringBuilder.register_formatter(:minute_of_hour) do |segments|
+        str = "on the #{StringBuilder.sentence(segments)} "
+        str << (segments.size == 1 ? 'minute of the hour' : 'minutes of the hour')
+      end
+
     end
 
   end

lib/ice_cube/validations/minutely_interval.rb

@@ -39,15 +39,15 @@ def build_s(builder)
         builder.base = interval == 1 ? 'Minutely' : "Every #{interval} minutes"
       end
 
+      def build_hash(builder)
+        builder[:interval] = interval
+      end
+
       def build_ical(builder)
         builder['FREQ'] << 'MINUTELY'
         builder['INTERVAL'] << interval unless interval == 1
       end
 
-      def build_hash(builder)
-        builder[:interval] = interval
-      end
-
     end
 
   end

lib/ice_cube/validations/monthly_interval.rb

@@ -33,15 +33,15 @@ def build_s(builder)
         builder.base = interval == 1 ? 'Monthly' : "Every #{interval} months"
       end
 
+      def build_hash(builder)
+        builder[:interval] = interval
+      end
+
       def build_ical(builder)
         builder['FREQ'] << 'MONTHLY'
         builder['INTERVAL'] << interval unless interval == 1
       end
 
-      def build_hash(builder)
-        builder[:interval] = interval
-      end
-
     end
 
   end

lib/ice_cube/validations/schedule_lock.rb

@@ -34,12 +34,13 @@ def build_s(builder)
       end
 
       # no -op
-      def build_ical(builder)
+      def build_hash(builder)
       end
 
       # no -op
-      def build_hash(builder)
+      def build_ical(builder)
       end
+
     end
 
   end

lib/ice_cube/validations/secondly_interval.rb

@@ -36,15 +36,15 @@ def build_s(builder)
         builder.base = interval == 1 ? 'Secondly' : "Every #{interval} seconds"
       end
 
+      def build_hash(builder)
+        builder[:interval] = interval
+      end
+
       def build_ical(builder)
         builder['FREQ'] << 'SECONDLY'
         builder['INTERVAL'] << interval unless interval == 1
       end
 
-      def build_hash(builder)
-        builder[:interval] = interval
-      end
-
     end
 
   end

lib/ice_cube/validations/until.rb

@@ -33,16 +33,16 @@ def validate(t, schedule)
         raise UntilExceeded if t > time
       end
 
-      def build_ical(builder)
-        builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
+      def build_s(builder)
+        builder.piece(:until) << "until #{time.strftime(IceCube.to_s_time_format)}"
       end
 
       def build_hash(builder)
         builder[:until] = TimeUtil.serialize_time(time)
       end
 
-      def build_s(builder)
-        builder.piece(:until) << "until #{time.strftime(IceCube.to_s_time_format)}"
+      def build_ical(builder)
+        builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
       end
 
     end