fat_period 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8592241a9f75949afa4df46469ff74029aa57ad67ac46234717aa751ba4cfef8
-  data.tar.gz: 26658db3f5a219236ae9bc9132cafa58850051fdf5d67c389c51306bcd4cd748
+  metadata.gz: fe15db09e24f9ddf7264fdf8862ea51bacb0fb88da8b21727c44ce0c0a4f930c
+  data.tar.gz: 0ea19cc89dfa940268938ccf2d8f3abd949e2c1a405d158410c0f928c8c6d64a
 SHA512:
-  metadata.gz: 48f7404be05db83ec57ceb7c2b4e75f584920422067bfc1600163cc58253db0ff3856201df4b6265145a5cbceee534e9d380b1ee44953fbb5fad0ffc772fa0df
-  data.tar.gz: 2ac2dcdb14642e774826f18b6ba7a5bd157fc067bc55495480b7ac91e7e95a21a30217725c4decf5e333e2b8b2cef581df72ee76afa5d18c459b510134c322b1
+  metadata.gz: e4270dcbd82522aeb3781205e4598b52f15cc2c3b352709b500ffb6db6cd80a5691416d3a3abed2cf132fc0de8d5b05a14e934d14100c984293893cc4b3de378
+  data.tar.gz: 82458a341811b97e30393360fc81b02acad7d4b8446ce616b7c84d237e11ec037fa85790d241c02c9874924733ac0895fd648f7b0ec3d83f8de04ccd9eaf1372

data/.envrc

@@ -0,0 +1 @@
+PATH_add .bundle/bin

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/fat_period.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'fat_period'
   spec.version       = FatPeriod::VERSION
   spec.authors       = ['Daniel E. Doherty']
-  spec.email         = ['ded-law@ddoherty.net']
+  spec.email         = ['ded@ddoherty.net']
 
   spec.summary       = %q{Implements a Period class as a Range of Dates.}
   spec.homepage      = 'https://github.com/ddoherty03/fat_period'
@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-doc'
   spec.add_development_dependency 'simplecov'
 
-  spec.add_runtime_dependency 'fat_core', '>= 4.8.3'
+  spec.add_runtime_dependency 'fat_core', '>= 5.1.0'
 end

data/lib/fat_period/period.rb

@@ -27,8 +27,8 @@ class Period
   # @raise [ArgumentError] if first date is later than last date
   # @return [Period]
   def initialize(first, last)
-    @first = Date.ensure_date(first).freeze
-    @last = Date.ensure_date(last).freeze
+    @first = Date.ensure(first).freeze
+    @last = Date.ensure(last).freeze
     freeze
 
     raise ArgumentError, "Period's first date is later than its last date" if @first > @last
@@ -70,7 +70,7 @@ class Period
 
   PHRASE_RE = %r{\A
       # One or both of from and to parts
-      (((from)?\s+(?<from_part>[-_a-z0-9]+)\s*)?
+      (((from)?\s*(?<from_part>[-_a-z0-9]+)\s*)?
       (to\s+(?<to_part>[-_a-z0-9]+))?)
       # Wholly optional chunk part
       (\s+per\s+(?<chunk_part>\w+))?\z}xi
@@ -166,6 +166,31 @@ class Period
     end
   end
 
+  # Convert a string or Period into a Period object, if the string is parsable
+  # as a period.
+  #
+  # @example
+  #   Period.ensure('2023-1q') #=> Period 2023-01-01..2023-03-31
+  #   pd = Period.new('2016-01-01', '2016-12-31')
+  #   Period.ensure(pd) #=> pd  # No effect
+  #
+  # @return [Period] either parsed String or same Period
+  def self.ensure(pd)
+    case pd
+    when Period
+      pd
+    when String
+      if pd.match?(/\s*from/i)
+        # Ignore any chunk modifier, 'per'
+        Period.parse_phrase(pd).first
+      else
+        Period.parse(pd)
+      end
+    else
+      raise UserError, "can't ensure `#{pd}` of #{pd.class} is a Period"
+    end
+  end
+
   # A concise way to print out Periods for inspection as
   # 'Period(YYYY-MM-DD..YYYY-MM-DD)'.
   #
@@ -371,7 +396,7 @@ class Period
     chunk = chunk.to_sym
     raise ArgumentError, "unknown chunk name: #{chunk}" unless CHUNKS.include?(chunk)
 
-    date = Date.ensure_date(date)
+    date = Date.ensure(date)
     method = "#{chunk}_containing".to_sym
     send(method, date)
   end

data/lib/fat_period/version.rb

@@ -1,3 +1,3 @@
 module FatPeriod
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_period
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,23 +114,25 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.3
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.3
-description: 
+        version: 5.1.0
+description:
 email:
-- ded-law@ddoherty.net
+- ded@ddoherty.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -147,7 +149,7 @@ files:
 homepage: https://github.com/ddoherty03/fat_period
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
-signing_key: 
+rubygems_version: 3.5.18
+signing_key:
 specification_version: 4
 summary: Implements a Period class as a Range of Dates.
 test_files: []