since_when 0.0.3 → 0.0.4

data/README.md

@@ -1,6 +1,7 @@
 # SinceWhen
 
-TODO: Write a gem description
+Returns a string containing the amount of time since the date given with
+varying scopes of specificy.
 
 ## Installation
 
@@ -18,7 +19,22 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    SinceWhen::time_since( date, :scope )
+    
+Example:
+    
+    example_date = Date.new(2001, 2, 3)
+    
+    SinceWhen::time_since( example_date, :month )
+
+    >> "12 years 8 months"
+
+    # or
+
+    SinceWhen::time_since( example_date, :day)
+    
+    >> "12 years 8 months 12 days"
+    
 
 ## Contributing
 

data/lib/since_when/version.rb

@@ -1,3 +1,3 @@
 module SinceWhen
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/since_when.rb

@@ -2,75 +2,69 @@ require "since_when/version"
 
 module SinceWhen
   def self.time_since date, scope = :month
-
     days_in_month = [31, date.year%4 == 0 ? 29 : 28 , 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    scope_arr = %w(year month day hour minute second)
+
     time_string = ""
 
     if date.class != Date
       date = date.to_datetime
+      hour_dif = DateTime.now.hour - date.hour
+      minute_dif = DateTime.now.minute - date.minute
+      second_dif = DateTime.now.second - date.second
     end
 
     day_dif = Date.today.day - date.day
     month_dif = Date.today.month - date.month
     year_dif = Date.today.year - date.year
 
-    unless scope == :month || scope == :day
-      hour_dif = DateTime.now.hour - date.hour
-      if hour_dif < 0
-        day_dif -= 1
-        hour_dif += 24
-      end
-      unless scope == :hour
-        minute_dif = DateTime.now.minute - date.minute
-        if minute_dif < 0
-          hour_dif -= 1
-          minute_dif += 60
-        end
-        unless scope == :minute
-          second_dif = DateTime.now.second - date.second
-          if second_dif < 0
-            minute_dif -= 1
-            second_dif += 60
-          end
-        end
-      end
+    if second_dif && second_dif < 0
+      minute_dif -= 1
+      second_dif += 60
+    end
+    if minute_dif && minute_dif < 0
+      hour_dif -= 1
+      minute_dif += 60
+    end
+    if hour_dif && hour_dif < 0
+      day_dif -= 1
+      hour_dif += 24
     end
-
     if day_dif < 0
       month_dif -= 1
-      unless scope == :month
-        day_dif += days_in_month[date.month + 1]
-      end
+      day_dif += days_in_month[date.month + 1]
     end
-
     if month_dif < 0
       year_dif -= 1
       month_dif += 12
     end
 
-    if year_dif > 0
-      time_string << "#{year_dif} #{year_dif > 1 ? 'years' : 'year' }"
-    end
 
-    if month_dif > 0
-      time_string << " #{month_dif} #{month_dif > 1 ? 'months' : 'month'}"
-    end
+    if scope_arr.include?(scope.to_s)
+      if year_dif > 0
+        time_string << "#{year_dif} #{year_dif > 1 ? 'years' : 'year' }"
+      end
 
-    unless scope == :month
-      if day_dif > 0
-        time_string << " #{day_dif} #{day_dif > 1 ? 'days' : 'day'}"
+      if month_dif > 0
+        time_string << " #{month_dif} #{month_dif > 1 ? 'months' : 'month'}"
       end
-      unless scope == :day
-        if hour_dif > 0
-          time_string << " #{hour_dif} #{hour_dif > 1 ? 'hours' : 'hour'}"
+
+      unless scope == :month
+        if day_dif > 0
+          time_string << " #{day_dif} #{day_dif > 1 ? 'days' : 'day'}"
         end
-        unless scope == :hour
-          if minute_dif > 0
-            time_string << " #{minute_dif} #{minute_dif > 1 ? 'minutes' : 'minute'}"
+        unless scope == :day
+          if hour_dif > 0
+            time_string << " #{hour_dif} #{hour_dif > 1 ? 'hours' : 'hour'}"
           end
-          unless scope == :minute
-            if second_dif > 0
-              time_string << " #{second_dif} #{second_dif > 1 ? 'seconds' : 'second'}"
+          unless scope == :hour
+            if minute_dif > 0
+              time_string << " #{minute_dif} #{minute_dif > 1 ? 'minutes' : 'minute'}"
+            end
+            unless scope == :minute
+              if second_dif > 0
+                time_string << " #{second_dif} #{second_dif > 1 ? 'seconds' : 'second'}"
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: since_when
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: