chronological 1.0.0beta2 → 1.0.0beta3

data/README.md

@@ -227,20 +227,18 @@ these accessors:
   * `started_on`
   * `ended_on`
 
-If you want to override these values, simply pass in the
-`absolute_start_date_field`, `absolute_end_date_field`,
-`absolute_start_time_field` and/or `absolute_end_time_field` options to
-`timeframe` like so:
+If you want to override the fields that Chronological creates to access those
+values, simply pass in the option with the name of the field you would like.
 
 #### Example
 
 ```ruby
 class MyTimeRangeClass
-  timeframe :base_of_offset             => :event_start_time,
-            :starting_offset            => :starting_availability_offset
-            :ending_offset              => :ending_availability_offset,
-            :absolute_start_time_field  => :starting_time
-            :absolute_end_time_field    => :ending_time
+  timeframe :base_of_offset  => :event_start_time,
+            :starting_offset => :starting_availability_offset
+            :ending_offset   => :ending_availability_offset,
+            :starting_time   => :custom_start_field
+            :ending_time     => :custom_end_field
 end
 ```
 

data/lib/chronological/version.rb

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

data/lib/chronological.rb

@@ -9,10 +9,10 @@ module Chronological
     strategy = Chronological::StrategyResolver.resolve(options)
 
     class_eval do
-      columns_hash[strategy.field_names[:starting_time]] ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:starting_time], nil, 'datetime')
-      columns_hash[strategy.field_names[:ending_time]]   ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:ending_time],   nil, 'datetime')
-      columns_hash[strategy.field_names[:starting_date]] ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:starting_date], nil, 'date')
-      columns_hash[strategy.field_names[:ending_date]]   ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:ending_date],   nil, 'date')
+      columns_hash[strategy.field_names[:starting_time].to_s] ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:starting_time], nil, 'datetime')
+      columns_hash[strategy.field_names[:ending_time].to_s]   ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:ending_time],   nil, 'datetime')
+      columns_hash[strategy.field_names[:starting_date].to_s] ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:starting_date], nil, 'date')
+      columns_hash[strategy.field_names[:ending_date].to_s]   ||= ActiveRecord::ConnectionAdapters::Column.new(strategy.field_names[:ending_date],   nil, 'date')
     end
 
     unless strategy.has_absolute_start?

data/spec/chronological_spec.rb

@@ -38,19 +38,19 @@ describe Chronological do
       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
+        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
+        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
+        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
+        ChronologicableStrategyClass.columns_hash['ended_on'].type.should eql :date
       end
     end
 

data/spec/strategies/relative_spec.rb

@@ -19,6 +19,21 @@ class RelativeChronologicableWithTimeZone < ActiveRecord::Base
             time_zone:        :time_zone
 end
 
+class RelativeChronologicalWithOverriddenTime < ActiveRecord::Base
+  extend Chronological
+
+  set_table_name 'relative_chronologicables'
+
+  timeframe type:             :relative,
+            starting_offset:  :starting_offset,
+            ending_offset:    :ending_offset,
+            base_of_offset:   :base_datetime_utc,
+            starting_time:    :foobar_starting_time,
+            ending_time:      :foobar_ending_time,
+            starting_date:    :foobar_starting_date,
+            ending_date:      :foobar_ending_date
+end
+
 describe Chronological::RelativeStrategy, :timecop => true do
   let(:now)             { nil }
   let(:starting_offset) { nil }
@@ -48,6 +63,15 @@ describe Chronological::RelativeStrategy, :timecop => true do
       time_zone:          time_zone)
   end
 
+  let(:chronologicable_with_overridden_time) do
+    RelativeChronologicalWithOverriddenTime.new
+  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) }
+  it { chronologicable_with_overridden_time.should respond_to(:foobar_ending_date)   }
+
   before { Timecop.freeze(now) }
 
   describe '.by_date' do

metadata

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