timeboss 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c22a99ae9b02ecc3f435e99622a075c0a26af2d15f87070aefb1e6c0deb1c4
-  data.tar.gz: 774b9250575112756f30f9522bd98b36ed017a010cace574407a88b4f3316f98
+  metadata.gz: 3299b203ac582ad852fb3411015fb1c8d53ab9b59fbae51f133e79e4750ba912
+  data.tar.gz: ae84c4d98f8996519c30b05700f359faca2f66492c78e46f2eda0cf9e2fcc60c
 SHA512:
-  metadata.gz: 949de3a932fe24a8c34e8bf9ba89eed605ff6f8148ab5763600a6fb6ec00b822cfc2425b4aebce6982ecc62be43fb037723a264a6543539e626755dc39f1ec04
-  data.tar.gz: ac0312302c3e89d193bf16354ccf3593e3bed79e6e569b1580d78f82ad40bf663765f950078c86572d3e245f265047b947dbe70c1948b82bb958b205a73542af
+  metadata.gz: d2c3e30df4a6256bab1428fb470cbc21f7d44c89747ebd08b390d7b324b010980c2592fbbab3e503c0a21dc20705c03036cd9e68d6c67b844bf372ee19ad9bc0
+  data.tar.gz: 79994538d0477b935d1b17887f9e2748f73e59511d84e0dfffb236e0798bc39d1416cecc3e452965a7e96b0ddce156f92771cdeaf73080ca9b6892b1b5ace896

data/.github/workflows/gem-push.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 3.1
 
     - name: Publish to RubyGems
       run: |

data/.github/workflows/ruby.yml

@@ -19,15 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/lib/timeboss/calendar/period.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "./support/clampable"
+
 module TimeBoss
   class Calendar
     class Period
+      include Calendar::Support::Clampable
       attr_reader :begin, :end
 
       # @!method start_date

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module TimeBoss
+  class Calendar
+    module Support
+      module Clampable
+        # 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
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require_relative "./navigable"
 require_relative "./translatable"
 require_relative "./shiftable"
+require_relative "./clampable"
 require_relative "./formatter"
 
 module TimeBoss
@@ -12,6 +13,7 @@ module TimeBoss
         include Navigable
         include Translatable
         include Shiftable
+        include Clampable
         attr_reader :calendar, :start_date, :end_date
 
         UnsupportedUnitError = Class.new(StandardError)
@@ -84,15 +86,6 @@ 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.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeboss
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Kevin McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,6 +198,7 @@ files:
 - lib/timeboss/calendar/parser.rb
 - lib/timeboss/calendar/period.rb
 - lib/timeboss/calendar/quarter.rb
+- lib/timeboss/calendar/support/clampable.rb
 - lib/timeboss/calendar/support/formatter.rb
 - lib/timeboss/calendar/support/has_fiscal_weeks.rb
 - lib/timeboss/calendar/support/has_iso_weeks.rb
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Broadcast Calendar navigation in Ruby made simple