chronic_duration 0.10.0 → 0.10.1

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 1.9.3

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/hpoydar/chronic_duration.png?branch=master)](https://travis-ci.org/hpoydar/chronic_duration)
+
 # Chronic Duration
 
 A simple Ruby natural language parser for elapsed time. (For example, 4 hours and 30 minutes, 6 minutes 4 seconds, 3 days, etc.) Returns all results in seconds. Will return an integer unless you get tricky and need a float. (4 minutes and 13.47 seconds, for example.)
@@ -48,6 +50,10 @@ ChronicDuration.raise_exceptions can be set to true to raise exceptions when the
     >> ChronicDuration.parse('4 elephants and 3 Astroids')
     ChronicDuration::DurationParseError: An invalid word "elephants" was used in the string to be parsed.
 
+## Contributing
+
+Fork and pull request after your specs are green. Add your handle to the list below.
+Also looking for additional maintainers.
 
 ## Contributors
 

data/lib/chronic_duration.rb

@@ -28,6 +28,8 @@ module ChronicDuration
   # Given an integer and an optional format,
   # returns a formatted string representing elapsed time
   def output(seconds, opts = {})
+    int = seconds.to_i
+    seconds = int if seconds - int == 0 # if seconds end with .0
 
     opts[:format] ||= :default
 
@@ -95,7 +97,11 @@ module ChronicDuration
         # Get rid of lead off times if they are zero
         # Get rid of lead off zero
         # Get rid of trailing :
-        str.gsub(/\b\d\b/) { |d| ("%02d" % d) }.gsub(/^(00:)+/, '').gsub(/^0/, '').gsub(/:$/, '')
+        divider = ':'
+        str.split(divider).map { |n|
+          # add zeros only if n is an integer
+          n.include?('.') ? ("%04.#{decimal_places}f" % n) : ("%02d" % n)
+        }.join(divider).gsub(/^(00:)+/, '').gsub(/^0/, '').gsub(/:$/, '')
       end
       joiner = ''
     end

data/lib/chronic_duration/version.rb

@@ -1,3 +1,3 @@
 module ChronicDuration
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/chronic_duration_spec.rb

@@ -80,6 +80,54 @@ describe ChronicDuration, '.output' do
         :long     => '1 minute 20 seconds',
         :chrono   => '1:20'
       },
+    (60 + 20 + 0.0) =>
+      {
+        :micro    => '1m20s',
+        :short    => '1m 20s',
+        :default  => '1 min 20 secs',
+        :long     => '1 minute 20 seconds',
+        :chrono   => '1:20'
+      },
+    (60 + 20.01) =>
+      {
+        :micro    => '1m20.01s',
+        :short    => '1m 20.01s',
+        :default  => '1 min 20.01 secs',
+        :long     => '1 minute 20.01 seconds',
+        :chrono   => '1:20.01'
+      },
+    (60 + 20.1) =>
+      {
+        :micro    => '1m20.1s',
+        :short    => '1m 20.1s',
+        :default  => '1 min 20.1 secs',
+        :long     => '1 minute 20.1 seconds',
+        :chrono   => '1:20.1'
+      },
+    (60 + 0.1) =>
+      {
+        :micro    => '1m0.1s',
+        :short    => '1m 0.1s',
+        :default  => '1 min 0.1 secs',
+        :long     => '1 minute 0.1 seconds',
+        :chrono   => '1:00.1'
+      },
+    (60*60) =>
+      {
+        :micro    => '1h',
+        :short    => '1h',
+        :default  => '1 hr',
+        :long     => '1 hour',
+        :chrono   => '1:00:00'
+      },
+    (60*60 + 0.1) =>
+      {
+        :micro    => '1h0.1s',
+        :short    => '1h 0.1s',
+        :default  => '1 hr 0.1 secs',
+        :long     => '1 hour 0.1 seconds',
+        :chrono   => '1:00:00.1'
+      },
     (60 + 20.51) =>
       {
         :micro    => '1m20.51s',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_duration
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -71,6 +71,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md