easy_timer 0.9.3 → 0.9.4

data/lib/easy_timer.rb

@@ -11,25 +11,32 @@ module EasyTimer
       yield
       total_time = Time.at(Time.now - start_time)
       if options[:verbose] || options[:v]
-        return total_time.verbose 
+        return total_time.verbose
       else
         return total_time
       end
     end
   end
 
-  def verbose(options = {:msec => true})
+  def verbose
     time_hash = {}
     seconds = self.to_i
+
+    precision = case seconds
+    when 0..30 then 3
+    when 31..360 then 2
+    else 0
+    end
+
     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]
+    time_hash[:second] += (self.to_f - self.to_i) if precision > 0
     return time_hash.select{|k,v| v > 0}.inject([]) do |verbose, array|
       k, v = array
-      verbose << "#{v.is_a?(Float) ? sprintf("%.2f", v) : v} #{k.to_s + (v == 1 ? '' : 's')}"
+      verbose << "#{v.is_a?(Float) ? sprintf("%.#{precision}f", v) : v} #{k.to_s + (v == 1 ? '' : 's')}"
     end.join(" ")
   end
 end

data/lib/easy_timer/version.rb

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

data/spec/easy_timer_spec.rb

@@ -7,28 +7,36 @@ describe "timer instance" do
 	end
 
 	it "should be a singular verbose time" do
-		expect(verbose_time).to eql "1 week 1 day 1 hour 1 minute 1.11 seconds"
+		expect(verbose_time).to eql "1 week 1 day 1 hour 1 minute 1 second"
 	end
 
-	it "shold be a plural verbose time" do
-		expect(Time.at(1389722.22).verbose).to eql "2 weeks 2 days 2 hours 2 minutes 2.22 seconds"	
+	it "should be a plural verbose time" do
+		expect(Time.at(1389722.22).verbose).to eql "2 weeks 2 days 2 hours 2 minutes 2 seconds"
 	end
 
-	it "should show 0.55 seconds" do
-		expect(Time.timer{sleep 0.55}.verbose).to eql "0.55 seconds"
+	it "should display 3 decimal places" do
+		expect(Time.at(22.222).verbose).to eql "22.222 seconds"
+	end
+
+	it "should display 2 decimal places" do
+		expect(Time.at(60.222).verbose).to eql "1 minute 0.22 seconds"
+	end
+
+	it "should display no decimal places" do
+		expect(Time.at(361.222).verbose).to eql "6 minutes 1 second"
 	end
 end
 
 describe "Timer" do
 	before :all do
-		@five = Time.timer{sleep 5}
+		@five = Time.timer{sleep 2}
 	end
 
 	it "should return a Time object" do
 		expect(@five.class).to eql Time
 	end
 
-	it "should return 5 seconds" do
-		expect(@five.to_f).to be_within(0.1).of(5)
+	it "should return 2 seconds" do
+		expect(@five.to_f).to be_within(0.1).of(2)
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_timer
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies: []
 description: Easy Timer
 email: