chronological 1.0.0beta7 → 1.0.0beta8

data/README.md

@@ -242,6 +242,9 @@ class MyTimeRangeClass
 end
 ```
 
+_Note: The `:base_of_offset` option can be anything that has accessor
+methods for the field._
+
 ### Advanced Method Usage
 
 --------------------------------------------------------------------------------

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '1.0.0beta7'
+  VERSION = '1.0.0beta8'
 end

data/lib/chronological.rb

@@ -15,9 +15,12 @@ module Chronological
       columns_hash[strategy.field_names[:ending_date].to_s]   ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:ending_date],   nil, 'date')
     end
 
+    # TODO: Once we implement anonymous modules in Greenwich and Chronological, then
+    # we can call `super` here which would call Greenwich which would convert the
+    # time over to UTC.
     if strategy.has_absolute_start?
       define_method(strategy.field_names[:starting_time]) do |*args|
-        super()
+        super().try(:utc)
       end
     else
       define_method(strategy.field_names[:starting_time]) do |*args|
@@ -27,9 +30,12 @@ module Chronological
       end
     end
 
+    # TODO: Once we implement anonymous modules in Greenwich and Chronological, then
+    # we can call `super` here which would call Greenwich which would convert the
+    # time over to UTC.
     if strategy.has_absolute_end?
       define_method(strategy.field_names[:ending_time]) do |*args|
-        super()
+        super().try(:utc)
       end
     else
       define_method(strategy.field_names[:ending_time]) do |*args|

data/spec/strategies/relative_spec.rb

@@ -34,6 +34,17 @@ class RelativeChronologicalWithOverriddenTime < ActiveRecord::Base
             ending_date:      :foobar_ending_date
 end
 
+class RelativeChronologicableWithDynamicBase < ActiveRecord::Base
+  extend Chronological
+
+  timeframe type:             :relative,
+            starting_offset:  :starting_offset,
+            ending_offset:    :ending_offset,
+            base_of_offset:   :base_datetime_utc
+
+  attr_accessor :base_datetime_utc
+end
+
 describe Chronological::RelativeStrategy, :timecop => true do
   let(:now)             { nil }
   let(:starting_offset) { nil }
@@ -67,6 +78,14 @@ describe Chronological::RelativeStrategy, :timecop => true do
     RelativeChronologicalWithOverriddenTime.new
   end
 
+  let(:chronologicable_with_dynamic_base) do
+    RelativeChronologicableWithDynamicBase.new(
+      starting_offset:    starting_offset,
+      ending_offset:      ending_offset,
+      base_datetime_utc:  base_time
+    )
+  end
+
   it { chronologicable_with_overridden_time.should respond_to(:foobar_starting_time) }
   it { chronologicable_with_overridden_time.should respond_to(:foobar_ending_time)   }
   it { chronologicable_with_overridden_time.should respond_to(:foobar_starting_date) }
@@ -122,7 +141,7 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'when there are two chronologicables that start at different times' do
       context 'and end at different times' do
         let!(:chronologicable_1) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 3, :ending_offset => 2) }
-        let!(:chronologicable_2) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 2,  :ending_offset => 1) }
+        let!(:chronologicable_2) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 2, :ending_offset => 1) }
 
         context 'when in ascending order' do
           it 'sorts them by the start date' do
@@ -141,7 +160,7 @@ describe Chronological::RelativeStrategy, :timecop => true do
 
       context 'but end at the same time' do
         let!(:chronologicable_1) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 3, :ending_offset => 1) }
-        let!(:chronologicable_2) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 2,  :ending_offset => 1) }
+        let!(:chronologicable_2) { RelativeChronologicable.create(:base_datetime_utc => Time.now, :starting_offset => 2, :ending_offset => 1) }
 
         context 'when in ascending order' do
           it 'sorts them by the start date' do
@@ -376,6 +395,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
         end
       end
 
+      it 'does not have a start time when the base is dynamic' do
+        chronologicable_with_dynamic_base.started_at.should be_nil
+      end
+
       it 'does not have a start time when called directly' do
         chronologicable.started_at.should be_nil
       end
@@ -472,6 +495,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
         end
       end
 
+      it 'does not have a start time when the base is dynamic' do
+        chronologicable_with_dynamic_base.started_at.should be_nil
+      end
+
       it 'does not have a start time when called directly' do
         chronologicable.started_at.should be_nil
       end
@@ -484,6 +511,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is set' do
       let(:ending_offset) { 0 }
 
+      it 'does not have an end time when the base is dynamic' do
+        chronologicable_with_dynamic_base.ended_at.should be_nil
+      end
+
       it 'does not have an end time when called directly' do
         chronologicable.ended_at.should be_nil
       end
@@ -496,6 +527,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is not set' do
       let(:ending_offset) { nil }
 
+      it 'does not have an end time when the base is dynamic' do
+        chronologicable_with_dynamic_base.ended_at.should be_nil
+      end
+
       it 'does not have an end time when called directly' do
         chronologicable.ended_at.should be_nil
       end
@@ -766,6 +801,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
         end
       end
 
+      it 'does not have a start time when the base is dynamic' do
+        chronologicable_with_dynamic_base.started_at.should be_nil
+      end
+
       it 'does not have a start time when called directly' do
         chronologicable.started_at.should be_nil
       end
@@ -946,6 +985,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
         end
       end
 
+      it 'calculates the correct start time when the base is dynamic' do
+        chronologicable_with_dynamic_base.started_at.should eql Time.local(2012, 7, 26, 6, 0, 0)
+      end
+
       it 'calculates the correct start time when called directly' do
         chronologicable.started_at.should eql Time.local(2012, 7, 26, 6, 0, 0)
       end
@@ -958,6 +1001,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is set' do
       let(:ending_offset) { 30 }
 
+      it 'calculates the correct end time when the base is dynamic' do
+        chronologicable_with_dynamic_base.ended_at.should eql Time.local(2012, 7, 26, 6, 0, 0)
+      end
+
       it 'calculates the correct end time when called directly' do
         chronologicable.ended_at.should eql Time.local(2012, 7, 26, 6, 0, 0)
       end
@@ -970,6 +1017,10 @@ describe Chronological::RelativeStrategy, :timecop => true do
     context 'and the ending offset is not set' do
       let(:ending_offset) { nil }
 
+      it 'does not have an end time when the base is dynamic' do
+        chronologicable_with_dynamic_base.ended_at.should be_nil
+      end
+
       it 'does not have a end time when called directly' do
         chronologicable.ended_at.should be_nil
       end

data/spec/support/active_record.rb

@@ -50,12 +50,18 @@ ActiveRecord::Base.connection.create_table :absolute_chronologicable_with_time_z
   t.string   :time_zone
 end
 
+ActiveRecord::Base.connection.create_table :relative_chronologicable_with_dynamic_bases do |t|
+  t.integer  :starting_offset
+  t.integer  :ending_offset
+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 relative_chronologicable_with_dynamic_bases'
     ActiveRecord::Base.connection.execute 'DELETE FROM absolute_chronologicables'
     ActiveRecord::Base.connection.execute 'DELETE FROM absolute_chronologicable_with_time_zones'
   end

metadata

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