chronological 1.0.0beta3 → 1.0.0beta4

data/README.md

@@ -278,6 +278,28 @@ MyTimeRangeClass.ended                              #=> []
 MyTimeRangeClass.ended :as_of => 42.years.from_now  #=> [range_instance]
 ```
 
+#### Duration Components
+
+When calling `duration` on a Chronological, by default it will return
+the days, hours, minutes and seconds in a Hash.  If you need a specific
+combination of these pieces, you can pass them in an `:as` options like
+so:
+
+```ruby
+# range_instance's total duration is 5 days, 1 hour, 44 minutes and 23 seconds
+
+range_instance.duration :as => [:days, :hours, :seconds]
+#=> { :days => 5, :hours => 1, :seconds => 2663 }
+
+range_instance.duration :as => [:days, :hours, :minutes]
+#=> { :days => 5, :hours => 1, :minutes => 44 }
+
+range_instance.duration :as => [:hours, :minutes, :seconds]
+#=> { :hours => 121, :minutes => 44, :seconds => 23 }
+```
+
+Affected methods:
+
 ## Is It Scheduled?
 
 Even though Chronological does not handle anything having to do with time

data/lib/chronological/strategies/base.rb

@@ -22,16 +22,32 @@ module Chronological
       !object.in_progress?
     end
 
-    def duration(object)
-      calculated_duration = duration_in_seconds(object)
+    def duration(object, options = { :as => [:days, :hours, :minutes, :seconds] })
+      duration_parts      = options[:as]
+      remaining_duration  = duration_in_seconds(object)
 
-      return Hash.new unless calculated_duration.present?
+      return Hash.new unless remaining_duration.present?
 
-      hours   = (calculated_duration / 3600).to_i
-      minutes = ((calculated_duration % 3600) / 60).to_i
-      seconds = (calculated_duration % 60).to_i
+      if duration_parts.include? :days
+        days                = remaining_duration / 86400
+        remaining_duration  = remaining_duration % 86400
+      end
 
-      { :hours => hours, :minutes => minutes, :seconds => seconds }
+      if duration_parts.include? :hours
+        hours               = remaining_duration / 3600
+        remaining_duration  = remaining_duration % 3600
+      end
+
+      if duration_parts.include? :minutes
+        minutes             = remaining_duration / 60
+        remaining_duration  = remaining_duration % 60
+      end
+
+      if duration_parts.include? :seconds
+        seconds             = remaining_duration
+      end
+
+      { :days => days, :hours => hours, :minutes => minutes, :seconds => seconds }.select {|k,v| !v.nil?}
     end
 
     def in_progress?(object)

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '1.0.0beta3'
+  VERSION = '1.0.0beta4'
 end

data/spec/strategies/base_spec.rb

@@ -71,8 +71,28 @@ describe Chronological::BaseStrategy do
   end
 
   describe '#duration' do
+    context 'when passed an options hash limiting the parts of the output' do
+      let(:duration_hash) { strategy.duration(chrono, :as => [:days, :hours, :seconds]) }
+
+      before { strategy.should_receive(:duration_in_seconds).and_return(438263) }
+
+      it 'removes it from the resulting hash' do
+        duration_hash.should_not have_key :minutes
+      end
+
+      it 'makes up for it in the following more granular item' do
+        duration_hash[:days].should eql 5
+        duration_hash[:hours].should eql 1
+        duration_hash[:seconds].should eql 2663
+      end
+    end
+
     context 'when the strategy represents something with a duration' do
-      before { strategy.should_receive(:duration_in_seconds).and_return(6263) }
+      before { strategy.should_receive(:duration_in_seconds).and_return(438263) }
+
+      it 'is a hash with the correct days' do
+        strategy.duration(chrono)[:days].should eql 5
+      end
 
       it 'is a hash with the correct hours' do
         strategy.duration(chrono)[:hours].should eql 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronological
 version: !ruby/object:Gem::Version
-  version: 1.0.0beta3
+  version: 1.0.0beta4
   prerelease: 5
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec