chronological 1.0.0beta5 → 1.0.0beta6

data/README.md

@@ -282,19 +282,19 @@ MyTimeRangeClass.ended :as_of => 42.years.from_now  #=> [range_instance]
 
 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
+combination of these pieces, you can pass them in an `:in` 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]
+range_instance.duration :in => [:days, :hours, :seconds]
 #=> { :days => 5, :hours => 1, :seconds => 2663 }
 
-range_instance.duration :as => [:days, :hours, :minutes]
+range_instance.duration :in => [:days, :hours, :minutes]
 #=> { :days => 5, :hours => 1, :minutes => 44 }
 
-range_instance.duration :as => [:hours, :minutes, :seconds]
+range_instance.duration :in => [:hours, :minutes, :seconds]
 #=> { :hours => 121, :minutes => 44, :seconds => 23 }
 ```
 

data/lib/chronological/strategies/absolute.rb

@@ -34,6 +34,8 @@ module Chronological
     end
 
     def duration_in_seconds(object)
+      return nil unless object.send(field_names[:ending_time]).present? && object.send(field_names[:starting_time]).present?
+
       (object.send(field_names[:ending_time]) - object.send(field_names[:starting_time]))
     end
 

data/lib/chronological/strategies/base.rb

@@ -22,8 +22,8 @@ module Chronological
       !object.in_progress?
     end
 
-    def duration(object, options = { :as => [:days, :hours, :minutes, :seconds] })
-      duration_parts      = options[:as]
+    def duration(object, options = { :in => [:days, :hours, :minutes, :seconds] })
+      duration_parts      = options[:in]
       remaining_duration  = duration_in_seconds(object)
 
       return Hash.new unless remaining_duration.present?

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '1.0.0beta5'
+  VERSION = '1.0.0beta6'
 end

data/spec/strategies/absolute_spec.rb

@@ -613,5 +613,28 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
         end
       end
     end
+
+    describe '#duration_in_seconds' do
+      let(:strategy)   { Chronological::AbsoluteStrategy.new( starting_time:  :started_at_utc,
+                                                              ending_time:    :ended_at_utc) }
+
+      context 'when the starting time is not set' do
+        let(:start_time) { nil }
+        let(:end_time)   { now }
+
+        it 'is nil' do
+          strategy.send(:duration_in_seconds, chronologicable).should be_nil
+        end
+      end
+
+      context 'when the starting time is not set' do
+        let(:start_time) { now }
+        let(:end_time)   { nil }
+
+        it 'is nil' do
+          strategy.send(:duration_in_seconds, chronologicable).should be_nil
+        end
+      end
+    end
   end
 end

data/spec/strategies/base_spec.rb

@@ -72,7 +72,7 @@ describe Chronological::BaseStrategy do
 
   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]) }
+      let(:duration_hash) { strategy.duration(chrono, :in => [:days, :hours, :seconds]) }
 
       before { strategy.should_receive(:duration_in_seconds).and_return(438263) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronological
 version: !ruby/object:Gem::Version
-  version: 1.0.0beta5
+  version: 1.0.0beta6
   prerelease: 5
 platform: ruby
 authors: