timerizer 0.1.0 → 0.1.1

data/lib/timerizer.rb

@@ -162,8 +162,8 @@ class RelativeTime
   def before(time)
     time = time.to_time - @seconds
 
-    new_month = time.month - @months
-    new_year = time.year
+    new_month = time.month - self.months
+    new_year = time.year - self.years
     while new_month < 1
       new_month += 12
       new_year -= 1
@@ -195,8 +195,8 @@ class RelativeTime
   def after(time)
     time = time.to_time + @seconds
 
-    new_year = time.year
-    new_month = time.month + @months
+    new_year = time.year + self.years
+    new_month = time.month + self.months
     while new_month > 12
       new_year += 1
       new_month -= 12
@@ -226,24 +226,33 @@ class RelativeTime
     count_method = plural
     superior_unit = @@units.keys.index(unit) + 1
 
-    define_method(in_method) do
-      if @@in_seconds.has_key?(unit)
-        @seconds / @@in_seconds[unit]
-      elsif @@in_months.has_key?(unit)
-        @months / @@in_months[unit]
-      end
+    if @@in_seconds.has_key? unit
+      class_eval %Q"
+        def #{in_method}
+          @seconds / #{@@in_seconds[unit]}
+        end
+      "
+    elsif @@in_months.has_key? unit
+      class_eval %Q"
+        def #{in_method}
+          @months / #{@@in_months[unit]}
+        end
+      "
     end
 
-    define_method(count_method) do
-      in_superior = "in_#{@@units.values[superior_unit]}"
-      count_superior = @@units.keys[superior_unit]
+    in_superior = "in_#{@@units.values[superior_unit]}"
+    count_superior = @@units.keys[superior_unit]
+
 
-      time = self.send(in_method)
-      if @@units.length > superior_unit
-        time -= self.send(in_superior).send(count_superior).send(in_method)
+    class_eval %Q"
+      def #{count_method}
+        time = self.#{in_method}
+        if @@units.length > #{superior_unit}
+          time -= self.#{in_superior}.#{count_superior}.#{in_method}
+        end
+        time
       end
-      time
-    end
+    "
   end
 
   # Average second-based units to month-based units.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails time helpers... without the Rails