time_math2 0.0.4 → 0.0.5

data/lib/time_math/units/day.rb

@@ -21,9 +21,9 @@ module TimeMath
         return res unless res.is_a?(Time)
 
         if res.dst? && !src.dst?
-          hour.decrease(res)
+          TimeMath.hour.decrease(res)
         elsif !res.dst? && src.dst?
-          hour.advance(res)
+          TimeMath.hour.advance(res)
         else
           res
         end

data/lib/time_math/units/month.rb

@@ -16,14 +16,14 @@ module TimeMath
 
       protected
 
-      def succ(tm)
+      def _succ(tm)
         return generate(tm, year: tm.year + 1, month: 1) if tm.month == 12
 
         t = generate(tm, month: tm.month + 1)
         fix_month(t, t.month + 1)
       end
 
-      def prev(tm)
+      def _prev(tm)
         return generate(tm, year: tm.year - 1, month: 12) if tm.month == 1
 
         t = generate(tm, month: tm.month - 1)
@@ -31,11 +31,11 @@ module TimeMath
       end
 
       def _advance(tm, steps)
-        steps.times.inject(tm) { |t| succ(t) }
+        steps.to_i.times.inject(tm) { |t| _succ(t) }
       end
 
       def _decrease(tm, steps)
-        steps.times.inject(tm) { |t| prev(t) }
+        steps.to_i.times.inject(tm) { |t| _prev(t) }
       end
 
       # fix for too far advance/insufficient decrease:

data/lib/time_math/units/simple.rb

@@ -24,7 +24,7 @@ module TimeMath
         case tm
         when Time
           tm + seconds
-        when DateTime
+        when Date
           tm + Rational(seconds, 86_400)
         else
           raise ArgumentError, "Expected Time or DateTime, got #{tm.class}"

data/lib/time_math/units/week.rb

@@ -6,24 +6,27 @@ module TimeMath
         super(:week)
       end
 
-      def floor(tm)
-        f = day.floor(tm)
+      def floor(tm, span = 1)
+        span == 1 or
+          raise NotImplementedError, 'For now, week only can floor to one'
+
+        f = TimeMath.day.floor(tm)
         extra_days = tm.wday == 0 ? 6 : tm.wday - 1
-        day.decrease(f, extra_days)
+        TimeMath.day.decrease(f, extra_days)
       end
 
       def to_seconds(sz = 1)
-        day.to_seconds(sz * 7)
+        TimeMath.day.to_seconds(sz * 7)
       end
 
       protected
 
       def _advance(tm, steps)
-        day.advance(tm, steps * 7)
+        TimeMath.day.advance(tm, steps * 7)
       end
 
       def _decrease(tm, steps)
-        day.decrease(tm, steps * 7)
+        TimeMath.day.decrease(tm, steps * 7)
       end
     end
   end

data/lib/time_math/units/year.rb

@@ -17,11 +17,11 @@ module TimeMath
       protected
 
       def _advance(tm, steps)
-        generate(tm, year: tm.year + steps)
+        generate(tm, year: tm.year + steps.to_i)
       end
 
       def _decrease(tm, steps)
-        generate(tm, year: tm.year - steps)
+        generate(tm, year: tm.year - steps.to_i)
       end
     end
   end

data/lib/time_math/util.rb

@@ -0,0 +1,10 @@
+module TimeMath
+  # @private
+  module Util
+    module_function
+
+    def timey?(val)
+      [Time, DateTime, Date].any? { |cls| val.is_a?(cls) }
+    end
+  end
+end

data/lib/time_math/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_math2
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -123,10 +123,11 @@ files:
 - LICENSE.txt
 - README.md
 - lib/time_math.rb
-- lib/time_math/core_ext.rb
+- lib/time_math/backports.rb
 - lib/time_math/measure.rb
+- lib/time_math/op.rb
+- lib/time_math/resamplers.rb
 - lib/time_math/sequence.rb
-- lib/time_math/span.rb
 - lib/time_math/units.rb
 - lib/time_math/units/base.rb
 - lib/time_math/units/day.rb
@@ -134,6 +135,7 @@ files:
 - lib/time_math/units/simple.rb
 - lib/time_math/units/week.rb
 - lib/time_math/units/year.rb
+- lib/time_math/util.rb
 - lib/time_math/version.rb
 - time_math2.gemspec
 homepage: https://github.com/zverok/time_math2

data/lib/time_math/core_ext.rb

@@ -1,52 +0,0 @@
-module TimeMath
-  # This module is included into `Time` and `DateTime`. It is optional
-  # and only included by explicit `require "time_math/core_ext"`.
-  module CoreExt
-    # @!method floor_to(unit)
-    #   Shortcut to {Units::Base#floor}
-    # @!method ceil_to(unit)
-    #   Shortcut to {Units::Base#ceil}
-    # @!method round_to(unit)
-    #   Shortcut to {Units::Base#round}
-    # @!method next_to(unit)
-    #   Shortcut to {Units::Base#next}
-    # @!method prev_to(unit)
-    #   Shortcut to {Units::Base#prev}
-    [:floor, :ceil, :round, :next, :prev].each do |sym|
-      define_method("#{sym}_to") { |unit| TimeMath[unit].send(sym, self) }
-    end
-
-    # Shortcut to {Units::Base#round?}
-    def round_to?(unit)
-      TimeMath[unit].round?(self)
-    end
-
-    # Shortcut to {Units::Base#advance}
-    def advance_by(unit, amount = 1)
-      TimeMath[unit].advance(self, amount)
-    end
-
-    # Shortcut to {Units::Base#decrease}
-    def decrease_by(unit, amount = 1)
-      TimeMath[unit].decrease(self, amount)
-    end
-
-    # Shortcut to {Units::Base#range}
-    def range_to(unit, amount = 1)
-      TimeMath[unit].range(self, amount)
-    end
-
-    # Shortcut to {Units::Base#range_back}
-    def range_from(unit, amount = 1)
-      TimeMath[unit].range_back(self, amount)
-    end
-
-    # Shortcut to {Units::Base#sequence}. See its docs for possible options.
-    def sequence_to(unit, other, options = {})
-      TimeMath[unit].sequence(self, other, options)
-    end
-  end
-
-  Time.send :include, CoreExt
-  DateTime.send :include, CoreExt if ::Kernel.const_defined?(:DateTime)
-end

data/lib/time_math/span.rb

@@ -1,53 +0,0 @@
-module TimeMath
-  # Represents time span (amount of units), like "4 years".
-  # Allows to advance or decrease Time or DateTime.
-  #
-  # Use it like this:
-  #
-  # ```ruby
-  # TimeMath.year.span(4).before(Time.now)
-  # ```
-  #
-  class Span
-    attr_reader :unit, :amount
-
-    # Creates Span instance.
-    # Typically, it is easire to use {Units::Base#span} than create
-    # spans directly.
-    #
-    # @param unit [Symbol] one of {Units.names}, unit of span;
-    # @param amount [Integer] amount of units in span.
-    def initialize(unit, amount)
-      @unit, @amount = unit, amount
-      @unit_impl = Units.get(unit)
-    end
-
-    # Decreases `tm` by `amount` of `unit`.
-    #
-    # @param tm [Time,DateTime] time value to decrease;
-    # @return [Time,DateTime] decreased time.
-    def before(tm = Time.now)
-      @unit_impl.decrease(tm, amount)
-    end
-
-    # Increases `tm` by `amount` of `unit`.
-    #
-    # @param tm [Time,DateTime] time value to increase;
-    # @return [Time,DateTime] increased time.
-    def after(tm = Time.now)
-      @unit_impl.advance(tm, amount)
-    end
-
-    alias ago before
-    alias from after
-
-    def ==(other)
-      self.class == other.class &&
-        unit == other.unit && amount == other.amount
-    end
-
-    def inspect
-      '#<%s(%s): %+i>' % [self.class, unit, amount]
-    end
-  end
-end