fat_period 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2fde65d6d14d1a0c94d09b2097528ef2f23826388b1f3291ac7e7d0b3312af
-  data.tar.gz: c14e872d1fb6abf9015a4acf3a3b5c21c23afe28e05f8f15ba7df6db921751d2
+  metadata.gz: 51ac3735bac6324561fcbab7045abba1faf5af75617b92fabe0f9b063824c7a8
+  data.tar.gz: f5e8fd4a93c5fb2f4aa878bb8e18a9d19e2142ce9505845be9500d6a0bb809b1
 SHA512:
-  metadata.gz: 23ab6b2bc98abfc6d7609df56f93b7acf8683d29fdd13a54c7377b321ffc0a29d29c5498c327054ef5c970c5650b129757fca7a0b71db4132c4d5328a9b31c24
-  data.tar.gz: d266e75e1c4caaecbd14952cad1ffbc6cea36e65c6d6b5264b353edc7c3b5604aa04709489c5f3ffa058f3d0d9a236ce1ca2d228283e907092166c19351ddc72
+  metadata.gz: 62aa2512063f7065e799b39c5ab96e110c648bfc0468e918e49f764b2d44d9d0950b52ad6c50c1780997a04f6d61295769e2732b64508e7605c5f2bcd3b49caa
+  data.tar.gz: ea600908598015344f193cd8679e37960be484dd60bd7d3d57e121d857a98bb27541421e3e439e1dd204c936e2799b79397f44e8c65e4361fbe2b9f509363fa3

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'
+  spec.add_runtime_dependency 'fat_core', '>= 4.8.1'
 end

data/lib/fat_period/period.rb

@@ -29,37 +29,9 @@ class Period
   # @raise [ArgumentError] if first date is later than last date
   # @return [Period]
   def initialize(first, last)
-    if first.is_a?(Date)
-      @first = first
-    elsif first.respond_to?(:to_s)
-      begin
-        @first = Date.parse(first.to_s)
-      rescue ArgumentError => e
-        if e.message =~ /invalid date/
-          raise ArgumentError, "invalid date '#{first}'"
-        end
-
-        raise
-      end
-    else
-      raise ArgumentError, 'use Date or String to initialize Period'
-    end
-
-    if last.is_a?(Date)
-      @last = last
-    elsif last.respond_to?(:to_s)
-      begin
-        @last = Date.parse(last.to_s)
-      rescue ArgumentError => e
-        if e.message =~ /invalid date/
-          raise ArgumentError, "you gave an invalid date '#{last}'"
-        end
+    @first = Date.ensure_date(first)
+    @last = Date.ensure_date(last)
 
-        raise
-      end
-    else
-      raise ArgumentError, 'use Date or String to initialize Period'
-    end
     return unless @first > @last
 
     raise ArgumentError, "Period's first date is later than its last date"
@@ -583,74 +555,43 @@ class Period
       raise ArgumentError, "unknown chunk size '#{size}'"
     end
 
-    if CHUNK_RANGE[size].first > length
-      return [self] if partial_first || partial_last
-
-      msg = "any #{size} is longer than this period's #{length} days"
-      raise ArgumentError, msg
-    end
-
     result = []
     chunk_start = first.dup
-    while chunk_start <= last
-      case size
-      when :year
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_year?
-        end
-        chunk_end = chunk_start.end_of_year
-      when :half
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_half?
-        end
-        chunk_end = chunk_start.end_of_half
-      when :quarter
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_quarter?
-        end
-        chunk_end = chunk_start.end_of_quarter
-      when :bimonth
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_bimonth?
-        end
-        chunk_end = (chunk_start.end_of_month + 1.day).end_of_month
-      when :month
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_month?
-        end
-        chunk_end = chunk_start.end_of_month
-      when :semimonth
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_semimonth?
-        end
-        chunk_end = chunk_start.end_of_semimonth
-      when :biweek
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_biweek?
-        end
-        chunk_end = chunk_start.end_of_biweek
-      when :week
-        unless partial_first
-          chunk_start += 1.day until chunk_start.beginning_of_week?
-        end
-        chunk_end = chunk_start.end_of_week
-      when :day
-        chunk_end = chunk_start
-      else
-        raise ArgumentError, "invalid chunk size '#{size}'"
-      end
-      if chunk_end <= last
-        result << Period.new(chunk_start, chunk_end)
-      elsif round_up_last
+    chunk_end = chunk_start.end_of_chunk(size)
+    if chunk_start.beginning_of_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)
+    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)
+    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)
+    end
+    # Possibly append the final chunk to result
+    if chunk_start < last
+      if round_up_last
         result << Period.new(chunk_start, chunk_end)
       elsif partial_last
         result << Period.new(chunk_start, last)
       else
-        break
+        result
       end
-      chunk_start = result.last.last + 1.day
+    elsif partial_last
+      # Catch the case where the period is too small to make a whole chunk and
+      # partial_first is false, so it did not get included as the initial
+      # partial chunk, yet a partial_last is allowed, so include the whole
+      # period as a partial chunk.
+      result << Period.new(first, last)
+    else
+      result
     end
-    result
   end
 
   # @group Set operations

data/lib/fat_period/version.rb

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

metadata

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