active_date_range 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93ef4c06d102fab1f4d60e5a6e8ef093f80f73e5d18ae80feb7b3ff952e53d3
-  data.tar.gz: f3e0b0fcfc7e7ae3a4085ceb6eb719b13c8b03452c7219d9570f6634768327a6
+  metadata.gz: 35a7b655ef32c770ab582f7228e59a90091cdba9553de211e1b18d4efbbb016c
+  data.tar.gz: 2f8b685dcaa03b9df69a3d17876023c6e0de5dd8d3bc2f2c0a8208ecffd6b1df
 SHA512:
-  metadata.gz: 0e6ec69527db1a35890f69111e4b1a00f2d1158b2f7bfaeb5d45b51cc7f0a943876c9a4c2cb0cc6da944e251e836c02c8b3a5ccaee43b9cfb351f2cc9340159a
-  data.tar.gz: f5405fc96a213e444dd62a3cd4caf97601a0852937204c5261cf7cb9d979bdfca20b8920f4988af8e6ecd30cb7797e28355ff0f71781dd1cb96677d3ad56b464
+  metadata.gz: 292d7bc594e974903c6f73e4edf7b4e3775901f1c970ec54623950d019a8c327ba04e25b0d743c36605df2f514ee752471bd3787d86ff25ece1cdf9903b5b157
+  data.tar.gz: 156323981ba292945aebe705431e86eb5474dcf2adfc1caea88fa9703a60b6f4b164222312ae14710b825b3ed8e2482fdd8545ae839bb3165dcb666a683b8ae0

data/.github/workflows/ruby.yml

@@ -0,0 +1,57 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0']
+
+    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
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake
+
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Cache gems
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-rubocop-
+    - name: Install gems
+      run: |
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+    - name: Run RuboCop
+      run: bundle exec rubocop --parallel

data/.rubocop.yml

@@ -8,7 +8,6 @@ AllCops:
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
-  SuggestExtensions: false
   Exclude:
     - '**/tmp/**/*'
     - '**/templates/**/*'

data/CHANGELOG.md

@@ -1,4 +1,55 @@
-== 0.1.0
+## 0.3.1
+
+* Fix issue with `next` not returning a full year when leap years are in the range
+
+  *Edwin Vlieg*
+
+## 0.3.0
+
+* `include?` now behaves like `cover?` for better performance
+
+  *Edwin Vlieg*
+
+* Add intersection support:
+
+  ```
+  date_range.intersection(other_date_range) # => DateRange
+  ```
+
+  *Edwin Vlieg*
+
+
+* Add support for boundless ranges:
+
+  ```
+  date_range = DateRange.parse('202101..')
+  date_range.boundless? # => true
+  date_range.in_groups_of(:month) # => Enumerator::Lazy
+  Model.where(date: date_range) # => SQL "WHERE date >= 2021-01-01"
+  ```
+
+  *Edwin Vlieg*
+
+* Add ActiveModel type for date range:
+
+  ```
+  attribute :period, :date_range
+  ```
+
+  *Edwin Vlieg*
+
+## 0.2.0
+
+* Add support for weeks:
+
+  - Shorthands for `this_week`, `next_week` and `prev_week`
+  - `full_week?` and `one_week?`
+  - `next` and `previous` now handle weeks correctly
+  - Tests for biweekly calculations
+
+  *Edwin Vlieg*
+
+## 0.1.0
 
 *   Initial import of the DateRange implementation from the internal implementation in the Moneybird code.
 

data/Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in active_date_range.gemspec
 gemspec
 
 gem "rake", "~> 12.0"
-gem "railties", "~> 6.1"
+gem "railties", "> 6.1"
 gem "minitest", "~> 5.0"
 gem "guard"
 gem "guard-minitest"

data/Gemfile.lock

@@ -1,76 +1,75 @@
 PATH
   remote: .
   specs:
-    active_date_range (0.1.0)
-      activesupport (~> 6.1)
+    active_date_range (0.3.1)
+      activesupport (> 6.1)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.2.1)
-      actionview (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.0.alpha2)
+      actionview (= 7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actionview (7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.2.1)
+    activemodel (7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
+    activesupport (7.0.0.alpha2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
-    ffi (1.14.2)
-    formatador (0.2.5)
-    guard (2.16.2)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.5.2)
@@ -80,59 +79,61 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    railties (7.0.0.alpha2)
+      actionpack (= 7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
+      zeitwerk (~> 2.5.0.beta3)
     rainbow (3.0.0)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rubocop (0.91.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.21.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.2)
-      parser (>= 2.7.1.4)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.12.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    ruby-progressbar (1.10.1)
+      rubocop (>= 1.7.0, < 2.0)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.0.beta3)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   active_date_range!
+  activemodel
   guard
   guard-minitest
   minitest (~> 5.0)
   pry
-  railties (~> 6.1)
+  railties (> 6.1)
   rake (~> 12.0)
   rubocop
   rubocop-packaging
@@ -140,4 +141,4 @@ DEPENDENCIES
   rubocop-rails
 
 BUNDLED WITH
-   2.1.4
+   2.3.5

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
@@ -19,11 +21,11 @@ clearing :on
 
 guard :minitest do
   # with Minitest::Unit
-  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^test/(.*)/?test_(.*)\.rb$})
+  watch(%r{^test/(.*)/?(.*)_test\.rb$})
   watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
   watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
-  watch(%r{^test/test_helper\.rb$})      { 'test' }
+  watch(%r{^test/test_helper\.rb$})      { "test" }
 
   # with Minitest::Spec
   # watch(%r{^spec/(.*)_spec\.rb$})

data/README.md

@@ -29,18 +29,21 @@ ActiveDateRange::DateRange.new(Date.new(2021, 1, 1), Date.new(2021, 12, 31))
 ActiveDateRange::DateRange.new(Date.new(2021, 1, 1)..Date.new(2021, 12, 31))
 ```
 
-You can also use shorthands to initialize a range relative to today. Shorthands are available for `this`, `prev` and `next` for the ranges `month`, `quarter` and `year`:
+You can also use shorthands to initialize a range relative to today. Shorthands are available for `this`, `prev` and `next` for the ranges `month`, `quarter`, `year` and `week`:
 
 ```ruby
 ActiveDateRange::DateRange.this_month
 ActiveDateRange::DateRange.this_year
 ActiveDateRange::DateRange.this_quarter
+ActiveDateRange::DateRange.this_week
 ActiveDateRange::DateRange.prev_month
 ActiveDateRange::DateRange.prev_year
 ActiveDateRange::DateRange.prev_quarter
+ActiveDateRange::DateRange.prev_week
 ActiveDateRange::DateRange.next_month
 ActiveDateRange::DateRange.next_year
 ActiveDateRange::DateRange.next_quarter
+ActiveDateRange::DateRange.next_week
 ```
 
 The third option is to use parse:
@@ -71,6 +74,7 @@ date_range.months                           # => 12
 date_range.quarters                         # => 4
 date_range.years                            # => 1
 date_range.one_month?                       # => false
+date_range.one_week?                        # => false
 date_range.one_year?                        # => true
 date_range.full_year?                       # => true
 date_range.same_year?                       # => true
@@ -89,6 +93,16 @@ date_range.previous(2)                          # => DateRange.parse('201901..20
 date_range.next                                 # => DateRange.parse('202201..202212')
 date_range + DateRange.parse('202201..202202')  # => DateRange.parse('202101..202202')
 date_range.in_groups_of(:month)                 # => [DateRange.parse('202101..202101'), ..., DateRange.parse('202112..202112')]
+date_range.intersection(DateRange.parse('202101..202102')) # => DateRange.parse('202101..202102')
+```
+
+Support for boundless ranges is also available:
+
+```ruby
+date_range = DateRange.parse('202101..')
+date_range.boundless? # => true
+date_range.in_groups_of(:month) # => Enumerator::Lazy
+Model.where(date: date_range) # => SQL "WHERE date >= 2021-01-01"
 ```
 
 And lastly you can call `.humanize` to get a localizable human representation of the range for in the user interface:
@@ -100,6 +114,18 @@ date_range.humanize(format: :explicit)   # => 'January 1st, 2021 - December 31st
 
 See [active_date_range/locale/en.yml](https://github.com/moneybird/active-date-range/blob/main/lib/active_date_range/locale/en.yml) for all the I18n keys you need to translate for your application.
 
+### ActiveModel type
+
+Date ranges are also available as an ActiveModel type. So you can use a date range attribute and the value will automatically be converted:
+
+```ruby
+class Report
+  include ActiveModel::Attributes
+
+  attribute :period, :date_range
+end
+```
+
 ### Usage example
 
 Use the shorthands to link to a specific period:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/active_date_range.gemspec

@@ -1,4 +1,6 @@
-require_relative 'lib/active_date_range/version'
+# frozen_string_literal: true
+
+require_relative "lib/active_date_range/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "active_date_range"
@@ -9,26 +11,27 @@ Gem::Specification.new do |spec|
   spec.summary       = "DateRange for ActiveSupport"
   spec.description   = "ActiveDateRange provides a range of dates with a powerful API to manipulate and use date ranges in your software."
   spec.homepage      = "https://github.com/moneybird/active-date-range"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/moneybird/active-date-range"
-  spec.metadata["changelog_uri"] = "https://github.com/moneybird/active-date-range/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/moneybird/active-date-range/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 6.1"
+  spec.add_dependency "activesupport", "> 6.1"
   spec.add_dependency "i18n"
 
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-packaging"
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "rubocop-rails"
+  spec.add_development_dependency "activemodel"
 end

data/bin/console

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "active_support"
+require "active_model"
 require "active_date_range"
 
 Time.zone = "UTC"

data/lib/active_date_range/active_model_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveDateRange
+  class DateRangeType < ActiveModel::Type::String
+    def cast(value)
+      ActiveDateRange::DateRange.parse(value)
+    end
+  end
+end
+
+if defined?(ActiveModel)
+  ActiveModel::Type.register(:date_range, ActiveDateRange::DateRangeType)
+end

data/lib/active_date_range/date_range.rb

@@ -12,7 +12,10 @@ module ActiveDateRange
       next_quarter: -> { DateRange.new(3.months.from_now.to_date.all_quarter) },
       this_year: -> { DateRange.new(Time.zone.today.all_year) },
       prev_year: -> { DateRange.new(12.months.ago.to_date.all_year) },
-      next_year: -> { DateRange.new(12.months.from_now.to_date.all_year) }
+      next_year: -> { DateRange.new(12.months.from_now.to_date.all_year) },
+      this_week: -> { DateRange.new(Time.zone.today.all_week) },
+      prev_week: -> { DateRange.new(1.week.ago.to_date.all_week) },
+      next_week: -> { DateRange.new(1.week.from_now.to_date.all_week) }
     }.freeze
 
     RANGE_PART_REGEXP = %r{\A(?<year>((1\d|2\d)\d\d))-?(?<month>0[1-9]|1[012])-?(?<day>[0-2]\d|3[01])?\z}
@@ -32,12 +35,14 @@ module ActiveDateRange
       return SHORTHANDS[input.to_sym].call if SHORTHANDS.key?(input.to_sym)
 
       begin_date, end_date = input.split("..")
-      raise InvalidDateRangeFormat, "#{input} doesn't have a begin..end format" unless begin_date && end_date
+      raise InvalidDateRangeFormat, "#{input} doesn't have a begin..end format" if begin_date.blank? && end_date.blank?
 
       DateRange.new(parse_date(begin_date), parse_date(end_date, last: true))
     end
 
     def self.parse_date(input, last: false)
+      return if input.blank?
+
       match_data = input.match(RANGE_PART_REGEXP)
       raise InvalidDateRangeFormat, "#{input} isn't a valid date format YYYYMMDD or YYYYMM" unless match_data
 
@@ -59,12 +64,13 @@ module ActiveDateRange
     # Make sures the begin date is before the end date.
     def initialize(begin_date, end_date = nil)
       begin_date, end_date = begin_date.begin, begin_date.end if begin_date.kind_of?(Range)
+      begin_date, end_date = begin_date.first, begin_date.last if begin_date.kind_of?(Array)
       begin_date = begin_date.to_date if begin_date.kind_of?(Time)
       end_date = end_date.to_date if end_date.kind_of?(Time)
 
-      raise InvalidDateRange, "Date range invalid, begin should be a date" unless begin_date.kind_of?(Date)
-      raise InvalidDateRange, "Date range invalid, end should be a date" unless end_date.kind_of?(Date)
-      raise InvalidDateRange, "Date range invalid, begin #{begin_date} is after end #{end_date}" if begin_date > end_date
+      raise InvalidDateRange, "Date range invalid, begin should be a date" if begin_date && !begin_date.kind_of?(Date)
+      raise InvalidDateRange, "Date range invalid, end should be a date" if end_date && !end_date.kind_of?(Date)
+      raise InvalidDateRange, "Date range invalid, begin #{begin_date} is after end #{end_date}" if begin_date && end_date && begin_date > end_date
 
       super(begin_date, end_date)
     end
@@ -81,8 +87,14 @@ module ActiveDateRange
       self.begin <=> other.begin
     end
 
+    def boundless?
+      self.begin.nil? || self.end.nil?
+    end
+
     # Returns the number of days in the range
     def days
+      return if boundless?
+
       @days ||= (self.end - self.begin).to_i + 1
     end
 
@@ -107,19 +119,31 @@ module ActiveDateRange
       months / 12
     end
 
+    # Returns the number of weeks on the range or nil when range is no full week
+    def weeks
+      return nil unless full_week?
+
+      days / 7
+    end
+
     # Returns true when begin of the range is at the beginning of the month
     def begin_at_beginning_of_month?
-      self.begin.day == 1
+      self.begin.present? && self.begin.day == 1
     end
 
     # Returns true when begin of the range is at the beginning of the quarter
     def begin_at_beginning_of_quarter?
-      begin_at_beginning_of_month? && [1, 4, 7, 10].include?(self.begin.month)
+      self.begin.present? && begin_at_beginning_of_month? && [1, 4, 7, 10].include?(self.begin.month)
     end
 
     # Returns true when begin of the range is at the beginning of the year
     def begin_at_beginning_of_year?
-      begin_at_beginning_of_month? && self.begin.month == 1
+      self.begin.present? && begin_at_beginning_of_month? && self.begin.month == 1
+    end
+
+    # Returns true when begin of the range is at the beginning of the week
+    def begin_at_beginning_of_week?
+      self.begin.present? && self.begin == self.begin.at_beginning_of_week
     end
 
     # Returns true when the range is exactly one month long
@@ -143,44 +167,57 @@ module ActiveDateRange
         self.end == self.begin.at_end_of_year
     end
 
+    def one_week?
+      days == 7 &&
+        begin_at_beginning_of_week? &&
+        self.end == self.begin.at_end_of_week
+    end
+
     # Returns true when the range is exactly one or more months long
     def full_month?
-      begin_at_beginning_of_month? && self.end == self.end.at_end_of_month
+      begin_at_beginning_of_month? && self.end.present? && self.end == self.end.at_end_of_month
     end
 
     alias :full_months? :full_month?
 
     # Returns true when the range is exactly one or more quarters long
     def full_quarter?
-      begin_at_beginning_of_quarter? && self.end == self.end.at_end_of_quarter
+      begin_at_beginning_of_quarter? && self.end.present? && self.end == self.end.at_end_of_quarter
     end
 
     alias :full_quarters? :full_quarter?
 
     # Returns true when the range is exactly one or more years long
     def full_year?
-      begin_at_beginning_of_year? && self.end == self.end.at_end_of_year
+      begin_at_beginning_of_year? && self.end.present? && self.end == self.end.at_end_of_year
     end
 
     alias :full_years? :full_year?
 
+    # Returns true when the range is exactly one or more weeks long
+    def full_week?
+      begin_at_beginning_of_week? && self.end.present? && self.end == self.end.at_end_of_week
+    end
+
+    alias :full_weeks? :full_week?
+
     # Returns true when begin and end are in the same year
     def same_year?
-      self.begin.year == self.end.year
+      !boundless? && self.begin.year == self.end.year
     end
 
     # Returns true when the date range is before the given date. Accepts both a <tt>Date</tt>
     # and <tt>DateRange</tt> as input.
     def before?(date)
       date = date.begin if date.kind_of?(DateRange)
-      self.end.before?(date)
+      self.end.present? && self.end.before?(date)
     end
 
     # Returns true when the date range is after the given date. Accepts both a <tt>Date</tt>
     # and <tt>DateRange</tt> as input.
     def after?(date)
       date = date.end if date.kind_of?(DateRange)
-      self.begin.after?(date)
+      self.begin.present? && self.begin.after?(date)
     end
 
     # Returns the granularity of the range. Returns either <tt>:year</tt>, <tt>:quarter</tt> or
@@ -196,6 +233,8 @@ module ActiveDateRange
         :quarter
       elsif one_month?
         :month
+      elsif one_week?
+        :week
       end
     end
 
@@ -225,7 +264,7 @@ module ActiveDateRange
         relative_param
       else
         format = full_month? ? "%Y%m" : "%Y%m%d"
-        "#{self.begin.strftime(format)}..#{self.end.strftime(format)}"
+        "#{self.begin&.strftime(format)}..#{self.end&.strftime(format)}"
       end
     end
 
@@ -244,13 +283,19 @@ module ActiveDateRange
     #   DateRange.this_month.previous # => DateRange.prev_month
     #   DateRange.this_month.previous(2) # => DateRange.prev_month.previous + DateRange.prev_month
     def previous(periods = 1)
-      if granularity
-        DateRange.new(self.begin - periods.send(granularity), self.begin - 1.day)
+      raise BoundlessRangeError, "Can't calculate previous for boundless range" if boundless?
+
+      begin_date = if granularity
+        self.begin - periods.send(granularity)
       elsif full_month?
-        DateRange.new(in_groups_of(:month).first.previous(periods * months).begin, self.begin - 1.day)
+        in_groups_of(:month).first.previous(periods * months).begin
       else
-        DateRange.new((self.begin - (periods * days).days).at_beginning_of_month, self.begin - 1.day)
+        (self.begin - (periods * days).days)
       end
+
+      begin_date = begin_date.at_beginning_of_month if full_month?
+
+      DateRange.new(begin_date, self.begin - 1.day)
     end
 
     # Returns the period next to the current period. `periods` can be raised to return more
@@ -259,11 +304,18 @@ module ActiveDateRange
     #   DateRange.this_month.next # => DateRange.next_month
     #   DateRange.this_month.next(2) # => DateRange.next_month + DateRange.next_month.next
     def next(periods = 1)
-      if granularity
-        DateRange.new(self.end + 1.day, (self.end + periods.send(granularity)).at_end_of_month)
+      raise BoundlessRangeError, "Can't calculate next for boundless range" if boundless?
+
+      end_date = if granularity
+        self.end + periods.send(granularity)
+      elsif full_month?
+        in_groups_of(:month).last.next(periods * months).end
       else
-        DateRange.new(self.end + 1.day, (self.end + days.days).at_end_of_month)
+        self.end + (periods * days).days
       end
+      end_date = end_date.at_end_of_month if full_month?
+
+      DateRange.new(self.end + 1.day, end_date)
     end
 
     # Returns an array with date ranges containing full months/quarters/years in the current range.
@@ -277,17 +329,40 @@ module ActiveDateRange
     #   DateRange.parse("202101..202103").in_groups_of(:month) # => [DateRange.parse("202001..202001"), DateRange.parse("202002..202002"), DateRange.parse("202003..202003")]
     #   DateRange.parse("202101..202106").in_groups_of(:month, amount: 2) # => [DateRange.parse("202001..202002"), DateRange.parse("202003..202004"), DateRange.parse("202005..202006")]
     def in_groups_of(granularity, amount: 1)
-      raise UnknownGranularity, "Unknown granularity #{granularity}. Valid are: month, quarter and year" unless %w[month quarter year].include?(granularity.to_s)
+      raise BoundlessRangeError, "Can't group date range without a begin." if self.begin.nil?
 
-      group_by { |d| [d.year, d.send(granularity)] }
-        .map { |_, group| DateRange.new(group.first..group.last) }
-        .in_groups_of(amount)
-        .map { |group| group.inject(:+) }
+      if boundless?
+        grouped_collection(granularity, amount: amount)
+      else
+        grouped_collection(granularity, amount: amount).to_a
+      end
     end
 
     # Returns a human readable format for the date range. See DateRange::Humanizer for options.
     def humanize(format: :short)
       Humanizer.new(self, format: format).humanize
     end
+
+    # Returns the intersection of the current and the other date range
+    def intersection(other)
+      intersection = self.to_a.intersection(other.to_a).sort
+      DateRange.new(intersection) if intersection.any?
+    end
+
+    def include?(other)
+      cover?(other)
+    end
+
+    private
+      def grouped_collection(granularity, amount: 1)
+        raise UnknownGranularity, "Unknown granularity #{granularity}. Valid are: month, quarter and year" unless %w[month quarter year].include?(granularity.to_s)
+
+        lazy
+          .chunk { |d| [d.year, d.send(granularity)] }
+          .map { |_, group| DateRange.new(group.first..group.last) }
+          .with_index
+          .slice_before { |_, index| index % amount == 0 }
+          .map { |group| group.map(&:first).inject(:+) }
+      end
   end
 end

data/lib/active_date_range/humanizer.rb

@@ -108,12 +108,19 @@ module ActiveDateRange
         month_format = date_range.full_month? ? "month" : "day_month"
         abbr = "abbr_" if date_range.same_year?
 
+        begin_formatted = I18n.localize(date_range.begin, format: :"#{abbr}#{format}_#{month_format}") if date_range.begin
+        end_formatted = I18n.localize(date_range.end, format: :"#{format}_#{month_format}") if date_range.end
+
         range(
-          I18n.localize(date_range.begin, format: :"#{abbr}#{format}_#{month_format}"),
-          I18n.localize(date_range.end, format: :"#{format}_#{month_format}")
+          begin_formatted || infinite,
+          end_formatted || infinite
         )
       end
 
+      def infinite
+        "∞"
+      end
+
       def range(range_begin, range_end)
         I18n.translate(:range, scope: :date, begin: range_begin, end: range_end)
       end

data/lib/active_date_range/i18n.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require "i18n"
   require "i18n/backend/fallbacks"

data/lib/active_date_range/locale/en.yml

@@ -25,12 +25,15 @@ en:
     relative_range:
       next_month: "next month"
       next_quarter: "next quarter"
+      next_week: "next week"
       next_year: "next year"
       prev_month: "the previous month"
       prev_quarter: "the previous quarter"
+      prev_week: "the previous week"
       prev_year: "the previous year"
       this_month: "this month"
       this_quarter: "this quarter"
+      this_week: "this week"
       this_year: "this year"
       today: "today"
     long_quarter: "quarter %{quarter}"

data/lib/active_date_range/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDateRange
-  VERSION = "0.1.0"
+  VERSION = "0.3.1"
 end

data/lib/active_date_range.rb

@@ -11,6 +11,7 @@ require "active_date_range/core_ext/date"
 require "active_date_range/version"
 require "active_date_range/date_range"
 require "active_date_range/humanizer"
+require "active_date_range/active_model_type"
 
 module ActiveDateRange
   class Error < StandardError; end
@@ -18,4 +19,5 @@ module ActiveDateRange
   class InvalidAddition < Error; end
   class InvalidDateRangeFormat < Error; end
   class UnknownGranularity < Error; end
+  class BoundlessRangeError < Error; end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_date_range
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Edwin Vlieg
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveDateRange provides a range of dates with a powerful API to manipulate
   and use date ranges in your software.
 email:
@@ -102,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -116,6 +131,7 @@ files:
 - bin/console
 - bin/setup
 - lib/active_date_range.rb
+- lib/active_date_range/active_model_type.rb
 - lib/active_date_range/core_ext/date.rb
 - lib/active_date_range/core_ext/integer.rb
 - lib/active_date_range/date_range.rb
@@ -128,8 +144,8 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/moneybird/active-date-range
   source_code_uri: https://github.com/moneybird/active-date-range
-  changelog_uri: https://github.com/moneybird/active-date-range/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/moneybird/active-date-range/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -137,15 +153,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key:
+rubygems_version: 3.2.9
+signing_key: 
 specification_version: 4
 summary: DateRange for ActiveSupport
 test_files: []