timeboss 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3091d788f78273741aeb0206a87765fed72e3908099c2596b70589740aa63c26
-  data.tar.gz: 2a0cd5b28cc9b05c07d3fe06aef86644876864b7b24eda946105706d0626622f
+  metadata.gz: 65f9e2cd955a728e0efd00e99f530f1ff6dbb7ee0c8cee7e25499466fb10edc9
+  data.tar.gz: 9523e2983ffff0d5d33cf9b07e7fd4cd1b26b54c68e8a3f77d8996aaa7ad991d
 SHA512:
-  metadata.gz: f58a6f56a3bf0cb2f44a00aee3b5a4d09fdbcd4b2cd8b06c2942fa4eefc508b0afff19dd577bef26bd7b5f187ca1ccb380e5efdd5b357da829ad2936d36c12ff
-  data.tar.gz: 5f2b1b5013f49c81e3e5f9066e9e4c3063ddd70231a7199010a79b822bc3531ead0d0bf285d9d045fb0434dcfa6e0a5564aac138a8b25b07e2a374b1c049faf9
+  metadata.gz: 1f850961e4659cee0b07e59d4421f1444c39e3882338f5189cd5821e5d4ec00228c4043aef7c001df8a2181cf4161671943653e7e0c843f419f4f7d91b6bb99d
+  data.tar.gz: 24a8f28844c20caf7f0294a5e5db155ff809f46ad76e421e97d807b929ceca37035d9b89539a5600713d9420ba8f799fa1668c61e47b040a8728c41df12a67df

data/bin/tbsh

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'timeboss/calendars'
-require 'shellable'
+require "timeboss"
+require "timeboss/calendars"
+require "shellable"
 
 calendar = if ARGV.length == 1
-             TimeBoss::Calendars[ARGV.first]
-           else
-             TimeBoss::Calendars.first.calendar
-           end
+  TimeBoss::Calendars[ARGV.first]
+else
+  TimeBoss::Calendars.first.calendar
+end
 
 abort "Unknown calendar" if calendar.nil?
 

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.0"
+  VERSION = "1.1.3"
 end

data/lib/timeboss.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/isolated_execution_state"
+require "active_support"
 require "timeboss/version"
 
 # TimeBoss

data/spec/{calendar → 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]

data/timeboss.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
 
+  spec.add_runtime_dependency "shellable"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeboss
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Kevin McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shellable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +215,14 @@ files:
 - lib/timeboss/calendars/broadcast.rb
 - lib/timeboss/calendars/gregorian.rb
 - lib/timeboss/version.rb
-- spec/calendar/day_spec.rb
-- spec/calendar/quarter_spec.rb
-- spec/calendar/support/monthly_unit_spec.rb
-- spec/calendar/support/unit_spec.rb
-- spec/calendar/week_spec.rb
-- spec/calendars/broadcast_spec.rb
-- spec/calendars/gregorian_spec.rb
-- spec/calendars_spec.rb
+- spec/lib/timeboss/calendar/day_spec.rb
+- spec/lib/timeboss/calendar/quarter_spec.rb
+- spec/lib/timeboss/calendar/support/monthly_unit_spec.rb
+- spec/lib/timeboss/calendar/support/unit_spec.rb
+- spec/lib/timeboss/calendar/week_spec.rb
+- spec/lib/timeboss/calendars/broadcast_spec.rb
+- spec/lib/timeboss/calendars/gregorian_spec.rb
+- spec/lib/timeboss/calendars_spec.rb
 - spec/spec_helper.rb
 - timeboss.gemspec
 homepage: https://github.com/kevinstuffandthings/timeboss
@@ -235,12 +249,12 @@ signing_key:
 specification_version: 4
 summary: Broadcast Calendar navigation in Ruby made simple
 test_files:
-- spec/calendar/day_spec.rb
-- spec/calendar/quarter_spec.rb
-- spec/calendar/support/monthly_unit_spec.rb
-- spec/calendar/support/unit_spec.rb
-- spec/calendar/week_spec.rb
-- spec/calendars/broadcast_spec.rb
-- spec/calendars/gregorian_spec.rb
-- spec/calendars_spec.rb
+- spec/lib/timeboss/calendar/day_spec.rb
+- spec/lib/timeboss/calendar/quarter_spec.rb
+- spec/lib/timeboss/calendar/support/monthly_unit_spec.rb
+- spec/lib/timeboss/calendar/support/unit_spec.rb
+- spec/lib/timeboss/calendar/week_spec.rb
+- spec/lib/timeboss/calendars/broadcast_spec.rb
+- spec/lib/timeboss/calendars/gregorian_spec.rb
+- spec/lib/timeboss/calendars_spec.rb
 - spec/spec_helper.rb