time_math2 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51045d4f122c5237a82ef69caa42a16680a61e53
-  data.tar.gz: 3efbc480f4aa87b64b07219746f647101b706372
+  metadata.gz: 8c60a385907020504aa0f3ce73225dedc52fc429
+  data.tar.gz: b97719ea5945a91030ed88917d28befe8345222a
 SHA512:
-  metadata.gz: 3a607d28b91d01cb76d1764564cd7e4cb04a57f994ed4931402b1d6625348ce4042e75fb60c9dd9043f0b5bda5a2b81a15149c9d6668d68be7ed97724d136acc
-  data.tar.gz: e6f66d0e085b1dd0ac4bb1fc57e94dd949a403a6f09a6242da4444285af99eefd158f0229a03d26e3b31714b208c65dfc11e59ee1a89d46012dbdad03fa9c9d3
+  metadata.gz: aa251f08c7a3139d1e77e0097c0404e79504a518d3496ead43422a98b552112cb6bde42dd837a8d0df2004c56dc5f9861d68bcc0f20a44f98c59bf4b5fffb714
+  data.tar.gz: 15073277e6847a7112f61d90ffc1c6922dc1566e5da450c19abcf4509978206a5e5266f6098d8949d77341ff65f186d61d2d71b5f6f5aa1ad31913989560d232

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # TimeMath Changelog
 
+# 0.0.7 (2017-05-31)
+
+* Fix month advancing/decreasing. Thanks @dikond for pointing to problem!
+
 # 0.0.6 (2016-12-14)
 
 * Fix approach to timezone info preservation (previously, it was clear bug, emerging from

data/lib/time_math/measure.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module TimeMath
   # @private
   module Measure

data/lib/time_math/op.rb

@@ -33,7 +33,7 @@ module TimeMath
   # Note that Op also plays well with {Sequence} (see its docs for more).
   class Op
     # @private
-    OPERATIONS = [:floor, :ceil, :round, :next, :prev, :advance, :decrease].freeze
+    OPERATIONS = %i[floor ceil round next prev advance decrease].freeze
 
     attr_reader :operations, :arguments
 

data/lib/time_math/units/month.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module TimeMath
   module Units
     # @private
@@ -16,32 +17,15 @@ module TimeMath
 
       protected
 
-      def _succ(tm)
-        return Util.merge(tm, year: tm.year + 1, month: 1) if tm.month == 12
-
-        t = Util.merge(tm, month: tm.month + 1)
-        fix_month(t, t.month + 1)
-      end
-
-      def _prev(tm)
-        return Util.merge(tm, year: tm.year - 1, month: 12) if tm.month == 1
-
-        t = Util.merge(tm, month: tm.month - 1)
-        fix_month(t, t.month - 1)
-      end
-
       def _advance(tm, steps)
-        steps.to_i.times.inject(tm) { |t| _succ(t) }
+        target = tm.month + steps.to_i
+        m = (target - 1) % 12 + 1
+        dy = (target - 1) / 12
+        Util.merge(tm, year: tm.year + dy, month: m)
       end
 
       def _decrease(tm, steps)
-        steps.to_i.times.inject(tm) { |t| _prev(t) }
-      end
-
-      # fix for too far advance/insufficient decrease:
-      #  Time.new(2013,2,31) #=> 2013-03-02 00:00:00 +0200
-      def fix_month(t, expected)
-        t.month == expected ? day.decrease(t, t.day) : t
+        _advance(tm, -steps)
       end
     end
   end

data/lib/time_math/util.rb

@@ -2,7 +2,7 @@ module TimeMath
   # @private
   module Util
     # all except :week
-    NATURAL_UNITS = [:year, :month, :day, :hour, :min, :sec].freeze
+    NATURAL_UNITS = %i[year month day hour min sec].freeze
     EMPTY_VALUES = [nil, 1, 1, 0, 0, 0].freeze
 
     module_function
@@ -17,6 +17,7 @@ module TimeMath
 
     def array_to_tm(origin, *components)
       components = EMPTY_VALUES.zip(components).map { |d, c| c || d }
+      fix_month_day(components)
 
       case origin
       when Time
@@ -49,5 +50,18 @@ module TimeMath
       components = NATURAL_UNITS.map { |s| hash[s] || 0 }
       array_to_tm(origin, *components)
     end
+
+    DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31].freeze
+
+    def fix_month_day(components)
+      return if components[2].nil? || components[1].nil?
+      days_in_month =
+        if components[1] == 2 && components[0] && Date.gregorian_leap?(components[0])
+          29
+        else
+          DAYS_IN_MONTH[components[1]]
+        end
+      components[2] = [components[2], days_in_month].min
+    end
   end
 end

data/lib/time_math/version.rb

@@ -1,4 +1,4 @@
 module TimeMath
   # @private
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_math2
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Easy time math