timerizer 0.1.4 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f23581978647a19fcd4536615da3394b0c61e033
+  data.tar.gz: 69f149f7310a57fd7fe401f2f20dd1a823986ce5
+SHA512:
+  metadata.gz: c3baba0ecac98dcf2a95d43fbd6b18f281a2b2eafd0eecf42cc528de28d1aaa9074bdb2a66bec85590dfe4b30fb9cb7a54e236d35fd2fc59b205ad8255821e14
+  data.tar.gz: 39de4ac9fec51a58bc4e5ba43f78d397a39cec81ceaa99fac1506c47278d22b74d45de0f35f297a8a929a718948ee266480265e0cf8847d28a996e1242145d52

data/lib/timerizer.rb

@@ -103,10 +103,10 @@ class RelativeTime
   # Initialize a new instance of RelativeTime.
   # @overload new(hash)
   #   @param [Hash] units The base units to initialize with
-  #   @option units [Fixnum] :seconds The number of seconds
-  #   @option units [Fixnum] :months The number of months
+  #   @option units [Integer] :seconds The number of seconds
+  #   @option units [Integer] :months The number of months
   # @overload new(count, unit)
-  #   @param [Fixnum] count The number of units to initialize with
+  #   @param [Integer] count The number of units to initialize with
   #   @param [Symbol] unit The unit to initialize. See {RelativeTime#units}
   def initialize(count = 0, unit = :second)
     if count.is_a? Hash
@@ -138,7 +138,7 @@ class RelativeTime
 
   # Return the number of base units in a RelativeTime.
   # @param [Symbol] unit The unit to return, either :seconds or :months
-  # @return [Fixnum] The requested unit count
+  # @return [Integer] The requested unit count
   # @raise [ArgumentError] Unit requested was not :seconds or :months
   def get(unit)
     if unit == :seconds
@@ -227,13 +227,13 @@ class RelativeTime
     superior_unit = @@units.keys.index(unit) + 1
 
     if @@in_seconds.has_key? unit
-      class_eval %Q"
+      class_eval "
         def #{in_method}
           @seconds / #{@@in_seconds[unit]}
         end
       "
     elsif @@in_months.has_key? unit
-      class_eval %Q"
+      class_eval "
         def #{in_method}
           @months / #{@@in_months[unit]}
         end
@@ -244,7 +244,7 @@ class RelativeTime
     count_superior = @@units.keys[superior_unit]
 
 
-    class_eval %Q"
+    class_eval "
       def #{count_method}
         time = self.#{in_method}
         if @@units.length > #{superior_unit}
@@ -344,7 +344,7 @@ class RelativeTime
   # @overload to_s(hash)
   #   @param [Hash] hash The custom hash to use
   #   @option hash [Hash] :units The unit names to use. See @@syntaxes for examples
-  #   @option hash [Fixnum] :count The maximum number of units to output. `1` would output only the unit of greatest example (such as the hour value in `1.hour 3.minutes 2.seconds`).
+  #   @option hash [Integer] :count The maximum number of units to output. `1` would output only the unit of greatest example (such as the hour value in `1.hour 3.minutes 2.seconds`).
   #   @option hash [String] :separator The separator to use in between a unit and its value
   #   @option hash [String] :delimiter The delimiter to use in between different unit-value pairs
   # @example
@@ -402,24 +402,24 @@ class WallClock
   # Initialize a new instance of WallClock
   # @overload new(hash)
   #   @param [Hash] units The units to initialize with
-  #   @option units [Fixnum] :hour The hour to initialize with
-  #   @option units [Fixnum] :minute The minute to initialize with
-  #   @option units [Fixnum] :second The second to initialize with
+  #   @option units [Integer] :hour The hour to initialize with
+  #   @option units [Integer] :minute The minute to initialize with
+  #   @option units [Integer] :second The second to initialize with
   # @overload new(hour, minute, meridiem)
-  #   @param [Fixnum] hour The hour to initialize with
-  #   @param [Fixnum] minute The minute to initialize with
+  #   @param [Integer] hour The hour to initialize with
+  #   @param [Integer] minute The minute to initialize with
   #   @param [Symbol] meridiem The meridiem to initialize with (`:am` or `:pm`)
   # @overload new(hour, minute, second, meridiem)
-  #   @param [Fixnum] hour The hour to initialize with
-  #   @param [Fixnum] minute The minute to initialize with
-  #   @param [Fixnum] second The second to initialize with
+  #   @param [Integer] hour The hour to initialize with
+  #   @param [Integer] minute The minute to initialize with
+  #   @param [Integer] second The second to initialize with
   #   @param [Symbol] meridiem The meridiem to initialize with (`:am` or `:pm`)
   # @overload new(seconds)
-  #   @param [Fixnum] seconds The number of seconds to initialize with (for use with #to_i)
+  #   @param [Integer] seconds The number of seconds to initialize with (for use with #to_i)
   # @raise InvalidMeridiemError Meridiem is not `:am` or `:pm`
   def initialize(hour = nil, minute = nil, second = 0, meridiem = :am)
     units = nil
-    if hour.is_a?(Fixnum) && minute.nil?
+    if hour.is_a?(Integer) && minute.nil?
       units = {:second => hour}
     elsif hour.is_a?(Hash)
       units = hour
@@ -494,38 +494,38 @@ class WallClock
   end
 
   # Get the time of the WallClock, in seconds
-  # @return [Fixnum] The total time of the WallClock, in seconds
+  # @return [Integer] The total time of the WallClock, in seconds
   def in_seconds
     @seconds
   end
 
   # Get the time of the WallClock, in minutes
-  # @return [Fixnum] The total time of the WallClock, in minutes
+  # @return [Integer] The total time of the WallClock, in minutes
   def in_minutes
     @seconds / RelativeTime.units_in_seconds[:minute]
   end
 
   # Get the time of the WallClock, in hours
-  # @return [Fixnum] The total time of the WallClock, in hours
+  # @return [Integer] The total time of the WallClock, in hours
   def in_hours
     @seconds / RelativeTime.units_in_seconds[:hour]
   end
 
   # Get the second of the WallClock.
-  # @return [Fixnum] The second component of the WallClock
+  # @return [Integer] The second component of the WallClock
   def second
     self.to_relative.seconds
   end
 
   # Get the minute of the WallClock.
-  # @return [Fixnum] The minute component of the WallClock
+  # @return [Integer] The minute component of the WallClock
   def minute
     self.to_relative.minutes
   end
 
   # Get the hour of the WallClock.
   # @param [Symbol] system The houring system to use (either `:twelve_hour` or `:twenty_four_hour`; default `:twenty_four_hour`)
-  # @return [Fixnum] The hour component of the WallClock
+  # @return [Integer] The hour component of the WallClock
   def hour(system = :twenty_four_hour)
     hour = self.to_relative.hours
     if system == :twelve_hour
@@ -624,21 +624,45 @@ class Time
   # @see #since
   class TimeIsInTheFutureError < ArgumentError; end
 
-  add = instance_method(:+)
-  define_method(:+) do |time|
+  class << self
+    alias_method :classic_new, :new
+
+    def new(*args)
+      begin
+        Time.classic_new(*args)
+      rescue ArgumentError
+        if args.empty?
+          Time.new
+        else
+          Time.local(*args)
+        end
+      end
+    end
+  end
+
+  # def initialize(*args)
+  #   self.classic_new(args)
+  #   # if args.count == 0
+
+  #   # else
+  #   # end
+  # end
+
+  alias_method :add, :+
+  def +(time)
     if time.is_a? RelativeTime
       time.after(self)
     else
-      add.bind(self).(time)
+      self.add(time)
     end
   end
 
-  subtract = instance_method(:-)
-  define_method(:-) do |time|
+  alias_method :subtract, :-
+  def -(time)
     if time.is_a? RelativeTime
       time.before(self)
     else
-      subtract.bind(self).(time)
+      self.subtract(time)
     end
   end
 
@@ -718,7 +742,7 @@ end
 # {Date} class monkeywrenched with {RelativeTime} helpers.
 class Date
   # Return the number of days in a given month.
-  # @return [Fixnum] Number of days in the month of the {Date}.
+  # @return [Integer] Number of days in the month of the {Date}.
   # @example
   #   Date.new(2000, 2).days_in_month
   #     => 29
@@ -759,17 +783,19 @@ class Date
   end
 end
 
-# Monkeywrenched {Fixnum} class enabled to return {RelativeTime} objects.
+# Monkeywrenched {Integer} class enabled to return {RelativeTime} objects.
 # @example
 #   5.minutes
 #     => 5 minutes
 # @see {RelativeTime#units}
-class Fixnum
+class Integer
   RelativeTime.units.each do |unit, plural|
-    define_method(unit) do |added_time = RelativeTime.new|
-      time = RelativeTime.new(self, unit)
-      time + added_time
-    end
+    class_eval "
+      def #{unit}(added_time = RelativeTime.new)
+        time = RelativeTime.new(self, :#{unit})
+        time + added_time unless added_time.nil?
+      end
+    "
     alias_method(plural, unit)
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Kyle Lacy
@@ -20,27 +19,26 @@ files:
 - lib/timerizer.rb
 homepage: http://github.com/kylewlacy/timerizer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails time helpers... without the Rails
 test_files: []
 has_rdoc: