fat_period 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2c6b600f446fa2bff8080b8056a32ceb3fda88be68c03db076591753c4992e
-  data.tar.gz: f4d65daa079f338c2a1a7ab5a0d326ae9af884d819a72077f1f24e8128ed70de
+  metadata.gz: 8592241a9f75949afa4df46469ff74029aa57ad67ac46234717aa751ba4cfef8
+  data.tar.gz: 26658db3f5a219236ae9bc9132cafa58850051fdf5d67c389c51306bcd4cd748
 SHA512:
-  metadata.gz: 3059659aed2c2000401a6fceca177b9b7ea633adaaa1012bcb20db1069845bdc7dff35b97a53289a498399d1bc2217ceffd06c4dae94377ce7a47710c71ab2af
-  data.tar.gz: ab0e1a8aebca6fc8acf0e952e9a48956767b03e7cd9071d6487b52e0a544519e6801b927ae3b2f5021e1fc3ac8aeb95114488192fcd343b265b235efc38a6784
+  metadata.gz: 48f7404be05db83ec57ceb7c2b4e75f584920422067bfc1600163cc58253db0ff3856201df4b6265145a5cbceee534e9d380b1ee44953fbb5fad0ffc772fa0df
+  data.tar.gz: 2ac2dcdb14642e774826f18b6ba7a5bd157fc067bc55495480b7ac91e7e95a21a30217725c4decf5e333e2b8b2cef581df72ee76afa5d18c459b510134c322b1

data/.simplecov

@@ -0,0 +1,18 @@
+# -*- mode: ruby -*-
+
+SimpleCov.start do
+  # any custom configs like groups and filters can be here at a central place
+  add_filter '/spec/'
+  add_filter '/tmp/'
+  add_group "Models", "lib/fat_period"
+  # add_group "Core Extension", "lib/ext"
+  # After this many seconds between runs, old coverage stats are thrown out,
+  # so 3600 => 1 hour
+  merge_timeout 3600
+  # Make this true to merge rspec and cucumber coverage together
+  use_merging false
+  command_name 'Rspec'
+  nocov_token 'no_cover'
+  # Branch coverage
+  enable_coverage :branch
+end

data/fat_period.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'debug', '>= 1.0.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-doc'
+  spec.add_development_dependency 'simplecov'
 
   spec.add_runtime_dependency 'fat_core', '>= 4.8.3'
 end

data/lib/fat_period/date.rb

@@ -20,6 +20,53 @@ module FatPeriod
       require 'fat_period'
       Period.new(beginning_of_chunk(chunk), end_of_chunk(chunk))
     end
+
+    # Return a period representing a chunk containing a given Date.
+    def day_containing
+      Period.new(self, self)
+    end
+
+    def week_containing
+      Period.new(self.beginning_of_week, self.end_of_week)
+    end
+
+    def biweek_containing
+      Period.new(self.beginning_of_biweek, self.end_of_biweek)
+    end
+
+    def semimonth_containing
+      Period.new(self.beginning_of_semimonth, self.end_of_semimonth)
+    end
+
+    def month_containing
+      Period.new(self.beginning_of_month, self.end_of_month)
+    end
+
+    def bimonth_containing
+      Period.new(self.beginning_of_bimonth, self.end_of_bimonth)
+    end
+
+    def quarter_containing
+      Period.new(self.beginning_of_quarter, self.end_of_quarter)
+    end
+
+    def half_containing
+      Period.new(self.beginning_of_half, self.end_of_half)
+    end
+
+    def year_containing
+      Period.new(self.beginning_of_year, self.end_of_year)
+    end
+
+    def chunk_containing(chunk)
+      raise ArgumentError, 'chunk is nil' unless chunk
+
+      chunk = chunk.to_sym
+      raise ArgumentError, "unknown chunk name: #{chunk}" unless CHUNKS.include?(chunk)
+
+      method = "#{chunk}_containing".to_sym
+      send(method, self)
+    end
   end
 end
 

data/lib/fat_period/period.rb

@@ -31,9 +31,7 @@ class Period
     @last = Date.ensure_date(last).freeze
     freeze
 
-    return unless @first > @last
-
-    raise ArgumentError, "Period's first date is later than its last date"
+    raise ArgumentError, "Period's first date is later than its last date" if @first > @last
   end
 
   # These need to come after initialize is defined
@@ -72,11 +70,13 @@ 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
 
+  private_constant :PHRASE_RE
+
   # Return an array of periods, either a single period as in `Period.parse`
   # from a String phrase in which a `from spec` is introduced with 'from' and,
   # optionally, a `to spec` is introduced with 'to', or a number of periods if
@@ -99,8 +99,7 @@ class Period
   #
   # @param phrase [String] with 'from <spec> to <spec> [per <chunk>]'
   # @return [Array<Period>] translated from phrase
-  def self.parse_phrase(phrase,
-                        partial_first: false, partial_last: false, round_up_last: false)
+  def self.parse_phrase(phrase, partial_first: false, partial_last: false, round_up_last: false)
     phrase = phrase.downcase.clean
     mm = phrase.match(PHRASE_RE)
     raise ArgumentError, "invalid period phrase: `#{phrase}`" unless mm
@@ -234,10 +233,15 @@ class Period
 
   # Yield each day in this Period.
   def each
-    d = first
-    while d <= last
-      yield d
-      d += 1.day
+    if block_given?
+      d = first
+      while d <= last
+        yield d
+        d += 1.day
+      end
+      self
+    else
+      to_enum(:each)
     end
   end
 
@@ -318,6 +322,8 @@ class Period
     half: (180..183), year: (365..366)
   }.freeze
 
+  private_constant :CHUNK_ORDER, :CHUNK_RANGE
+
   def self.chunk_cmp(chunk1, chunk2)
     CHUNK_ORDER[chunk1] <=> CHUNK_ORDER[chunk2]
   end

data/lib/fat_period/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_period
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2023-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 - !ruby/object:Gem::Dependency
   name: fat_core
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.3
-description:
+description: 
 email:
 - ded-law@ddoherty.net
 executables: []
@@ -117,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -132,7 +147,7 @@ files:
 homepage: https://github.com/ddoherty03/fat_period
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.4.14
+signing_key: 
 specification_version: 4
 summary: Implements a Period class as a Range of Dates.
 test_files: []