time_math2 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c60a385907020504aa0f3ce73225dedc52fc429
-  data.tar.gz: b97719ea5945a91030ed88917d28befe8345222a
+  metadata.gz: 35d2a3523dac20994a38d19862500ce1eae98854
+  data.tar.gz: 82b7664f95fb1879a4911886cd257c41282f9327
 SHA512:
-  metadata.gz: aa251f08c7a3139d1e77e0097c0404e79504a518d3496ead43422a98b552112cb6bde42dd837a8d0df2004c56dc5f9861d68bcc0f20a44f98c59bf4b5fffb714
-  data.tar.gz: 15073277e6847a7112f61d90ffc1c6922dc1566e5da450c19abcf4509978206a5e5266f6098d8949d77341ff65f186d61d2d71b5f6f5aa1ad31913989560d232
+  metadata.gz: 99dc9701481d961e93e9d803e4b943ce390bd03e55e8b23a779456094051d1fce129c5bb2a3900cf7f1d8c64f20be684839e2f1f80234c6a6c79912e78eb7954
+  data.tar.gz: 22dcc1315f78bd1d323ae9faed9b5e8ef6b39267ddd65b7c3be40cfe33b4f4ec217c79eecfc89c49c14b37ce60c92497ac49d5b5fa7b5d69a6afbd947687da8b

data/.rubocop_todo.yml

@@ -0,0 +1,9 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-06-28 17:58:01 +0300 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 13

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # TimeMath Changelog
 
+# 0.0.8 (2017-06-02)
+
+* Fix `Units::Base#measure` to correctly measure negative distances (e.g. from > to, thanks @kenn for
+  pointing it);
+* Cleanup the same method to work correctly with sub-second precisions and different Time-y types.
+* Drop Ruby 2.0 support, finally.
+
 # 0.0.7 (2017-05-31)
 
 * Fix month advancing/decreasing. Thanks @dikond for pointing to problem!

data/lib/time_math/units/base.rb

@@ -195,9 +195,9 @@ module TimeMath
       #
       # @return [Integer] how many full units are inside the period.
       # :nocov:
-      def measure(from, to) # rubocop:disable Lint/UnusedMethodArgument
-        raise NotImplementedError,
-              '#measure should be implemented in subclasses'
+      def measure(from, to)
+        from, to = from.to_time, to.to_time unless from.class == to.class
+        from <= to ? _measure(from, to) : -_measure(to, from)
       end
       # :nocov:
 

data/lib/time_math/units/month.rb

@@ -8,15 +8,15 @@ module TimeMath
         super(:month)
       end
 
-      def measure(from, to)
+      protected
+
+      def _measure(from, to)
         ydiff = to.year - from.year
         mdiff = to.month - from.month
 
         to.day >= from.day ? (ydiff * 12 + mdiff) : (ydiff * 12 + mdiff - 1)
       end
 
-      protected
-
       def _advance(tm, steps)
         target = tm.month + steps.to_i
         m = (target - 1) % 12 + 1

data/lib/time_math/units/simple.rb

@@ -6,12 +6,12 @@ module TimeMath
         sz * MULTIPLIERS[index..-1].inject(:*)
       end
 
-      def measure(from, to)
+      protected
+
+      def _measure(from, to)
         ((to.to_time - from.to_time) / to_seconds).to_i
       end
 
-      protected
-
       def _advance(tm, steps)
         _shift(tm, to_seconds(steps))
       end

data/lib/time_math/units/year.rb

@@ -6,16 +6,16 @@ module TimeMath
         super(:year)
       end
 
-      def measure(from, to)
-        if Util.merge(from, year: to.year) < to
+      protected
+
+      def _measure(from, to)
+        if Util.merge(from, year: to.year) <= to
           to.year - from.year
         else
           to.year - from.year - 1
         end
       end
 
-      protected
-
       def _advance(tm, steps)
         Util.merge(tm, year: tm.year + steps.to_i)
       end

data/lib/time_math/util.rb

@@ -1,8 +1,8 @@
 module TimeMath
   # @private
   module Util
-    # all except :week
-    NATURAL_UNITS = %i[year month day hour min sec].freeze
+    COMMON_UNITS = %i[year month day hour min sec].freeze
+    NATURAL_UNITS = [*COMMON_UNITS, :subsec].freeze
     EMPTY_VALUES = [nil, 1, 1, 0, 0, 0].freeze
 
     module_function
@@ -43,11 +43,12 @@ module TimeMath
     end
 
     def tm_to_hash(tm)
-      Hash[*NATURAL_UNITS.flat_map { |s| [s, tm.send(s)] }]
+      NATURAL_UNITS.map { |s| [s, extract_component(tm, s)] }.to_h
     end
 
     def hash_to_tm(origin, hash)
-      components = NATURAL_UNITS.map { |s| hash[s] || 0 }
+      components = NATURAL_UNITS[0..-2].map { |s| hash[s] || 0 }
+      components[-1] += (hash[:subsec] || hash[:sec_fraction] || 0)
       array_to_tm(origin, *components)
     end
 
@@ -63,5 +64,18 @@ module TimeMath
         end
       components[2] = [components[2], days_in_month].min
     end
+
+    private
+
+    module_function
+
+    def extract_component(tm, component)
+      case component
+      when :subsec, :sec_fraction
+        tm.is_a?(Time) ? tm.subsec : tm.send(:sec_fraction)
+      when *COMMON_UNITS
+        tm.send(component)
+      end
+    end
   end
 end

data/lib/time_math/version.rb

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

data/time_math2.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rubocop', '>= 0.30'
   s.add_development_dependency 'rspec', '>= 3'
+  s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'rspec-its', '~> 1'
   s.add_development_dependency 'simplecov', '~> 0.9'
   s.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_math2
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  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: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - LICENSE.txt