chronic_duration 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959bf6b04d72c1da1ead272b846f4708775254d4
-  data.tar.gz: b5b1a908526644ce56ebf19a1dd62c618ccffbc1
+  metadata.gz: 69c6a72d2b2392ac29969c76f36831b0e6c684b7
+  data.tar.gz: 50aefec89726857b3b1c85e6d89a97222d08f5f7
 SHA512:
-  metadata.gz: 55a045f3d94a0b985675d5873ebc7e18d01ae0465e8a8c0c68ae95ffeb9f30cd72f1b43c1a98d0049c3a863201dfc87e436e1cc08cfd001d3daa0f082f3fde27
-  data.tar.gz: 57f63af3405fc555db755a1310d098d63c66121c86fc98e956d8e2dc1689157a194d02e2ff4a98064efaecca182892bb6b8fee8409a13ed70a3c908e52cfd586
+  metadata.gz: 97b91a6d8d54244d722ad12c9bfc8f7f05ef8553fc49d7997ec3883dafb39c345eb5a592f6a4b0283fd54e72f0ce9faf76798313b85d055aca338c430ac313c9
+  data.tar.gz: bc61ef5ca5ad8aa244fcaa4b6a55c427182d98eb44774822a11af4ceb528c737c35295611d1f57e57cb72b3637b217e2e927a23de34c5b61a18cd0d8210549b6

data/README.md

@@ -32,6 +32,8 @@ The reverse can also be accomplished with the output method. So pass in seconds
     => 2 wks 1 day 1 hr
     >> ChronicDuration.output(1299600, :weeks => true, :units => 2)
     => 2 wks 1 day
+    >> ChronicDuration.output(45*24*60*60 + 15*60, :limit_to_hours => true)
+    => 1080 hrs 15 mins
     >> ChronicDuration.output(1299600, :weeks => true, :units => 2, :joiner => ', ')
     => 2 wks, 1 day
     >> ChronicDuration.output(1296000)

data/lib/chronic_duration.rb

@@ -75,22 +75,24 @@ module ChronicDuration
       if minutes >= 60
         hours = (minutes / 60).to_i
         minutes = (minutes % 60).to_i
-        if hours >= ChronicDuration.hours_per_day
-          days = (hours / ChronicDuration.hours_per_day).to_i
-          hours = (hours % ChronicDuration.hours_per_day).to_i
-          if opts[:weeks]
-            if days >= ChronicDuration.days_per_week
-              weeks = (days / ChronicDuration.days_per_week).to_i
-              days = (days % ChronicDuration.days_per_week).to_i
-              if weeks >= 4
-                months = (weeks / 4).to_i
-                weeks = (weeks % 4).to_i
+        if !opts[:limit_to_hours]
+          if hours >= ChronicDuration.hours_per_day
+            days = (hours / ChronicDuration.hours_per_day).to_i
+            hours = (hours % ChronicDuration.hours_per_day).to_i
+            if opts[:weeks]
+              if days >= ChronicDuration.days_per_week
+                weeks = (days / ChronicDuration.days_per_week).to_i
+                days = (days % ChronicDuration.days_per_week).to_i
+                if weeks >= 4
+                  months = (weeks / 4).to_i
+                  weeks = (weeks % 4).to_i
+                end
+              end
+            else
+              if days >= 30
+                months = (days / 30).to_i
+                days = (days % 30).to_i
               end
-            end
-          else
-            if days >= 30
-              months = (days / 30).to_i
-              days = (days % 30).to_i
             end
           end
         end
@@ -238,8 +240,8 @@ private
         raise DurationParseError, "An invalid word #{word.inspect} was used in the string to be parsed."
       end
     end
-    # add '1' at front if string starts with something recognizable but not with a number, like 'day' or 'minute 30sec' 
-    res.unshift(1) if res.length > 0 && mappings[res[0]]  
+    # add '1' at front if string starts with something recognizable but not with a number, like 'day' or 'minute 30sec'
+    res.unshift(1) if res.length > 0 && mappings[res[0]]
     res.join(' ')
   end
 

data/lib/chronic_duration/version.rb

@@ -1,3 +1,3 @@
 module ChronicDuration
-  VERSION = '0.10.5'
+  VERSION = '0.10.6'
 end

data/spec/lib/chronic_duration_spec.rb

@@ -201,6 +201,10 @@ describe ChronicDuration do
       ChronicDuration.output(45*24*60*60, :weeks => true).should =~ /.*wk.*/
     end
 
+    it "returns hours and minutes only when :hours_only option specified" do
+      ChronicDuration.output(395*24*60*60 + 15*60, :limit_to_hours => true).should == '9480 hrs 15 mins'
+    end
+
     it "returns the specified number of units if provided" do
       ChronicDuration.output(4 * 3600 + 60 + 1, units: 2).should == '4 hrs 1 min'
       ChronicDuration.output(6 * 30 * 24 * 3600 + 24 * 3600 + 3600 + 60 + 1, units: 3, format: :long).should == '6 months 1 day 1 hour'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chronic_duration
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - hpoydar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numerizer