easy_timer 0.9.2 → 0.9.3

data/lib/easy_timer/version.rb

@@ -1,3 +1,3 @@
 module EasyTimer
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/easy_timer.rb

@@ -5,7 +5,7 @@ module EasyTimer
     base.extend(ClassMethods)
   end
 
-	module ClassMethods
+  module ClassMethods
     def timer(options = {}, &block)
       start_time = Time.now
       yield
@@ -16,24 +16,24 @@ module EasyTimer
         return total_time
       end
     end
-	end
+  end
 
-  def verbose
+  def verbose(options = {:msec => true})
     time_hash = {}
     seconds = self.to_i
-    milliseconds = (self.to_f - seconds)
-    time_hash[:weeks], seconds = seconds.divmod(604800)
-    time_hash[:days], seconds = seconds.divmod(86400)
-    time_hash[:hours], seconds = seconds.divmod(3600)
-    time_hash[:minutes], seconds = seconds.divmod(60)
-    time_hash[:seconds] = seconds + milliseconds
-    return time_hash.select{|k,v| v > 0}.inject([]){|verbose, array|
+    time_hash[:week], seconds = seconds.divmod(604800)
+    time_hash[:day], seconds = seconds.divmod(86400)
+    time_hash[:hour], seconds = seconds.divmod(3600)
+    time_hash[:minute], seconds = seconds.divmod(60)
+    time_hash[:second] = seconds
+    time_hash[:second] += (self.to_f - self.to_i) if options[:msec]
+    return time_hash.select{|k,v| v > 0}.inject([]) do |verbose, array|
       k, v = array
-      verbose << "#{v.is_a?(Float) ? sprintf("%.2f", v) : v} #{v > 1 ? k : k.to_s.chars.to_a[0..-2].join}"
-    }.join(" ")
+      verbose << "#{v.is_a?(Float) ? sprintf("%.2f", v) : v} #{k.to_s + (v == 1 ? '' : 's')}"
+    end.join(" ")
   end
 end
 
 class Time
   include EasyTimer
-end
+end

data/spec/easy_timer_spec.rb

@@ -14,8 +14,8 @@ describe "timer instance" do
 		expect(Time.at(1389722.22).verbose).to eql "2 weeks 2 days 2 hours 2 minutes 2.22 seconds"	
 	end
 
-	it "should show 1 seconds" do
-		expect(Time.timer{sleep 1}.verbose).to eql "1.00 seconds"
+	it "should show 0.55 seconds" do
+		expect(Time.timer{sleep 0.55}.verbose).to eql "0.55 seconds"
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_timer
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors: