cotcube-helpers 0.1.5.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c255de9c0dac3cad83de38b0b8e1eb21af6d27bdf751d58dcc013b9044a7bc
-  data.tar.gz: 01cb8859f054baf5c87d55d7b718d8261b48428a59e0e728acbb759855526804
+  metadata.gz: 0417adfcb0f782bfa9e783dbd1c673a489fca39ce9a0f14fa965eb47aaa64b11
+  data.tar.gz: 1b14e149cc6b1bd437d1413dfa49b461c798868959cf97b164a0b3a2e1f72889
 SHA512:
-  metadata.gz: 6358bd447301dd4a001b3e4f3ab6e80cd8d2e3073eef1ef9f05fa5c907bf7fd3a19245bd4ea4667bfaebade359e1dc6ea5b24a8f24cf2a8f43bfbb070b6e2567
-  data.tar.gz: a8876e8e07211f0648b2e646b721e52912bcf117f5b6d811f744368a86ab5c030a2f7ad6542464486fd6502ce9f7c8c51ff9cc5e04e401f45c9289a69e8eb1f5
+  metadata.gz: c2babf733929f4ca0705ac2018b075e3b62df051c4918d01fcc6c11b49a7cad2ee68fd8ef26504edc5678c3057a97092de252a34cec2a953f638cd9262c2e65d
+  data.tar.gz: 1d9e367613f5b373c73cada786dee68d4e5ccc965573373b39d6419433a5f8131bc553773279d7ba58f2706a63be474448e15cc1e7bce1da63278ad384abeee0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.6 (January 15, 2021)
+  - removing :ranges from Range#select_within
+  - Added Array#select_right_by
+
 ## 0.1.5.4 (January 02, 2021)
 
 

data/VERSION

@@ -1 +1 @@
-0.1.5.4
+0.1.6

data/lib/cotcube-helpers/array_ext.rb

@@ -74,4 +74,24 @@ class Array
       end.reduce(:|)
     end
   end
+
+  def select_right_by(inclusive: false, exclusive: false, initial: [], &block)
+    # unless range.is_a? Range and
+    #       (range.begin.nil? or range.begin.is_a?(Integer)) and
+    #       (range.end.nil? or range.end.is_a?(Integer))
+    #  raise ArgumentError, ":range, if given, must be a range of ( nil|Integer..nil|Integer), got '#{range}'"
+    # end
+
+    raise ArgumentError, 'No block given.' unless block.is_a? Proc
+
+    inclusive = true unless exclusive
+    if inclusive && exclusive
+      raise ArgumentError,
+            "Either :inclusive or :exclusive must remain falsey, got '#{inclusive}' and '#{exclusive}'"
+    end
+
+    index = find_index { |obj| block.call(obj) }
+
+    self[((inclusive ? index : index + 1)..)]
+  end
 end

data/lib/cotcube-helpers/range_ext.rb

@@ -2,12 +2,17 @@
 
 # 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
@@ -30,21 +35,22 @@ class Range
     # 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
@@ -62,26 +68,29 @@ class Range
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.5.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport