fat_period 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ac3735bac6324561fcbab7045abba1faf5af75617b92fabe0f9b063824c7a8
-  data.tar.gz: f5e8fd4a93c5fb2f4aa878bb8e18a9d19e2142ce9505845be9500d6a0bb809b1
+  metadata.gz: 05402b5173907362901a6890276937450921c418596ebe53e7d3576bcebd3d7b
+  data.tar.gz: 4d78c11cb533cb6f45f8e6cd941887c8cc2f1645c4db5052ad543627228c3e73
 SHA512:
-  metadata.gz: 62aa2512063f7065e799b39c5ab96e110c648bfc0468e918e49f764b2d44d9d0950b52ad6c50c1780997a04f6d61295769e2732b64508e7605c5f2bcd3b49caa
-  data.tar.gz: ea600908598015344f193cd8679e37960be484dd60bd7d3d57e121d857a98bb27541421e3e439e1dd204c936e2799b79397f44e8c65e4361fbe2b9f509363fa3
+  metadata.gz: 5fcb751568bcf4c7f33ee03f4a60c55bbbf04def94475069383ed31400fc62dc8c46d70affa60374b0cace8016b1f60655275127a6cbbed36479f7cc86972879
+  data.tar.gz: 8b5120f531483283c834531b7b3a8ddfbc0e7f816087cbcaa50338c74a06990aa6bce5d619ac0331976e05608b645406d6ca6723a3cfec8bc936f2584a4ccc40

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.4
   - 2.5
   - 2.6
   - 2.7

data/fat_period.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-doc'
   spec.add_development_dependency 'pry-byebug'
 
-  spec.add_runtime_dependency 'fat_core', '>= 4.8.1'
+  spec.add_runtime_dependency 'fat_core', '>= 4.8.3'
 end

data/lib/fat_period/period.rb

@@ -269,6 +269,12 @@ class Period
   CHUNKS = %i[day week biweek semimonth month bimonth quarter
               half year irregular].freeze
 
+  CHUNK_ORDER = {}
+  CHUNKS.each_with_index do |c, i|
+    CHUNK_ORDER[c] = i
+  end
+  CHUNK_ORDER.freeze
+
   # An Array of Ranges for the number of days that can be covered by each chunk.
   CHUNK_RANGE = {
     day: (1..1), week: (7..7), biweek: (14..14), semimonth: (15..16),
@@ -276,6 +282,10 @@ class Period
     half: (180..183), year: (365..366)
   }.freeze
 
+  def self.chunk_cmp(chunk1, chunk2)
+    CHUNK_ORDER[chunk1] <=> CHUNK_ORDER[chunk2]
+  end
+
   # Return a period representing a chunk containing a given Date.
   def self.day_containing(date)
     Period.new(date, date)
@@ -313,6 +323,19 @@ class Period
     Period.new(date.beginning_of_year, date.end_of_year)
   end
 
+  def self.chunk_containing(date, chunk)
+    raise ArgumentError, 'chunk is nil' unless chunk
+
+    chunk = chunk.to_sym
+    unless CHUNKS.include?(chunk)
+      raise ArgumentError, "unknown chunk name: #{chunk}"
+    end
+
+    date = Date.ensure_date(date)
+    method = "#{chunk}_containing".to_sym
+    send(method, date)
+  end
+
   # Return a Period representing a chunk containing today.
   def self.this_day
     day_containing(Date.current)
@@ -550,29 +573,48 @@ class Period
   # @return [Array<Period>] periods that subdivide self into chunks of size, `size`
   def chunks(size: :month, partial_first: false, partial_last: false,
              round_up_last: false)
-    size = size.to_sym
-    unless CHUNKS.include?(size)
-      raise ArgumentError, "unknown chunk size '#{size}'"
+    chunk_size = size.to_sym
+    unless CHUNKS.include?(chunk_size)
+      raise ArgumentError, "unknown chunk size '#{chunk_size}'"
     end
 
+    containing_period = Period.chunk_containing(first, chunk_size)
+    return [dup] if self == containing_period
+
+    # Period too small for even a single chunk and is wholly-contained by a
+    # single chunk.
     result = []
+    if proper_subset_of?(containing_period)
+      result =
+        if partial_first || partial_last
+          if round_up_last
+            [containing_period]
+          else
+            [dup]
+          end
+        else
+          []
+        end
+      return result
+    end
+
     chunk_start = first.dup
-    chunk_end = chunk_start.end_of_chunk(size)
-    if chunk_start.beginning_of_chunk?(size) || partial_first
+    chunk_end = chunk_start.end_of_chunk(chunk_size)
+    if chunk_start.beginning_of_chunk?(chunk_size) || partial_first
       # Keep the first chunk if it's whole or partials allowed
       result << Period.new(chunk_start, chunk_end)
       chunk_start = chunk_end + 1.day
-      chunk_end = chunk_start.end_of_chunk(size)
+      chunk_end = chunk_start.end_of_chunk(chunk_size)
     else
       # Discard the partial first or move to next whole chunk
       chunk_start = chunk_end + 1.day
-      chunk_end = chunk_start.end_of_chunk(size)
+      chunk_end = chunk_start.end_of_chunk(chunk_size)
     end
     # Add Whole chunks
     while chunk_end <= last
       result << Period.new(chunk_start, chunk_end)
       chunk_start = chunk_end + 1.day
-      chunk_end = chunk_start.end_of_chunk(size)
+      chunk_end = chunk_start.end_of_chunk(chunk_size)
     end
     # Possibly append the final chunk to result
     if chunk_start < last

data/lib/fat_period/version.rb

@@ -1,3 +1,3 @@
 module FatPeriod
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_period
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 4.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 4.8.3
 description: 
 email:
 - ded-law@ddoherty.net