range_ext.rb in cotcube-helpers-0.1.6

- old
+ new

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
 # Monkey patching the Ruby Core class Range
 class Range
-  def to_time_intervals(step:, timezone: Time.find_zone('America/Chicago'), ranges: nil)
+  def to_time_intervals(step:,
+                        timezone: Time.find_zone('America/Chicago'),
+                        # ranges: nil,
+                        debug: false)
     unless step.is_a? ActiveSupport::Duration
       raise ArgumentError,
             ":step must be a 'ActiveSupport::Duration', like '15.minutes', but '#{step}' is a '#{step.class}'"
     end
-    raise ArgumentError, "Sorry, currently supporting only 15.minutes, 1.hour, 1.day as :step" unless [15.minutes, 60.minutes, 1.hour, 1.day].include? step
+    unless [15.minutes, 60.minutes, 1.hour, 1.day].include? step
+      raise ArgumentError, 'Sorry, currently supporting only 15.minutes, 1.hour, 1.day as :step'
+    end
 
     valid_classes = [ActiveSupport::TimeWithZone, Time, Date, DateTime]
     unless timezone.is_a? ActiveSupport::TimeZone
       raise "Expecting 'ActiveSupport::TimeZone' for :timezone, got '#{timezone.class}"
     end
@@ -28,25 +33,26 @@
     end
 
     # here sub-day and super-day need to be distinguished, as they react differently to daylight time
     # for super-day, just return an array containing all calendar days
     if step.to_i >= 1.day
-      return (starting.to_date..ending.to_date).to_a.map{|x| x.to_datetime}
+      (starting.to_date..ending.to_date).to_a.map(&:to_datetime)
     else
 
+      # sub-day is checked for DST
+      # noinspection RubyNilAnalysis
+      actual_starting   = starting.to_time.to_i
+      actual_ending     = ending.to_time.to_i
+      actual_ending -= 3600 if starting.dst? && (not ending.dst?)
+      actual_ending += 3600 if ending.dst? && (not starting.dst?)
+
       ##### The following is the actual big magic line, as it creates the raw target array:
       #
-      result = (starting.to_time.to_i..ending.to_time.to_i).step(step).to_a.map { |x| timezone.at(x) }
+      result = (actual_starting..actual_ending).step(step).to_a.map { |x| timezone.at(x) }
       #
       # ###################<3##
 
-
-      # sub-day is checked for DST and filtered along provided ranges
-      # noinspection RubyNilAnalysis
-      starting_with_dst = result.first.dst?
-
-      # The following lambda is completely misplaces here.
       # It should probably relocated to Cotcube::Bardata
       # NOTE: In this current version 12 belongs to it succeeding hour
       #       i.e. 12am is right before 1am and 12pm right before 1pm
       convert_to_sec_since = lambda do |clocking|
         from_src, to_src = clocking.split(' - ')
@@ -60,28 +66,31 @@
 
         (0...5).to_a.map { |i| [from_i + i * 24 * 3600, to_i + i * 24 * 3600] }
       end
       convert_to_sec_since.call('9:00a.m - 5:00p.m.')
 
-      ranges ||= [
-        61_200...144_000,   # Sun 5pm .. Mon 4pm
-        147_600...230_400,  # Mon 5pm .. Tue 4pm
-        234_000...316_800,  # ...
-        320_400...403_200,
-        406_800...489_600
-      ]
+      # ranges ||= [
+      #  61_200...144_000,   # Sun 5pm .. Mon 4pm
+      #  147_600...230_400,  # Mon 5pm .. Tue 4pm
+      #  234_000...316_800,  # ...
+      #  320_400...403_200,
+      #  406_800...489_600
+      # ]
 
       # if there was a change towards daylight saving time, subtract 1 hour, otherwise add 1 hour
       result.map! do |time|
-        if (not starting_with_dst) && time.dst?
-          time - 3600
-        elsif starting_with_dst && (not time.dst?)
-          time + 3600
-        else
-          time
+        print "#{time}\t" if debug
+        if (not starting.dst?) && time.dst?
+          time -= 3600
+          print "Time reduced (not starting_DST, but current\t" if debug
+        elsif starting.dst? && (not time.dst?)
+          time += 3600
+          print "Time extended (starting DST, but not current\t" if debug
         end
+        puts "#{time} " if debug
+        time
       end
 
-      result.select_within(ranges: ranges) { |x| x.to_datetime.to_seconds_since_monday_morning }
+      result # .select_within(ranges: ranges) { |x| x.to_datetime.to_seconds_since_sunday_morning }
     end
   end
 end