chronological 1.0.0beta1 → 1.0.0beta2

data/lib/chronological/strategies/absolute.rb

@@ -3,13 +3,13 @@ module Chronological
     def scheduled?(object)
       object.send(field_names[:starting_time]).present? &&
       object.send(field_names[:ending_time]).present? &&
-      super
+      scheduled_time_zone(object, true).present?
     end
 
     def partially_scheduled?(object)
       object.send(field_names[:starting_time]).present? ||
       object.send(field_names[:ending_time]).present? ||
-      super
+      scheduled_time_zone(object, false).present?
     end
 
     def has_absolute_start?
@@ -21,15 +21,15 @@ module Chronological
     end
 
   private
-    def self.started_at_sql_calculation(field_names)
+    def self.started_at_sql(field_names)
       field_names[:starting_time]
     end
 
-    def self.ended_at_sql_calculation(field_names)
+    def self.ended_at_sql(field_names)
       field_names[:ending_time]
     end
 
-    def self.duration_sql_calculation(field_names)
+    def self.duration_sql(field_names)
       "extract ('epoch' from (#{field_names[:ending_time]} - #{field_names[:starting_time]}))"
     end
 

data/lib/chronological/strategies/base.rb

@@ -34,14 +34,6 @@ module Chronological
       { :hours => hours, :minutes => minutes, :seconds => seconds }
     end
 
-    def scheduled?(object)
-      !field_names[:time_zone].nil? ? object.send(field_names[:time_zone]) : true
-    end
-
-    def partially_scheduled?(object)
-      !field_names[:time_zone].nil? ? object.send(field_names[:time_zone]) : false
-    end
-
     def in_progress?(object)
       return false unless has_absolute_timeframe?(object)
 
@@ -52,15 +44,15 @@ module Chronological
     # Scopes
     #
     def self.started(object, field_names)
-      object.where "#{started_at_sql_calculation(field_names)} <= :as_of", :as_of => Time.now.utc
+      object.where "#{started_at_sql(field_names)} <= :as_of", :as_of => Time.now.utc
     end
 
     def self.ended(object, field_names)
-      object.where "#{ended_at_sql_calculation(field_names)} <= :as_of", :as_of => Time.now.utc
+      object.where "#{ended_at_sql(field_names)} <= :as_of", :as_of => Time.now.utc
     end
 
     def self.not_yet_ended(object, field_names)
-      object.where "#{ended_at_sql_calculation(field_names)} > :as_of", :as_of => Time.now.utc
+      object.where "#{ended_at_sql(field_names)} > :as_of", :as_of => Time.now.utc
     end
 
     def self.in_progress(object, field_names)
@@ -72,11 +64,16 @@ module Chronological
     end
 
     def self.by_date(object, field_names, direction)
-      object.order "#{object.table_name}.#{started_at_sql_calculation(field_names)} #{direction}, #{object.table_name}.#{ended_at_sql_calculation(field_names)} #{direction}"
+      object.order "#{object.table_name}.#{started_at_sql(field_names)} #{direction}, #{object.table_name}.#{ended_at_sql(field_names)} #{direction}"
     end
 
     def self.by_duration(object, field_names, direction)
-      object.order "#{duration_sql_calculation(field_names)} #{direction}"
+      object.order "#{duration_sql(field_names)} #{direction}"
+    end
+
+  private
+    def scheduled_time_zone(object, default)
+      !field_names[:time_zone].nil? ? object.send(field_names[:time_zone]) : default
     end
   end
 end

data/lib/chronological/strategies/relative.rb

@@ -16,14 +16,14 @@ module Chronological
       object.send(field_names[:base_of_offset]).present?  &&
       object.send(field_names[:starting_offset]).present? &&
       object.send(field_names[:ending_offset]).present? &&
-      super
+      scheduled_time_zone(object, true).present?
     end
 
     def partially_scheduled?(object)
       object.send(field_names[:base_of_offset]).present? ||
       object.send(field_names[:starting_offset]).present? ||
       object.send(field_names[:ending_offset]).present? ||
-      super
+      scheduled_time_zone(object, false).present?
     end
 
     def self.in_progress(object, field_names)
@@ -43,15 +43,15 @@ module Chronological
     end
 
   private
-    def self.started_at_sql_calculation(field_names)
+    def self.started_at_sql(field_names)
       "#{field_names[:base_of_offset]} - (#{field_names[:starting_offset]} * INTERVAL '1 seconds')"
     end
 
-    def self.ended_at_sql_calculation(field_names)
+    def self.ended_at_sql(field_names)
       "#{field_names[:base_of_offset]} - (#{field_names[:ending_offset]} * INTERVAL '1 seconds')"
     end
 
-    def self.duration_sql_calculation(field_names)
+    def self.duration_sql(field_names)
       "#{field_names[:starting_offset]} - #{field_names[:ending_offset]}"
     end
 

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '1.0.0beta1'
+  VERSION = '1.0.0beta2'
 end

data/spec/chronological_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-class ChronologicableStrategyClass
+class ChronologicableStrategyClass < ActiveRecord::Base
   extend Chronological
 end
 
@@ -9,15 +9,49 @@ describe Chronological do
     context 'when it is called with a symbol representing a strategy' do
       before do
         ChronologicableStrategyClass.class_eval do
-          timeframe type:       :absolute,
-                    start_utc:  :started_at_utc,
-                    end_utc:    :ended_at_utc
+          timeframe type:       :relative
         end
       end
 
+      let(:chronologicable) { ChronologicableStrategyClass.new }
+
       pit 'is translated properly' do
         ChronologicableStrategyClass.class_variable_get(:@@chronological_strategy).should eql Chronological::AbsoluteStrategy
       end
+
+      it { chronologicable.should respond_to :scheduled? }
+      it { chronologicable.should respond_to :partially_scheduled? }
+      it { chronologicable.should respond_to :inactive? }
+      it { chronologicable.should respond_to :in_progress? }
+      it { chronologicable.should respond_to :active? }
+      it { chronologicable.should respond_to :duration }
+      it { chronologicable.should respond_to :started_on }
+      it { chronologicable.should respond_to :ended_on }
+
+      it { ChronologicableStrategyClass.should respond_to :by_date }
+      it { ChronologicableStrategyClass.should respond_to :ended }
+      it { ChronologicableStrategyClass.should respond_to :not_yet_ended }
+      it { ChronologicableStrategyClass.should respond_to :in_progress }
+      it { ChronologicableStrategyClass.should respond_to :active }
+      it { ChronologicableStrategyClass.should respond_to :started }
+      it { ChronologicableStrategyClass.should respond_to :in_progress? }
+      it { ChronologicableStrategyClass.should respond_to :active? }
+
+      it 'tells ActiveRecord that the dynamic starting date field is a datetime' do
+        ChronologicableStrategyClass.columns_hash[:started_at].type.should eql :datetime
+      end
+
+      it 'tells ActiveRecord that the dynamic ending date field is a datetime' do
+        ChronologicableStrategyClass.columns_hash[:ended_at].type.should eql :datetime
+      end
+
+      it 'tells ActiveRecord that the dynamic starting date field is a datetime' do
+        ChronologicableStrategyClass.columns_hash[:started_on].type.should eql :date
+      end
+
+      it 'tells ActiveRecord that the dynamic ending date field is a datetime' do
+        ChronologicableStrategyClass.columns_hash[:ended_on].type.should eql :date
+      end
     end
 
     context 'when it is called with a symbol that does not represent a strategy' do

data/spec/strategies/absolute_spec.rb

@@ -8,7 +8,7 @@ class AbsoluteChronologicable < ActiveRecord::Base
             ending_time:    :ended_at_utc
 end
 
-class ChronologicableWithTimeZone < ActiveRecord::Base
+class AbsoluteChronologicableWithTimeZone < ActiveRecord::Base
   extend Chronological
 
   timeframe type:           :absolute,
@@ -166,7 +166,7 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
     end
 
     let!(:chronologicable_with_enabled_time_zone) do
-      ChronologicableWithTimeZone.new(
+      AbsoluteChronologicableWithTimeZone.new(
         started_at_utc:  start_time,
         ended_at_utc:    end_time,
         time_zone:       time_zone)
@@ -196,6 +196,24 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
           end
         end
 
+        context 'and the time zone is blank' do
+          let(:time_zone) { '' }
+
+          describe '#scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+          end
+
+          describe '#partially_scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
         context 'and a time zone is set' do
           let(:time_zone) { ActiveSupport::TimeZone.new('Alaska') }
 
@@ -236,6 +254,24 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
           end
         end
 
+        context 'but the time zone is blank' do
+          let(:time_zone) { '' }
+
+          describe '#scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should be_scheduled
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+          end
+
+          describe '#partially_scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
         context 'and a time zone is set' do
           let(:time_zone) { ActiveSupport::TimeZone.new('Alaska') }
 
@@ -292,6 +328,24 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
           end
         end
 
+        context 'but the time zone is blank' do
+          let(:time_zone) { '' }
+
+          describe '#scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+          end
+
+          describe '#partially_scheduled?' do
+            it 'is correct' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
         context 'and a time zone is set' do
           let(:time_zone) { ActiveSupport::TimeZone.new('Alaska') }
 
@@ -327,6 +381,24 @@ describe Chronological::AbsoluteStrategy, :timecop => true do
           chronologicable.should_not be_partially_scheduled
         end
       end
+
+      context 'but the time zone is blank' do
+        let(:time_zone) { '' }
+
+        describe '#scheduled?' do
+          it 'is correct' do
+            chronologicable_without_enabled_time_zone.should_not be_scheduled
+            chronologicable_with_enabled_time_zone.should_not be_scheduled
+          end
+        end
+
+        describe '#partially_scheduled?' do
+          it 'is correct' do
+            chronologicable_without_enabled_time_zone.should_not be_partially_scheduled
+            chronologicable_with_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
+      end
     end
 
     context 'when there is a chronologicable that has already started' do

data/spec/strategies/base_spec.rb

@@ -234,7 +234,7 @@ describe Chronological::BaseStrategy do
     end
   end
 
-  describe '#scheduled?' do
+  describe '#scheduled_time_zone' do
     context 'when the time zone option is passed in' do
       let(:field_names) { { time_zone: :time_zone } }
 
@@ -242,7 +242,7 @@ describe Chronological::BaseStrategy do
         let(:fields) { { time_zone: 'Alaska' } }
 
         it 'is the time zone' do
-          strategy.scheduled?(chrono).should eql 'Alaska'
+          strategy.send(:scheduled_time_zone, chrono, true).should eql 'Alaska'
         end
       end
 
@@ -250,7 +250,7 @@ describe Chronological::BaseStrategy do
         let(:fields) { { time_zone: nil } }
 
         it 'is the time zone' do
-          strategy.scheduled?(chrono).should be_nil
+          strategy.send(:scheduled_time_zone, chrono, true).should be_nil
         end
       end
     end
@@ -258,38 +258,8 @@ describe Chronological::BaseStrategy do
     context 'when the time zone option is not passed in' do
       let(:field_names) { Hash.new }
 
-      it 'is always true' do
-        strategy.scheduled?(chrono).should be_true
-      end
-    end
-  end
-
-  describe '#partially_scheduled?' do
-    context 'when the time zone option is passed in' do
-      let(:field_names) { { time_zone: :time_zone } }
-
-      context 'and a time zone exists' do
-        let(:fields) { { time_zone: 'Alaska' } }
-
-        it 'is the time zone' do
-          strategy.partially_scheduled?(chrono).should eql 'Alaska'
-        end
-      end
-
-      context 'and a time zone does not exist' do
-        let(:fields) { { time_zone: nil } }
-
-        it 'is the time zone' do
-          strategy.partially_scheduled?(chrono).should be_nil
-        end
-      end
-    end
-
-    context 'when the time zone option is not passed in' do
-      let(:field_names) { Hash.new }
-
-      it 'is always false' do
-        strategy.partially_scheduled?(chrono).should be_false
+      it 'is equal to the default' do
+        strategy.send(:scheduled_time_zone, chrono, 'blasphemy!').should eql 'blasphemy!'
       end
     end
   end

data/spec/strategies/relative_spec.rb

@@ -9,11 +9,22 @@ class RelativeChronologicable < ActiveRecord::Base
             base_of_offset:   :base_datetime_utc
 end
 
+class RelativeChronologicableWithTimeZone < ActiveRecord::Base
+  extend Chronological
+
+  timeframe type:             :relative,
+            starting_offset:  :starting_offset,
+            ending_offset:    :ending_offset,
+            base_of_offset:   :base_datetime_utc,
+            time_zone:        :time_zone
+end
+
 describe Chronological::RelativeStrategy, :timecop => true do
   let(:now)             { nil }
   let(:starting_offset) { nil }
   let(:ending_offset)   { nil }
   let(:base_time)       { nil }
+  let(:time_zone)       { nil }
 
   let!(:chronologicable) do
     RelativeChronologicable.create(
@@ -22,6 +33,21 @@ describe Chronological::RelativeStrategy, :timecop => true do
       base_datetime_utc:  base_time)
   end
 
+  let!(:chronologicable_without_enabled_time_zone) do
+    RelativeChronologicable.new(
+      starting_offset:    starting_offset,
+      ending_offset:      ending_offset,
+      base_datetime_utc:  base_time)
+  end
+
+  let!(:chronologicable_with_enabled_time_zone) do
+    RelativeChronologicableWithTimeZone.new(
+      starting_offset:    starting_offset,
+      ending_offset:      ending_offset,
+      base_datetime_utc:  base_time,
+      time_zone:          time_zone)
+  end
+
   before { Timecop.freeze(now) }
 
   describe '.by_date' do
@@ -161,12 +187,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is set' do
         let(:ending_offset) { 0 }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -181,12 +271,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is not set' do
         let(:ending_offset) { nil }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -209,12 +363,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'but the ending offset is set' do
         let(:ending_offset) { 0 }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -234,7 +452,7 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is set' do
       let(:ending_offset) { 0 }
 
-      it 'does not have a end time' do
+      it 'does not have an end time' do
         chronologicable.ended_at.should be_nil
       end
     end
@@ -242,7 +460,7 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is not set' do
       let(:ending_offset) { nil }
 
-      it 'does not have a end time' do
+      it 'does not have an end time' do
         chronologicable.ended_at.should be_nil
       end
     end
@@ -251,12 +469,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       let(:starting_offset) { nil }
       let(:ending_offset)   { nil }
 
-      it 'is not scheduled' do
-        chronologicable.should_not be_scheduled
+      context 'when the time zone is not set' do
+        let(:time_zone) { nil }
+
+        context 'and the time zone check is enabled' do
+          it 'is not scheduled' do
+            chronologicable_with_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_with_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
+
+        context 'and the time zone check is not enabled' do
+          it 'is not scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
       end
 
-      it 'is not partially scheduled' do
-        chronologicable.should_not be_partially_scheduled
+      context 'when the time zone is blank' do
+        let(:time_zone) { '' }
+
+        context 'and the time zone check is enabled' do
+          it 'is not scheduled' do
+            chronologicable_with_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_with_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
+
+        context 'and the time zone check is not enabled' do
+          it 'is not scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
+      end
+
+      context 'when the time zone is set' do
+        let(:time_zone) { 'Alaska' }
+
+        context 'and the time zone check is enabled' do
+          it 'is not scheduled' do
+            chronologicable_with_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_with_enabled_time_zone.should be_partially_scheduled
+          end
+        end
+
+        context 'and the time zone check is not enabled' do
+          it 'is not scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_scheduled
+          end
+
+          it 'is partially scheduled' do
+            chronologicable_without_enabled_time_zone.should_not be_partially_scheduled
+          end
+        end
       end
 
       it 'is not included in the in progress list' do
@@ -279,12 +561,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is not set' do
         let(:ending_offset) { nil }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -299,12 +645,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is set' do
         let(:ending_offset)   { 0 }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -327,12 +737,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is not set' do
         let(:ending_offset) { nil }
 
-        it 'is not scheduled' do
-          chronologicable.should_not be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is not included in the in progress list' do
@@ -347,12 +821,76 @@ describe Chronological::RelativeStrategy, :timecop => true do
       context 'and the ending offset is set' do
         let(:ending_offset)   { 0 }
 
-        it 'is scheduled' do
-          chronologicable.should be_scheduled
+        context 'when the time zone is not set' do
+          let(:time_zone) { nil }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+        end
+
+        context 'when the time zone is blank' do
+          let(:time_zone) { '' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should_not be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
-        it 'is partially scheduled' do
-          chronologicable.should be_partially_scheduled
+        context 'when the time zone is set' do
+          let(:time_zone) { 'Alaska' }
+
+          context 'and the time zone check is enabled' do
+            it 'is not scheduled' do
+              chronologicable_with_enabled_time_zone.should be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_with_enabled_time_zone.should be_partially_scheduled
+            end
+          end
+
+          context 'and the time zone check is not enabled' do
+            it 'is not scheduled' do
+              chronologicable_without_enabled_time_zone.should be_scheduled
+            end
+
+            it 'is partially scheduled' do
+              chronologicable_without_enabled_time_zone.should be_partially_scheduled
+            end
+          end
         end
 
         it 'is included in the in progress list' do

data/spec/support/active_record.rb

@@ -15,6 +15,12 @@ ActiveRecord::Base.connection.create_database postgres_connection_options[:datab
 
 ActiveRecord::Base.establish_connection       postgres_connection_options
 
+ActiveRecord::Base.connection.create_table :chronologicable_strategy_classes do |t|
+  t.integer  :starting_offset
+  t.integer  :ending_offset
+  t.datetime :base_of_offset
+end
+
 ActiveRecord::Base.connection.create_table :base_chronologicables do |t|
   t.datetime :started_at
   t.datetime :ended_at
@@ -26,12 +32,19 @@ ActiveRecord::Base.connection.create_table :relative_chronologicables do |t|
   t.datetime :base_datetime_utc
 end
 
+ActiveRecord::Base.connection.create_table :relative_chronologicable_with_time_zones do |t|
+  t.integer  :starting_offset
+  t.integer  :ending_offset
+  t.datetime :base_datetime_utc
+  t.string   :time_zone
+end
+
 ActiveRecord::Base.connection.create_table :absolute_chronologicables do |t|
   t.datetime :started_at_utc
   t.datetime :ended_at_utc
 end
 
-ActiveRecord::Base.connection.create_table :chronologicable_with_time_zones do |t|
+ActiveRecord::Base.connection.create_table :absolute_chronologicable_with_time_zones do |t|
   t.datetime :started_at_utc
   t.datetime :ended_at_utc
   t.string   :time_zone
@@ -39,9 +52,11 @@ end
 
 RSpec.configure do |config|
   config.before(:each) do
+    ActiveRecord::Base.connection.execute 'DELETE FROM chronologicable_strategy_classes'
     ActiveRecord::Base.connection.execute 'DELETE FROM base_chronologicables'
     ActiveRecord::Base.connection.execute 'DELETE FROM relative_chronologicables'
+    ActiveRecord::Base.connection.execute 'DELETE FROM relative_chronologicable_with_time_zones'
     ActiveRecord::Base.connection.execute 'DELETE FROM absolute_chronologicables'
-    ActiveRecord::Base.connection.execute 'DELETE FROM chronologicable_with_time_zones'
+    ActiveRecord::Base.connection.execute 'DELETE FROM absolute_chronologicable_with_time_zones'
   end
 end

metadata

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