time_math2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e42b79bda1365a78f8c74b1b2d41af59f4c5c0
-  data.tar.gz: b2dcd6572c88be32bfbff1f9a3f15cda929551b9
+  metadata.gz: 30696230b69ae5862c132f959e9fbdf1d09e4b70
+  data.tar.gz: ad25e2782956da2d458dd2ee26fbcf2a896c6a23
 SHA512:
-  metadata.gz: 987ddc51e856db1f2f9baa77d68beb189b7a2f6193a82d5839cf11b3e4b9f989d8fe676d4539087a60bbda75e4779f90a7c8d0b706a5d2cef1c85123c8fd9f6b
-  data.tar.gz: 0d5a36c6e120c1244ae40a768b13f499455e855890a46013674464e9d6939b7797ef14aed268a05491e29e98be4249467bb112d5b29381611606be7346f4632e
+  metadata.gz: 1950a184a7fb2cdf739ef3ac750744c651cafc17bc052f88f9f3a339f749aa7236e29257fee11be21c71f50859d1185073cd2f5c5e3ecdfd45247645616a2410
+  data.tar.gz: 120cd89814db9cee542846bc4eb86372f01bf5942cd54b714cd772c0273eed58fcaeaf5791d27bc5c444169de69e704fe669225954cd7d61508dec3e9b047696

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # TimeMath Changelog
 
+# 0.1.1 (2019-03-15)
+
+* Ruby 2.6 compatibility, thanks @flash-gordon.
+
 # 0.1.0 (2017-07-30)
 
 * Update sequences logic to be, well... More logical (Thanks @kenn again for meaningful discussion!);

data/README.md

@@ -73,7 +73,7 @@ $ gem install time_math2
 or add to your Gemfile
 
 ```ruby
-gem 'time_math2'
+gem 'time_math2', require: 'time_math'
 ```
 
 and `bundle install` it.

data/lib/time_math.rb

@@ -19,7 +19,6 @@ require 'time'
 # See also `TimeMath()` method in global namespace, it is lot of fun!
 #
 module TimeMath
-  require_relative './time_math/backports'
   require_relative './time_math/units'
   require_relative './time_math/op'
   require_relative './time_math/sequence'
@@ -127,12 +126,12 @@ end
 # ```
 #
 # See also {TimeMath::Op} for list of operations available, but basically
-# they are all same you can call on {TimeMath::Unit}, just pass unit symbol
+# they are all same you can call on {TimeMath::Units::Base}, just pass unit symbol
 # as a first argument.
 #
 # @param arguments time-y value, or list of them, or nothing
 #
 # @return [TimeMath::Op]
-def TimeMath(*arguments) # rubocop:disable Style/MethodName
+def TimeMath(*arguments) # rubocop:disable Naming/MethodName
   TimeMath::Op.new(*arguments)
 end

data/lib/time_math/measure.rb

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

data/lib/time_math/op.rb

@@ -197,6 +197,7 @@ module TimeMath
 
     def inspect_args
       return ' ' if @arguments.empty?
+
       '(' + [*@arguments].map(&:inspect).join(', ') + ').'
     end
 

data/lib/time_math/resamplers.rb

@@ -31,6 +31,7 @@ module TimeMath
   class ArrayResampler < Resampler
     def self.try(unit, array)
       return nil unless array.is_a?(Array) && array.all?(&Util.method(:timey?))
+
       new(unit, array)
     end
 
@@ -53,7 +54,8 @@ module TimeMath
   # @private
   class HashResampler < Resampler
     def self.try(unit, hash)
-      return nil unless hash.is_a?(Hash) && hash.keys.all?(&Util.method(:timey?))
+      return unless hash.is_a?(Hash) && hash.keys.all?(&Util.method(:timey?))
+
       new(unit, hash)
     end
 

data/lib/time_math/units/base.rb

@@ -138,6 +138,7 @@ module TimeMath
       #   of origin would be preserved.
       def advance(tm, amount = 1)
         return decrease(tm, -amount) if amount < 0
+
         _advance(tm, amount)
       end
 
@@ -151,6 +152,7 @@ module TimeMath
       #   of origin would be preserved.
       def decrease(tm, amount = 1)
         return advance(tm, -amount) if amount < 0
+
         _decrease(tm, amount)
       end
 

data/lib/time_math/units/month.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module TimeMath
   module Units
     # @private

data/lib/time_math/units/simple.rb

@@ -9,7 +9,7 @@ module TimeMath
       protected
 
       def _measure(from, to)
-        ((to.to_time - from.to_time) / to_seconds).to_i
+        to.to_time.-(from.to_time)./(to_seconds).to_i
       end
 
       def _advance(tm, steps)

data/lib/time_math/util.rb

@@ -8,10 +8,10 @@ module TimeMath
     module_function
 
     def timey?(val)
-      [Time, DateTime, Date].any? { |cls| val.is_a?(cls) }
+      [Time, DateTime, Date].include?(val.class)
     end
 
-    def merge(tm, attrs = {})
+    def merge(tm, **attrs)
       hash_to_tm(tm, tm_to_hash(tm).merge(attrs))
     end
 
@@ -56,6 +56,7 @@ module TimeMath
 
     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
@@ -65,17 +66,24 @@ module TimeMath
       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)
+        subsec(tm)
       when *COMMON_UNITS
         tm.send(component)
       end
     end
+
+    def subsec(tm)
+      case tm
+      when Time
+        tm.subsec
+      when Date
+        0
+      when DateTime
+        tm.send(:sec_fraction)
+      end
+    end
   end
 end

data/lib/time_math/version.rb

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

data/time_math2.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
   end
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rubocop', '>= 0.30'
+  s.add_development_dependency 'rubocop', '~> 0.65.0'
   s.add_development_dependency 'rspec', '>= 3'
-  s.add_development_dependency 'rubocop-rspec'
+  s.add_development_dependency 'rubocop-rspec', '>= 1.17.1'
   s.add_development_dependency 'rspec-its', '~> 1'
   s.add_development_dependency 'simplecov', '~> 0.9'
   s.add_development_dependency 'rake'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: time_math2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,6 @@ files:
 - LICENSE.txt
 - README.md
 - lib/time_math.rb
-- lib/time_math/backports.rb
 - lib/time_math/measure.rb
 - lib/time_math/op.rb
 - lib/time_math/resamplers.rb
@@ -173,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Easy time math

data/lib/time_math/backports.rb

@@ -1,8 +0,0 @@
-# @private
-class Array
-  if RUBY_VERSION < '2.1'
-    def to_h
-      Hash[*flatten(1)]
-    end
-  end
-end