timeboss 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b856796bb4e37e5776aeed86c19dd42832af3091b189f01878d907de5cbf1864
-  data.tar.gz: 824c18de591069e4c46d01dc14dc2c1a2ee54881b670218014adf3d4d220a0da
+  metadata.gz: 65f9e2cd955a728e0efd00e99f530f1ff6dbb7ee0c8cee7e25499466fb10edc9
+  data.tar.gz: 9523e2983ffff0d5d33cf9b07e7fd4cd1b26b54c68e8a3f77d8996aaa7ad991d
 SHA512:
-  metadata.gz: 24bc5de8281c36802fb79b92b79a2381794710d320d2890d022c40f40aef4cedb1e3fe963085e3e1ea39fe9f51715994ccca4e5844c0e8bfb2784cbb65c2a339
-  data.tar.gz: a1fb6c4825ad05f9dd21a8514c6e6dc24a4904cb235a2a1d16b888e3664fa5f92c6ea8b4ccef3c09198c8e2aea272fb662610bd25fc5ed210f2b095feb90fab3
+  metadata.gz: 1f850961e4659cee0b07e59d4421f1444c39e3882338f5189cd5821e5d4ec00228c4043aef7c001df8a2181cf4161671943653e7e0c843f419f4f7d91b6bb99d
+  data.tar.gz: 24a8f28844c20caf7f0294a5e5db155ff809f46ad76e421e97d807b929ceca37035d9b89539a5600713d9420ba8f799fa1668c61e47b040a8728c41df12a67df

data/lib/timeboss/calendar/support/unit.rb

@@ -84,6 +84,15 @@ module TimeBoss
           @_to_range ||= start_date..end_date
         end
 
+        # Clamp this unit to the range of the provided unit.
+        # @return [Period]
+        def clamp(unit)
+          new_start_date = start_date.clamp(unit.start_date, unit.end_date)
+          new_end_date = end_date.clamp(unit.start_date, unit.end_date)
+          return unless new_start_date.between?(start_date, end_date) && new_end_date.between?(start_date, end_date)
+          calendar.parse("#{new_start_date}..#{new_end_date}")
+        end
+
         def inspect
           "#<#{self.class.name} start_date=#{start_date}, end_date=#{end_date}>"
         end

data/lib/timeboss/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TimeBoss
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/lib/timeboss/calendar/support/unit_spec.rb

@@ -28,6 +28,57 @@ module TimeBoss
           end
         end
 
+        describe "#clamp" do
+          let(:clamp_start_date) { Date.parse("2018-06-21") }
+          let(:clamp_end_date) { Date.parse("2018-08-30") }
+          let(:result) { subject.clamp(described_class.new(calendar, clamp_start_date, clamp_end_date)) }
+          let(:period) { double }
+
+          context "open" do
+            it "does not restrict the returned period" do
+              expect(calendar).to receive(:parse).with("#{start_date}..#{end_date}").and_return period
+              expect(result).to eq period
+            end
+          end
+
+          context "left clamped" do
+            let(:clamp_start_date) { Date.parse("2018-06-30") }
+
+            it "brings the beginning date inward" do
+              expect(calendar).to receive(:parse).with("#{clamp_start_date}..#{end_date}").and_return period
+              expect(result).to eq period
+            end
+          end
+
+          context "right clamped" do
+            let(:clamp_end_date) { Date.parse("2018-07-30") }
+
+            it "brings the beginning date inward" do
+              expect(calendar).to receive(:parse).with("#{start_date}..#{clamp_end_date}").and_return period
+              expect(result).to eq period
+            end
+          end
+
+          context "fully clamped" do
+            let(:clamp_start_date) { Date.parse("2018-06-30") }
+            let(:clamp_end_date) { Date.parse("2018-07-30") }
+
+            it "brings the beginning date inward" do
+              expect(calendar).to receive(:parse).with("#{clamp_start_date}..#{clamp_end_date}").and_return period
+              expect(result).to eq period
+            end
+          end
+
+          context "obliterated" do
+            let(:clamp_start_date) { Date.parse("2018-09-01") }
+            let(:clamp_end_date) { Date.parse("2018-09-06") }
+
+            it "returns nil" do
+              expect(result).to be_nil
+            end
+          end
+        end
+
         context "periods" do
           before(:each) do
             allow(calendar).to receive(:days_for).with(subject).and_return %w[D1 D2 D3 D4 D5 D6 D7 D8]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeboss
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Kevin McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport