periodoxical 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace9209a6c531a382b264e87513dc6e5075499fc90f1eba313404368d96e58ba
-  data.tar.gz: e1771a96128f204df520f39bfcb54d3a294c130da07d0c9f971b98908fe985ce
+  metadata.gz: 9a17e3bd272fdd537b16689e871aa834c6388202d36d5ed5bf420150c0ff62bd
+  data.tar.gz: 8c08b584338f8d2e14cb8c0c8ce1ec4171d5fa4c946328911b25302aa621e92e
 SHA512:
-  metadata.gz: aaaf84f0c0af53ad1df2f595298a8327fc67574b7a35c08a27a921f0719ef6eea0990a7ee28423755f3baa0abe78d31e4bad7bcd42f82d1c9ebe6607b0fe0574
-  data.tar.gz: 8eed0bfd9236bb43084c0427a50ac6ce6b793411d30adffd1d12b303ae57d0cf8d5dc0281b1c654aa15584a436066dea7f1a39a5283bdc7ef398df9dde56ec5c
+  metadata.gz: 76df9351805289b310b079dd0a44587630db263101a18777ffa4612dacd5e846313fc56b8836ffa42fe7126926456d11273c218187dda0542d5b76c65a6a0451
+  data.tar.gz: afed95be8919055c47c5b118b6e01f944b03e16fc2c87046157ece131d35d0078c1dc5cbad804140afb9cdc975283c9d464536a4b65d7549181b5e0781afb628

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    periodoxical (2.2.0)
+    periodoxical (2.2.1)
       tzinfo (~> 2.0, >= 2.0.0)
 
 GEM

data/README.md

@@ -240,7 +240,8 @@ Periodoxical.generate(
 ]
 ```
 
-### Example 6 - Specify nth day-of-week in month (ie. first Monday of the Month, second Tuesday of the Month, last Friday of Month)
+### Specify nth day-of-week in month (ie. first Monday of the Month, second Tuesday of the Month, last Friday of Month)
+
 As a Ruby dev, I want to generate timeblocks for **8AM - 9AM** on the **first and second Mondays**  and **last Fridays** of every month starting in June 2024.  I can do this with the `nth_day_of_week_in_month` param.
 
 ```rb
@@ -281,7 +282,7 @@ Periodoxical.generate(
 ]
 ```
 
-### Example 7 - Exclude time blocks using the `exclusion_dates` and `exclusion_times` parameters
+### Exclude time blocks using the `exclusion_dates` and `exclusion_times` parameters
 As a Ruby dev, I want to generate timeblocks for **8AM - 9AM** on **Mondays**, except for the **Monday of June 10, 2024**.  I can do this using the `exlcusion_dates` parameter.
 
 ```rb
@@ -367,7 +368,7 @@ Periodoxical.generate(
 ]
 ```
 
-### Example 8 - Every-other-nth day-of-week rules (ie. every other Tuesday, every 3rd Wednesday, every 10th Friday)
+### Every-other-nth day-of-week rules (ie. every other Tuesday, every 3rd Wednesday, every 10th Friday)
 
 As a Ruby dev, I want to generate timeblocks for **9AM- 10AM** on **every Monday**, but **every other Tuesday**, and **every other 3rd Wednesday**. I can do this using the `days_of_week` parameter with the `every` and `every_other_nth` keys to specify the every-other-nth-rules.
 

data/lib/periodoxical/helpers.rb

@@ -27,11 +27,14 @@ module Periodoxical
       tb_2_start = time_block_2[:start]
       tb_2_end = time_block_2[:end]
 
-      # Basicall overlap is when one starts before the other has ended
+      # Basically overlap is when one starts before the other has ended
       return true if tb_1_end > tb_2_start && tb_1_end < tb_2_end
       # By symmetry
       return true if tb_2_end > tb_1_start && tb_2_end < tb_1_end
 
+      # Handle the edge case where they start/end at the same time
+      return true if tb_1_start == tb_2_start || tb_1_end == tb_2_end
+
       false
     end
 

data/lib/periodoxical/version.rb

@@ -1,3 +1,3 @@
 module Periodoxical
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/lib/periodoxical.rb

@@ -148,7 +148,7 @@ module Periodoxical
     #   Ex: '9:00AM'
     # @param [Date] date
     def time_str_to_object(date, time_str)
-      time = Time.strptime(time_str, "%I:%M%p")
+      time = Time.strptime(time_str, '%I:%M%p')
       date_time = DateTime.new(
         date.year,
         date.month,
@@ -209,19 +209,19 @@ module Periodoxical
     #  }
     #  Generates time block but also checks if we should stop generating
     def append_to_output_and_check_limit(time_block)
-      # Check if this particular time is conflicts with any times from `exclusion_times`.
-      return if overlaps_with_an_excluded_time?(time_block)
-      return if before_starting_from_or_after_ending_at?(time_block)
-
       strtm = time_str_to_object(@current_date, time_block[:start_time])
       endtm = time_str_to_object(@current_date, time_block[:end_time])
 
       if @duration
         split_by_duration_and_append(strtm, endtm)
       else
+        # Check if this particular time is conflicts with any times from `exclusion_times`.
+        return if before_starting_from_or_after_ending_at?(time_block)
+        return if overlaps_with_an_excluded_time?({ start: strtm, end: endtm })
+
         @output << {
           start: strtm,
-          end: endtm 
+          end: endtm
         }
         increment_and_check_limit
       end
@@ -410,19 +410,22 @@ module Periodoxical
       false
     end
 
+    # @param [Hash] time_block
+    # Ex:
+    #   {
+    #     start: #<DateTime>,
+    #     end: #<DateTime>,
+    #   }
     # @return [Boolean]
     #   Whether or not the given `time_block` in the @current_date and
     #   @time_zone overlaps with the times in `exclusion_times`.
-    def overlaps_with_an_excluded_time?(time_block)
+    def overlaps_with_an_excluded_time?(tm_blck)
       return false unless @exclusion_times
 
       @exclusion_times.each do |exclusion_timeblock|
         return true if overlap?(
           exclusion_timeblock,
-          {
-            start: time_str_to_object(@current_date, time_block[:start_time]),
-            end: time_str_to_object(@current_date, time_block[:end_time]),
-          }
+          tm_blck
         )
       end
 
@@ -434,13 +437,15 @@ module Periodoxical
       si = strtm
       ei = strtm + delta
       while ei <= endtm
-        @output << {
-          start: si,
-          end: ei
-        }
+        unless overlaps_with_an_excluded_time?({ start: si, end: ei })
+          @output << {
+            start: si,
+            end: ei
+          }
+          increment_and_check_limit
+        end
         si += delta
         ei += delta
-        increment_and_check_limit
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: periodoxical
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Steven Li
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo