bootstripe 0.2.12 → 0.2.13

data/lib/bootstripe/number_additions.rb

@@ -4,32 +4,33 @@ class Numeric
     [[self, min].max, max].min
   end
 
-  def to_period(detailed = true)
+  def to_period(detailed = true, abbreviated = true)
     total_seconds = self.to_i
-    
+
     days = total_seconds / 86400
     hours = (total_seconds / 3600) - (days * 24)
     minutes = (total_seconds / 60) - (hours * 60) - (days * 1440)
     seconds = total_seconds % 60
-    
-    display = ''
-    display_concat = ''
+
+    elements = []
     if days > 0
-      display = display + display_concat + "#{days}d"
-      display_concat = ' '
+      suffix = abbreviated ? 'd' : (days == 1 ? ' day' : ' days')
+      elements << "#{days}#{suffix}"
     end
     if hours > 0
-      display = display + display_concat + "#{hours}h"
-      display_concat = ' '
+      suffix = abbreviated ? 'h' : (hours == 1 ? ' hour' : ' hours')
+      elements << "#{hours}#{suffix}"
     end
     if minutes > 0 and (detailed or days == 0)
-      display = display + display_concat + "#{minutes}m"
-      display_concat = ' '
+      suffix = abbreviated ? 'm' : (minutes == 1 ? ' minute' : ' minutes')
+      elements << "#{minutes}#{suffix}"
     end
     if seconds > 0 and (detailed or (days == 0 and hours == 0))
-      display = display + display_concat + "#{seconds}s"
+      suffix = abbreviated ? 's' : (days == 1 ? ' seconds' : ' second')
+      elements << "#{seconds}#{suffix}"
     end
-    display
+
+    elements.join(abbreviated ? ' ' : ', ')
   end
 
   def to_formatted_time

data/lib/bootstripe/version.rb

@@ -1,3 +1,3 @@
 module Bootstripe
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/spec/number_additions_spec.rb

@@ -14,10 +14,16 @@ describe Numeric do
     (673.2).to_formatted_time.should eq '11:13'
   end
 
-  it 'should periods accurately' do
+  it 'should describe periods accurately' do
     3600.to_period.should eq '1h'
     7260.to_period.should eq '2h 1m'
     (86400 + 10).to_period.should eq '1d 10s'
   end
 
+  it 'should describe periods non-abbreviated' do
+    3600.to_period(true, false).should eq '1 hour'
+    7260.to_period(true, false).should eq '2 hours, 1 minute'
+    (86400 + 10).to_period(true, false).should eq '1 day, 10 seconds'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstripe
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70341911314360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341911314360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A handful of useful additions for Ruby
 email:
 - mike@bytebin.com
@@ -68,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bootstripe
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A handful of useful additions for Ruby