Be more specific when including ActiveSupport core extensions

Author: davidstosik

lib/ice_cube/time_util.rb

@@ -1,7 +1,5 @@
 require 'date'
 require 'time'
-require 'active_support'
-require 'active_support/core_ext'
 
 module IceCube
   module TimeUtil
@@ -200,36 +198,6 @@ def self.which_occurrence_in_month(time, wday)
       [nth_occurrence_of_weekday, this_weekday_in_month_count]
     end
 
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.start_of_month time
-      time.beginning_of_month
-    end
-
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.end_of_month time
-      time.end_of_month
-    end
-
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.start_of_year time
-      time.beginning_of_year
-    end
-
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.end_of_year time
-      time.end_of_year
-    end
-
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.previous_month time
-      time - 1.month
-    end
-
-    # Use Activesupport CoreExt functions to manipulate time
-    def self.previous_year time
-      time - 1.year
-    end
-
     # Get the days in the month for +time
     def self.days_in_month(time)
       date = Date.new(time.year, time.month, 1)

lib/ice_cube/validations/monthly_by_set_pos.rb

@@ -1,3 +1,7 @@
+require "active_support/core_ext/date/calculations"
+require "active_support/core_ext/time/calculations"
+require "active_support/core_ext/date_time/calculations"
+
 module IceCube
 
   module Validations::MonthlyBySetPos
@@ -40,11 +44,10 @@ def dst_adjust?
       end
 
       def validate(step_time, schedule)
-        start_of_month = TimeUtil.start_of_month step_time
-        end_of_month = TimeUtil.end_of_month step_time
-
+        start_of_month = step_time.beginning_of_month
+        end_of_month = step_time.end_of_month
 
-        new_schedule = IceCube::Schedule.new(TimeUtil.previous_month(step_time)) do |s|
+        new_schedule = IceCube::Schedule.new(step_time.last_month) do |s|
           s.add_recurrence_rule IceCube::Rule.from_hash(rule.to_hash.reject{|k, v| [:by_set_pos, :count, :until].include? k})
         end
 

lib/ice_cube/validations/yearly_by_set_pos.rb

@@ -1,3 +1,7 @@
+require "active_support/core_ext/date/calculations"
+require "active_support/core_ext/time/calculations"
+require "active_support/core_ext/date_time/calculations"
+
 module IceCube
 
   module Validations::YearlyBySetPos
@@ -40,11 +44,10 @@ def dst_adjust?
       end
 
       def validate(step_time, schedule)
-        start_of_year = TimeUtil.start_of_year step_time
-        end_of_year = TimeUtil.end_of_year step_time
-
+        start_of_year = step_time.beginning_of_year
+        end_of_year = step_time.end_of_year
 
-        new_schedule = IceCube::Schedule.new(TimeUtil.previous_year(step_time)) do |s|
+        new_schedule = IceCube::Schedule.new(step_time.last_year) do |s|
           s.add_recurrence_rule IceCube::Rule.from_hash(rule.to_hash.reject{|k, v| [:by_set_pos, :count, :until].include? k})
         end