active_date_range 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a7b655ef32c770ab582f7228e59a90091cdba9553de211e1b18d4efbbb016c
-  data.tar.gz: 2f8b685dcaa03b9df69a3d17876023c6e0de5dd8d3bc2f2c0a8208ecffd6b1df
+  metadata.gz: f7cc5d1d6cd20c08b30702deb5ecf7822c5cbff0da252e849fa290b90c81c6d8
+  data.tar.gz: 55ff9960e377aed53497050259e8ed76891a11cb2be911cf7a0079429f7bedae
 SHA512:
-  metadata.gz: 292d7bc594e974903c6f73e4edf7b4e3775901f1c970ec54623950d019a8c327ba04e25b0d743c36605df2f514ee752471bd3787d86ff25ece1cdf9903b5b157
-  data.tar.gz: 156323981ba292945aebe705431e86eb5474dcf2adfc1caea88fa9703a60b6f4b164222312ae14710b825b3ed8e2482fdd8545ae839bb3165dcb666a683b8ae0
+  metadata.gz: f226583cd68e5f054cc4db0d2fade2ffe7f8825cb659400c07b9e1857c5279856a9fa65e1789ecd4a2b475847937281ce06bed1c4e73df089531ead7d1644900
+  data.tar.gz: a44baee259cee6516cd7729f1572cc3c49aa0e6543d09a201f30036e14a44f886297582c63df7110a09d08ac81e4c752d47a15805c08d4e9b0c6fc7338f5cb5c

data/.github/workflows/codeql.yml

@@ -0,0 +1,83 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '25 4 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: ruby
+          build-mode: none
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v5
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

data/.github/workflows/ruby.yml

@@ -6,6 +6,8 @@
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
 name: Ruby
+permissions:
+  contents: read
 
 on:
   push:
@@ -18,15 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.2', '3.3', '3.4']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
     - 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
@@ -37,13 +36,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.7
+    - uses: actions/checkout@v5
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.4
     - name: Cache gems
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.4
   # 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

data/.ruby-version

@@ -0,0 +1,2 @@
+3.4.7
+

data/CHANGELOG.md

@@ -1,3 +1,51 @@
+## 0.4.0
+
+* Add #stretch_to_end_of_month:
+
+```
+DateRange.parse("20250101..20250112).stretch_to_end_of_month
+# => "20250101..20250131"
+```
+
+  *Vincent Oord*
+
+* Add exceeds? to check if the period does not exceed a given limit.
+
+```
+DateRange.parse("202501..202503).exceeds?(1.month)
+# => true
+
+DateRange.parse("20250101..20250105).exceeds?(1.week)
+# => false
+```
+
+  *Vincent Oord*
+
+* Update to Ruby 3.4.6 compatibility
+
+  *Vincent Oord*
+
+## 0.3.3
+
+* Add current? to check if the period containts the current date.
+
+  *Edwin Vlieg*
+
+* Add .from_date_and_duration:
+
+  ```
+  DateRange.from_date_and_duration(Date.new(2023, 1, 1), :month) # => Range
+  ```
+
+  *Edwin Vlieg*
+
+## 0.3.2
+
+* Add this_month?, this_quarter? and this_year? to check if a period is the current month, quarter or year
+
+  *Edwin Vlieg*
+
+
 ## 0.3.1
 
 * Fix issue with `next` not returning a full year when leap years are in the range

data/Gemfile

@@ -5,9 +5,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in active_date_range.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "railties", "> 6.1"
 gem "minitest", "~> 5.0"
 gem "guard"
 gem "guard-minitest"
 gem "pry"
+gem "benchmark-ips"
+gem "memory_profiler"

data/Gemfile.lock

@@ -1,47 +1,70 @@
 PATH
   remote: .
   specs:
-    active_date_range (0.3.1)
+    active_date_range (0.4.0)
       activesupport (> 6.1)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.0.alpha2)
-      actionview (= 7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-    activesupport (7.0.0.alpha2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activesupport (8.0.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    builder (3.2.4)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    benchmark-ips (2.14.0)
+    bigdecimal (3.3.0)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
     crass (1.0.6)
-    erubi (1.10.0)
-    ffi (1.15.4)
-    formatador (0.3.0)
-    guard (2.18.0)
+    date (3.4.1)
+    drb (2.2.3)
+    erb (5.0.3)
+    erubi (1.13.1)
+    ffi (1.17.2)
+    ffi (1.17.2-x86_64-linux-gnu)
+    formatador (1.2.1)
+      reline
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
+      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -49,92 +72,146 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    i18n (1.8.10)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    listen (3.7.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.15.1)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.12.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    minitest (5.14.4)
+      nokogiri (>= 1.12.0)
+    lumberjack (1.4.2)
+    memory_profiler (1.1.0)
+    method_source (1.1.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
     nenv (0.3.0)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.18.10)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.5.1)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.2.2)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (7.0.0.alpha2)
-      actionpack (= 7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-      method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5.0.beta3)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.21.0)
+    rdoc (6.15.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rubocop (1.81.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      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.11.5)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-packaging (0.6.0)
+      lint_roller (~> 1.1.0)
+      rubocop (>= 1.72.1, < 2.0)
+    rubocop-performance (1.26.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    ruby-progressbar (1.11.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     shellany (0.0.1)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    stringio (3.1.7)
+    thor (1.4.0)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.0.beta3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.4)
+    useragent (0.16.11)
+    zeitwerk (2.7.3)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   active_date_range!
   activemodel
+  benchmark-ips
   guard
   guard-minitest
+  memory_profiler
   minitest (~> 5.0)
   pry
   railties (> 6.1)
-  rake (~> 12.0)
+  rake (~> 13.0)
   rubocop
   rubocop-packaging
   rubocop-performance

data/SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.4.x   | :white_check_mark: |
+| < 0.3.3 | :x:                |
+
+## Reporting a Vulnerability
+
+Please refer to https://www.moneybird.nl/security/ for our Responsible Disclosure policy.

data/active_date_range.gemspec

@@ -11,7 +11,8 @@ 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.7.0")
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/moneybird/active-date-range"
@@ -26,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "> 6.1"
-  spec.add_dependency "i18n"
+  spec.add_runtime_dependency "activesupport", "~> 6.1"
+  spec.add_runtime_dependency "i18n", "~> 1.6"
 
-  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"
+  spec.add_development_dependency "rubocop", "~> 1.18"
+  spec.add_development_dependency "rubocop-packaging", "~> 0.6"
+  spec.add_development_dependency "rubocop-performance", "~> 1.26"
+  spec.add_development_dependency "rubocop-rails", "~> 2.33"
+  spec.add_development_dependency "activemodel", "~> 6.1"
 end

data/lib/active_date_range/date_range.rb

@@ -31,6 +31,7 @@ module ActiveDateRange
     # - A begin and end date: <tt>YYYYMMDD..YYYYMMDD</tt>
     # - A begin and end month: <tt>YYYYMM..YYYYMM</tt>
     def self.parse(input)
+      return nil if input.nil?
       return DateRange.new(input) if input.kind_of?(Range)
       return SHORTHANDS[input.to_sym].call if SHORTHANDS.key?(input.to_sym)
 
@@ -58,6 +59,11 @@ module ActiveDateRange
       raise InvalidDateRangeFormat
     end
 
+    def self.from_date_and_duration(date, duration)
+      duration = 1.send(duration) if duration.kind_of?(Symbol)
+      new(date, date + duration - 1.day)
+    end
+
     private_class_method :parse_date
 
     # Initializes a new DateRange. Accepts both a begin and end date or a range of dates.
@@ -128,84 +134,120 @@ module ActiveDateRange
 
     # Returns true when begin of the range is at the beginning of the month
     def begin_at_beginning_of_month?
-      self.begin.present? && self.begin.day == 1
+      memoize(:@begin_at_beginning_of_month) do
+        self.begin.present? && self.begin.day == 1
+      end
     end
 
     # Returns true when begin of the range is at the beginning of the quarter
     def begin_at_beginning_of_quarter?
-      self.begin.present? && begin_at_beginning_of_month? && [1, 4, 7, 10].include?(self.begin.month)
+      memoize(:@begin_at_beginning_of_quarter) do
+        self.begin.present? && begin_at_beginning_of_month? && [1, 4, 7, 10].include?(self.begin.month)
+      end
     end
 
     # Returns true when begin of the range is at the beginning of the year
     def begin_at_beginning_of_year?
-      self.begin.present? && begin_at_beginning_of_month? && self.begin.month == 1
+      memoize(:@begin_at_beginning_of_year) do
+        self.begin.present? && begin_at_beginning_of_month? && self.begin.month == 1
+      end
     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
+      memoize(:@begin_at_beginning_of_week) do
+        self.begin.present? && self.begin == self.begin.at_beginning_of_week
+      end
     end
 
     # Returns true when the range is exactly one month long
     def one_month?
-      (28..31).cover?(days) &&
-        begin_at_beginning_of_month? &&
-        self.end == self.begin.at_end_of_month
+      memoize(:@one_month) do
+        (28..31).cover?(days) &&
+          begin_at_beginning_of_month? &&
+          self.end == self.begin.at_end_of_month
+      end
     end
 
     # Returns true when the range is exactly one quarter long
     def one_quarter?
-      (90..92).cover?(days) &&
-        begin_at_beginning_of_quarter? &&
-        self.end == self.begin.at_end_of_quarter
+      memoize(:@one_quarter) do
+        (90..92).cover?(days) &&
+          begin_at_beginning_of_quarter? &&
+          self.end == self.begin.at_end_of_quarter
+      end
     end
 
     # Returns true when the range is exactly one year long
     def one_year?
-      (365..366).cover?(days) &&
-        begin_at_beginning_of_year? &&
-        self.end == self.begin.at_end_of_year
+      memoize(:@one_year) do
+        (365..366).cover?(days) &&
+          begin_at_beginning_of_year? &&
+          self.end == self.begin.at_end_of_year
+      end
     end
 
     def one_week?
-      days == 7 &&
-        begin_at_beginning_of_week? &&
-        self.end == self.begin.at_end_of_week
+      memoize(:@one_week) do
+        days == 7 &&
+          begin_at_beginning_of_week? &&
+          self.end == self.begin.at_end_of_week
+      end
     end
 
     # Returns true when the range is exactly one or more months long
     def full_month?
-      begin_at_beginning_of_month? && self.end.present? && self.end == self.end.at_end_of_month
+      memoize(:@full_month) do
+        begin_at_beginning_of_month? && self.end.present? && self.end == self.end.at_end_of_month
+      end
     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.present? && self.end == self.end.at_end_of_quarter
+      memoize(:@full_quarter) do
+        begin_at_beginning_of_quarter? && self.end.present? && self.end == self.end.at_end_of_quarter
+      end
     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.present? && self.end == self.end.at_end_of_year
+      memoize(:@full_year) do
+        begin_at_beginning_of_year? && self.end.present? && self.end == self.end.at_end_of_year
+      end
     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
+      memoize(:@full_week) do
+        begin_at_beginning_of_week? && self.end.present? && self.end == self.end.at_end_of_week
+      end
     end
 
     alias :full_weeks? :full_week?
 
     # Returns true when begin and end are in the same year
     def same_year?
-      !boundless? && self.begin.year == self.end.year
+      memoize(:@same_year) do
+        !boundless? && self.begin.year == self.end.year
+      end
+    end
+
+    def current?
+      memoize(:@current) do
+        cover?(Time.zone.today)
+      end
     end
 
+    alias :this_month? :current?
+    alias :this_quarter? :current?
+    alias :this_year? :current?
+
     # 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)
@@ -227,14 +269,16 @@ module ActiveDateRange
     #   DateRange.this_quarter.granularity  # => :quarter
     #   DateRange.this_year.granularity     # => :year
     def granularity
-      if one_year?
-        :year
-      elsif one_quarter?
-        :quarter
-      elsif one_month?
-        :month
-      elsif one_week?
-        :week
+      memoize(:@granularity) do
+        if one_year?
+          :year
+        elsif one_quarter?
+          :quarter
+        elsif one_month?
+          :month
+        elsif one_week?
+          :week
+        end
       end
     end
 
@@ -242,11 +286,13 @@ module ActiveDateRange
     # a range of 2021-01-01..2021-12-31 will return `this_year` when the current date
     # is somewhere in 2021.
     def relative_param
-      @relative_param ||= SHORTHANDS
-        .select { |key, _| key.end_with?(granularity.to_s) }
-        .find { |key, range| self == range.call }
-        &.first
-        &.to_s
+      memoize(:@relative_param) do
+        SHORTHANDS
+          .select { |key, _| key.end_with?(granularity.to_s) }
+          .find { |key, range| self == range.call }
+          &.first
+          &.to_s
+      end
     end
 
     # Returns a param representation of the date range. When `relative` is true,
@@ -353,6 +399,18 @@ module ActiveDateRange
       cover?(other)
     end
 
+    def stretch_to_end_of_month
+      return self if self.end.present? && self.end == self.end.at_end_of_month
+
+      side_to_stretch = boundless? ? self.begin : self.end
+
+      DateRange.new(self.begin, side_to_stretch.at_end_of_month)
+    end
+
+    def exceeds?(limit)
+      self.days > limit.in_days.ceil
+    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)
@@ -364,5 +422,13 @@ module ActiveDateRange
           .slice_before { |_, index| index % amount == 0 }
           .map { |group| group.map(&:first).inject(:+) }
       end
+
+      def memoize(name)
+        if instance_variable_defined?(name)
+          instance_variable_get(name)
+        else
+          instance_variable_set(name, yield)
+        end
+      end
   end
 end

data/lib/active_date_range/version.rb

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

metadata

@@ -1,113 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: active_date_range
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Edwin Vlieg
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 1980-01-02 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
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.33'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 description: ActiveDateRange provides a range of dates with a powerful API to manipulate
   and use date ranges in your software.
 email:
@@ -116,10 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/codeql.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -127,6 +127,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - active_date_range.gemspec
 - bin/console
 - bin/setup
@@ -140,12 +141,12 @@ files:
 - lib/active_date_range/locale/en.yml
 - lib/active_date_range/version.rb
 homepage: https://github.com/moneybird/active-date-range
-licenses: []
+licenses:
+- MIT
 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/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -153,15 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: DateRange for ActiveSupport
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4