chronological 0.0.5 → 0.0.6

data/lib/chronological.rb

@@ -1,118 +1,7 @@
-module Chronological
-  module ClassMethods
-    # TODO: Needs to be able to add a validation option which can do the
-    # typical timeliness validation such as ended_at should be after started_at
-    # and that both should validate timeliness
-    def chronological(options = {})
-      start_time_field            = options[:start_utc] || options[:start]
-      start_date_field            = start_time_field.to_s.gsub(/_at/, '_on')
-      end_time_field              = options[:end_utc]   || options[:end]
-      end_date_field              = end_time_field.to_s.gsub(/_at/, '_on')
-      time_zone                   = options[:time_zone]
-      start_time_field_is_utc     = options.has_key? :start_utc
-      end_time_field_is_utc       = options.has_key? :end_utc
-      start_time_field_utc_suffix = start_time_field_is_utc ? '_utc' : ''
-      end_time_field_utc_suffix   = end_time_field_is_utc ? '_utc' : ''
-
-      define_method(start_date_field) do
-        return nil unless send(start_time_field).respond_to? :to_date
-
-        send(start_time_field).to_date
-      end
-
-      define_method(end_date_field) do
-        return nil unless send(end_time_field).respond_to? :to_date
-
-        send(end_time_field).to_date
-      end
-
-      define_method(:in_progress?) do
-        return false unless send(start_time_field).present? && send(end_time_field).present?
-
-        (send(start_time_field) <= Time.now.utc) && send(end_time_field).future?
-      end
-
-      define_method(:inactive?) do
-        !active?
-      end
-
-      define_method(:scheduled?) do
-        optional_time_zone = !options[:time_zone].nil? ? send(time_zone) : true
-
-        send(start_time_field).present? && send(end_time_field).present? && optional_time_zone
-      end
-
-      define_method(:partially_scheduled?) do
-        optional_time_zone = !options[:time_zone].nil? ? send(time_zone) : false
-
-        send(start_time_field).present? || send(end_time_field).present? || optional_time_zone
-      end
-
-      define_method(:duration) do
-        hours   = (duration_in_seconds / 3600).to_i
-        minutes = ((duration_in_seconds % 3600) / 60).to_i
-        seconds = (duration_in_seconds % 60).to_i
+require 'chronological/version'
+require 'chronological/base'
+require 'chronological/absolute_timeframe'
+require 'chronological/relative_timeframe'
 
-        { :hours => hours, :minutes => minutes, :seconds => seconds }
-      end
-
-      ###
-      # Scopes
-      #
-      self.class.send(:define_method, :by_date) do
-        order "#{table_name}.#{start_time_field} ASC, #{table_name}.#{end_time_field} ASC"
-      end
-
-      self.class.send(:define_method, :by_date_reversed) do
-        order "#{table_name}.#{start_time_field} DESC, #{table_name}.#{end_time_field} DESC"
-      end
-
-      self.class.send(:define_method, :expired) do
-        where("#{end_time_field} <= :now", :now => Time.now.utc)
-      end
-
-      self.class.send(:define_method, :current) do
-        where("#{end_time_field} > :now", :now => Time.now.utc)
-      end
-
-      self.class.send(:define_method, :in_progress) do
-        where("#{start_time_field} <= :now AND #{end_time_field} > :now", :now => Time.now.utc)
-      end
-
-      self.class.send(:define_method, :started) do
-        where("#{start_time_field} <= :now", :now => Time.now.utc)
-      end
-
-      self.class.send(:define_method, :in_progress?) do
-        in_progress.any?
-      end
-
-      instance_eval do
-        alias active? in_progress?
-        alias active  in_progress
-      end
-
-      ###
-      # Aliases
-      #
-      # Aliasing date methods to make code more readable
-      class_eval do
-        alias_attribute   :"starts_at#{start_time_field_utc_suffix}",    start_time_field.to_sym
-        alias_attribute   :"starting_at#{start_time_field_utc_suffix}",  start_time_field.to_sym
-        alias_attribute   :"ends_at#{start_time_field_utc_suffix}",      end_time_field.to_sym
-        alias_attribute   :"ending_at#{start_time_field_utc_suffix}",    end_time_field.to_sym
-
-        alias             active?                                   in_progress?
-      end
-
-    private
-      define_method(:duration_in_seconds) do
-        (send(end_time_field) - send(start_time_field))
-      end
-    end
-  end
-
-  def self.included(base)
-    base.extend ClassMethods
-  end
+module Chronological
 end

data/lib/chronological/absolute_timeframe.rb

@@ -0,0 +1,98 @@
+module Chronological
+  module AbsoluteTimeframe
+    module ClassMethods
+      # TODO: Needs to be able to add a validation option which can do the
+      # typical timeliness validation such as ended_at should be after started_at
+      # and that both should validate timeliness
+      def absolute_timeframe(options = {})
+        start_time_field            = options[:start_utc] || options[:start]
+        start_date_field            = start_time_field.to_s.gsub(/_at/, '_on')
+        end_time_field              = options[:end_utc]   || options[:end]
+        end_date_field              = end_time_field.to_s.gsub(/_at/, '_on')
+        time_zone                   = options[:time_zone]
+        start_time_field_is_utc     = options.has_key? :start_utc
+        end_time_field_is_utc       = options.has_key? :end_utc
+        start_time_field_utc_suffix = start_time_field_is_utc ? '_utc' : ''
+        end_time_field_utc_suffix   = end_time_field_is_utc ? '_utc' : ''
+
+        define_method(:scheduled?) do
+          optional_time_zone = !options[:time_zone].nil? ? send(time_zone) : true
+
+          send(start_time_field).present? && send(end_time_field).present? && optional_time_zone
+        end
+
+        define_method(:partially_scheduled?) do
+          optional_time_zone = !options[:time_zone].nil? ? send(time_zone) : false
+
+          send(start_time_field).present? || send(end_time_field).present? || optional_time_zone
+        end
+
+        ###
+        # Scopes
+        #
+        self.class.send(:define_method, :by_date) do
+          order "#{table_name}.#{start_time_field} ASC, #{table_name}.#{end_time_field} ASC"
+        end
+
+        self.class.send(:define_method, :by_date_reversed) do
+          order "#{table_name}.#{start_time_field} DESC, #{table_name}.#{end_time_field} DESC"
+        end
+
+        self.class.send(:define_method, :expired) do
+          where("#{end_time_field} <= :now", :now => Time.now.utc)
+        end
+
+        self.class.send(:define_method, :current) do
+          where("#{end_time_field} > :now", :now => Time.now.utc)
+        end
+
+        self.class.send(:define_method, :in_progress) do
+          where("#{start_time_field} <= :now AND #{end_time_field} > :now", :now => Time.now.utc)
+        end
+
+        self.class.send(:define_method, :started) do
+          where("#{start_time_field} <= :now", :now => Time.now.utc)
+        end
+
+        self.class.send(:define_method, :in_progress?) do
+          in_progress.any?
+        end
+
+        instance_eval do
+          alias active? in_progress?
+          alias active  in_progress
+        end
+
+        ###
+        # Aliases
+        #
+        # Aliasing date methods to make code more readable
+        class_eval do
+          alias_attribute   :"starts_at#{start_time_field_utc_suffix}",    start_time_field.to_sym
+          alias_attribute   :"starting_at#{start_time_field_utc_suffix}",  start_time_field.to_sym
+          alias_attribute   :"ends_at#{start_time_field_utc_suffix}",      end_time_field.to_sym
+          alias_attribute   :"ending_at#{start_time_field_utc_suffix}",    end_time_field.to_sym
+        end
+
+        base_timeframe  start_date_field: start_date_field,
+                        start_time_field: start_time_field,
+                        end_date_field:   end_date_field,
+                        end_time_field:   end_time_field
+
+      private
+        define_method(:has_absolute_timeframe?) do
+          send(start_time_field).present? && send(end_time_field).present?
+        end
+
+        define_method(:duration_in_seconds) do
+          (send(end_time_field) - send(start_time_field))
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend Chronological::Base
+      base.extend ClassMethods
+    end
+  end
+end

data/lib/chronological/base.rb

@@ -0,0 +1,41 @@
+module Chronological
+  module Base
+    def base_timeframe(options = {})
+      define_method(options[:start_date_field]) do
+        return nil unless send(options[:start_time_field]).respond_to? :to_date
+
+        send(options[:start_time_field]).to_date
+      end
+
+      define_method(options[:end_date_field]) do
+        return nil unless send(options[:end_time_field]).respond_to? :to_date
+
+        send(options[:end_time_field]).to_date
+      end
+
+      define_method(:inactive?) do
+        !active?
+      end
+
+      define_method(:duration) do
+        return Hash.new unless duration_in_seconds.present?
+
+        hours   = (duration_in_seconds / 3600).to_i
+        minutes = ((duration_in_seconds % 3600) / 60).to_i
+        seconds = (duration_in_seconds % 60).to_i
+
+        { :hours => hours, :minutes => minutes, :seconds => seconds }
+      end
+
+      define_method(:in_progress?) do
+        return false unless has_absolute_timeframe?
+
+        (send(options[:start_time_field]) <= Time.now.utc) && send(options[:end_time_field]).future?
+      end
+
+      class_eval do
+        alias active? in_progress?
+      end
+    end
+  end
+end

data/lib/chronological/relative_timeframe.rb

@@ -0,0 +1,57 @@
+module Chronological
+  module RelativeTimeframe
+    module ClassMethods
+      def relative_timeframe(options = {})
+        base_time_field        = options[:base_utc] || options[:base]
+        base_time_field_is_utc = options.has_key? :base_utc
+        time_field_utc_suffix  = base_time_field_is_utc ? 'utc' : nil
+
+        start_time_field       = ['started_at', time_field_utc_suffix].join('_')
+        end_time_field         = ['ended_at',   time_field_utc_suffix].join('_')
+        start_date_field       = ['started_on', time_field_utc_suffix].join('_')
+        end_date_field         = ['ended_on',   time_field_utc_suffix].join('_')
+
+        define_method(start_time_field) do
+          return nil unless send(base_time_field).present? && send(options[:start]).present?
+
+          send(base_time_field) - send(options[:start])
+        end
+
+        define_method(end_time_field) do
+          return nil unless send(base_time_field).present? && send(options[:end]).present?
+
+          send(base_time_field) - send(options[:end])
+        end
+
+        define_method(:scheduled?) do
+          send(base_time_field).present? && send(options[:start]).present? && send(options[:end]).present?
+        end
+
+        define_method(:partially_scheduled?) do
+          send(base_time_field).present? || send(options[:start]).present? || send(options[:end]).present?
+        end
+
+        base_timeframe  start_date_field: start_date_field,
+                        start_time_field: start_time_field,
+                        end_date_field:   end_date_field,
+                        end_time_field:   end_time_field
+
+      private
+        define_method(:has_absolute_timeframe?) do
+          scheduled?
+        end
+
+        define_method(:duration_in_seconds) do
+          return nil unless send(options[:start]).present? && send(options[:end]).present?
+
+          send(options[:start]) - send(options[:end])
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend Chronological::Base
+      base.extend ClassMethods
+    end
+  end
+end

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/{chronological_spec.rb → absolute_timeframe_spec.rb}

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-class Chronologicable < ActiveRecord::Base
-  include Chronological
+class AbsoluteChronologicable < ActiveRecord::Base
+  include Chronological::AbsoluteTimeframe
 
-  chronological :start_utc => :started_at_utc,
-                :end_utc   => :ended_at_utc
+  absolute_timeframe :start_utc => :started_at_utc,
+                     :end_utc   => :ended_at_utc
 end
 
 class ChronologicableWithTimeZone < ActiveRecord::Base
-  include Chronological
+  include Chronological::AbsoluteTimeframe
 
-  chronological :start_utc => :started_at_utc,
-                :end_utc   => :ended_at_utc,
-                :time_zone => :time_zone
+  absolute_timeframe :start_utc => :started_at_utc,
+                     :end_utc   => :ended_at_utc,
+                     :time_zone => :time_zone
 end
 
-describe Chronological, :timecop => true do
+describe Chronological::AbsoluteTimeframe, :timecop => true do
   let(:later) { Time.local(2012, 7, 26, 6, 0, 26) }
   let(:now)   { Time.local(2012, 7, 26, 6, 0, 25) }
   let(:past)  { Time.local(2012, 7, 26, 6, 0, 24) }
@@ -23,13 +23,13 @@ describe Chronological, :timecop => true do
   before      { Timecop.freeze(now)             }
 
   let(:chronologicable) do
-    Chronologicable.create(
+    AbsoluteChronologicable.create(
       :started_at_utc => start_time,
       :ended_at_utc   => end_time)
   end
 
   let(:chronologicable_without_enabled_time_zone) do
-    Chronologicable.new(
+    AbsoluteChronologicable.new(
       :started_at_utc => start_time,
       :ended_at_utc   => end_time)
   end
@@ -41,50 +41,50 @@ describe Chronological, :timecop => true do
       :time_zone      => time_zone)
   end
 
-  it { Chronologicable.new.respond_to?(:starts_at_utc).should   be_true }
-  it { Chronologicable.new.respond_to?(:starting_at_utc).should be_true }
-  it { Chronologicable.new.respond_to?(:ends_at_utc).should     be_true }
-  it { Chronologicable.new.respond_to?(:ending_at_utc).should   be_true }
-  it { Chronologicable.new.respond_to?(:active?).should         be_true }
+  it { AbsoluteChronologicable.new.respond_to?(:starts_at_utc).should   be_true }
+  it { AbsoluteChronologicable.new.respond_to?(:starting_at_utc).should be_true }
+  it { AbsoluteChronologicable.new.respond_to?(:ends_at_utc).should     be_true }
+  it { AbsoluteChronologicable.new.respond_to?(:ending_at_utc).should   be_true }
+  it { AbsoluteChronologicable.new.respond_to?(:active?).should         be_true }
 
-  it { Chronologicable.respond_to?(:active?).should             be_true }
-  it { Chronologicable.respond_to?(:active).should              be_true }
+  it { AbsoluteChronologicable.respond_to?(:active?).should             be_true }
+  it { AbsoluteChronologicable.respond_to?(:active).should              be_true }
 
   context 'when there are two chronologicables that start at the same time' do
     context 'but end at different times' do
-      let!(:chronologicable_1) { Chronologicable.create :started_at_utc => past, :ended_at_utc => past }
-      let!(:chronologicable_2) { Chronologicable.create :started_at_utc => past, :ended_at_utc => now }
+      let!(:chronologicable_1) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => past }
+      let!(:chronologicable_2) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => now }
 
       describe '.by_date' do
         it 'properly sorts them' do
-          Chronologicable.by_date.first.should  eql chronologicable_1
-          Chronologicable.by_date.last.should   eql chronologicable_2
+          AbsoluteChronologicable.by_date.first.should  eql chronologicable_1
+          AbsoluteChronologicable.by_date.last.should   eql chronologicable_2
         end
       end
 
       describe '.by_date_reversed' do
         it 'sorts them backwards by the start date' do
-          Chronologicable.by_date_reversed.first.should  eql chronologicable_2
-          Chronologicable.by_date_reversed.last.should   eql chronologicable_1
+          AbsoluteChronologicable.by_date_reversed.first.should  eql chronologicable_2
+          AbsoluteChronologicable.by_date_reversed.last.should   eql chronologicable_1
         end
       end
     end
 
     context 'and end at the same time' do
-      let!(:chronologicable_1) { Chronologicable.create :started_at_utc => past, :ended_at_utc => now }
-      let!(:chronologicable_2) { Chronologicable.create :started_at_utc => past, :ended_at_utc => now }
+      let!(:chronologicable_1) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => now }
+      let!(:chronologicable_2) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => now }
 
       describe '.by_date' do
         it 'does not matter what order they are in as long as they are all there' do
-          Chronologicable.by_date.should  include chronologicable_1
-          Chronologicable.by_date.should  include chronologicable_2
+          AbsoluteChronologicable.by_date.should  include chronologicable_1
+          AbsoluteChronologicable.by_date.should  include chronologicable_2
         end
       end
 
       describe '.by_date_reversed' do
         it 'does not matter what order they are in as long as they are all there' do
-          Chronologicable.by_date.should  include chronologicable_1
-          Chronologicable.by_date.should  include chronologicable_2
+          AbsoluteChronologicable.by_date.should  include chronologicable_1
+          AbsoluteChronologicable.by_date.should  include chronologicable_2
         end
       end
     end
@@ -92,84 +92,44 @@ describe Chronological, :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) { Chronologicable.create :started_at_utc => past, :ended_at_utc => now }
-      let!(:chronologicable_2) { Chronologicable.create :started_at_utc => now,  :ended_at_utc => later }
+      let!(:chronologicable_1) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => now }
+      let!(:chronologicable_2) { AbsoluteChronologicable.create :started_at_utc => now,  :ended_at_utc => later }
 
       describe '.by_date' do
         it 'sorts them by the start date' do
-          Chronologicable.by_date.first.should  eql chronologicable_1
-          Chronologicable.by_date.last.should   eql chronologicable_2
+          AbsoluteChronologicable.by_date.first.should  eql chronologicable_1
+          AbsoluteChronologicable.by_date.last.should   eql chronologicable_2
         end
       end
 
       describe '.by_date_reversed' do
         it 'sorts them backwards by the start date' do
-          Chronologicable.by_date_reversed.first.should  eql chronologicable_2
-          Chronologicable.by_date_reversed.last.should   eql chronologicable_1
+          AbsoluteChronologicable.by_date_reversed.first.should  eql chronologicable_2
+          AbsoluteChronologicable.by_date_reversed.last.should   eql chronologicable_1
         end
       end
     end
 
     context 'but end at the same time' do
-      let!(:chronologicable_1) { Chronologicable.create :started_at_utc => past, :ended_at_utc => later }
-      let!(:chronologicable_2) { Chronologicable.create :started_at_utc => now,  :ended_at_utc => later }
+      let!(:chronologicable_1) { AbsoluteChronologicable.create :started_at_utc => past, :ended_at_utc => later }
+      let!(:chronologicable_2) { AbsoluteChronologicable.create :started_at_utc => now,  :ended_at_utc => later }
 
       describe '.by_date' do
         it 'sorts them by the start date' do
-          Chronologicable.by_date.first.should  eql chronologicable_1
-          Chronologicable.by_date.last.should   eql chronologicable_2
+          AbsoluteChronologicable.by_date.first.should  eql chronologicable_1
+          AbsoluteChronologicable.by_date.last.should   eql chronologicable_2
         end
       end
 
       describe '.by_date_reversed' do
         it 'sorts them backwards by the start date' do
-          Chronologicable.by_date_reversed.first.should  eql chronologicable_2
-          Chronologicable.by_date_reversed.last.should   eql chronologicable_1
+          AbsoluteChronologicable.by_date_reversed.first.should  eql chronologicable_2
+          AbsoluteChronologicable.by_date_reversed.last.should   eql chronologicable_1
         end
       end
     end
   end
 
-  describe '#started_on_utc' do
-    context 'when the date field is set to a string' do
-      let(:start_time) { '2012-07-26 03:15:12' }
-      let(:end_time)   { nil }
-
-      it 'properly converts the date' do
-        chronologicable.started_on_utc.should eql Time.utc(2012, 7, 26, 3, 15, 12).to_date
-      end
-    end
-
-    context 'when the date field is set to a date' do
-      let(:start_time) { Time.utc(2012, 7, 26, 3, 15, 12) }
-      let(:end_time)   { nil }
-
-      it 'properly converts the date' do
-        chronologicable.started_on_utc.should eql Time.utc(2012, 7, 26, 3, 15, 12).to_date
-      end
-    end
-  end
-
-  describe '#ended_on_utc' do
-    context 'when the date field is set to a string' do
-      let(:start_time)  { nil }
-      let(:end_time)    { '2012-07-26 03:15:12' }
-
-      it 'properly converts the date' do
-        chronologicable.ended_on_utc.should eql Time.utc(2012, 7, 26, 3, 15, 12).to_date
-      end
-    end
-
-    context 'when the date field is set to a date' do
-      let(:start_time)  { nil }
-      let(:end_time)    { Time.utc(2012, 7, 26, 3, 15, 12) }
-
-      it 'properly converts the date' do
-        chronologicable.ended_on_utc.should eql Time.utc(2012, 7, 26, 3, 15, 12).to_date
-      end
-    end
-  end
-
   context 'when a start time is set' do
     let(:start_time) { Time.now }
 
@@ -333,40 +293,34 @@ describe Chronological, :timecop => true do
     context 'and has already ended' do
       let(:end_time) { past }
 
-      describe '#in_progress?' do
-        it 'is false' do
-          chronologicable.should_not be_in_progress
-        end
-      end
-
       describe '.in_progress?' do
         it 'is false' do
           chronologicable
-          Chronologicable.should_not be_in_progress
+          AbsoluteChronologicable.should_not be_in_progress
         end
       end
 
       describe '.expired' do
         it 'includes that chronologicable' do
-          Chronologicable.expired.should include chronologicable
+          AbsoluteChronologicable.expired.should include chronologicable
         end
       end
 
       describe '.started' do
         it 'includes that chronologicable' do
-          Chronologicable.started.should include chronologicable
+          AbsoluteChronologicable.started.should include chronologicable
         end
       end
 
       describe '.current' do
         it 'does not include that chronologicable' do
-          Chronologicable.current.should_not include chronologicable
+          AbsoluteChronologicable.current.should_not include chronologicable
         end
       end
 
       describe '.in_progress' do
         it 'does not include that chronologicable' do
-          Chronologicable.in_progress.should_not include chronologicable
+          AbsoluteChronologicable.in_progress.should_not include chronologicable
         end
       end
     end
@@ -374,40 +328,34 @@ describe Chronological, :timecop => true do
     context 'and ends now' do
       let(:end_time) { now }
 
-      describe '#in_progress?' do
-        it 'is false' do
-          chronologicable.should_not be_in_progress
-        end
-      end
-
       describe '.in_progress?' do
         it 'is false' do
           chronologicable
-          Chronologicable.should_not be_in_progress
+          AbsoluteChronologicable.should_not be_in_progress
         end
       end
 
       describe '.expired' do
         it 'does include that chronologicable' do
-          Chronologicable.expired.should include chronologicable
+          AbsoluteChronologicable.expired.should include chronologicable
         end
       end
 
       describe '.started' do
         it 'includes that chronologicable' do
-          Chronologicable.started.should include chronologicable
+          AbsoluteChronologicable.started.should include chronologicable
         end
       end
 
       describe '.current' do
         it 'does not include that chronologicable' do
-          Chronologicable.current.should_not include chronologicable
+          AbsoluteChronologicable.current.should_not include chronologicable
         end
       end
 
       describe '.in_progress' do
         it 'does not include that chronologicable' do
-          Chronologicable.in_progress.should_not include chronologicable
+          AbsoluteChronologicable.in_progress.should_not include chronologicable
         end
       end
     end
@@ -415,40 +363,34 @@ describe Chronological, :timecop => true do
     context 'and ends later' do
       let(:end_time) { later }
 
-      describe '#in_progress?' do
-        it 'is true' do
-          chronologicable.should be_in_progress
-        end
-      end
-
       describe '.in_progress?' do
         it 'is true' do
           chronologicable
-          Chronologicable.should be_in_progress
+          AbsoluteChronologicable.should be_in_progress
         end
       end
 
       describe '.expired' do
         it 'does not include that chronologicable' do
-          Chronologicable.expired.should_not include chronologicable
+          AbsoluteChronologicable.expired.should_not include chronologicable
         end
       end
 
       describe '.started' do
         it 'includes that chronologicable' do
-          Chronologicable.started.should include chronologicable
+          AbsoluteChronologicable.started.should include chronologicable
         end
       end
 
       describe '.current' do
         it 'includes that chronologicable' do
-          Chronologicable.current.should include chronologicable
+          AbsoluteChronologicable.current.should include chronologicable
         end
       end
 
       describe '.in_progress' do
         it 'includes that chronologicable' do
-          Chronologicable.in_progress.should include chronologicable
+          AbsoluteChronologicable.in_progress.should include chronologicable
         end
       end
     end
@@ -460,40 +402,34 @@ describe Chronological, :timecop => true do
     context 'and ends now' do
       let(:end_time) { now }
 
-      describe '#in_progress?' do
-        it 'is false' do
-          chronologicable.should_not be_in_progress
-        end
-      end
-
       describe '.in_progress?' do
         it 'is false' do
           chronologicable
-          Chronologicable.should_not be_in_progress
+          AbsoluteChronologicable.should_not be_in_progress
         end
       end
 
       describe '.expired' do
         it 'does include that chronologicable' do
-          Chronologicable.expired.should include chronologicable
+          AbsoluteChronologicable.expired.should include chronologicable
         end
       end
 
       describe '.started' do
         it 'includes that chronologicable' do
-          Chronologicable.started.should include chronologicable
+          AbsoluteChronologicable.started.should include chronologicable
         end
       end
 
       describe '.current' do
         it 'does not include that chronologicable' do
-          Chronologicable.current.should_not include chronologicable
+          AbsoluteChronologicable.current.should_not include chronologicable
         end
       end
 
       describe '.in_progress' do
         it 'does not include that chronologicable' do
-          Chronologicable.in_progress.should_not include chronologicable
+          AbsoluteChronologicable.in_progress.should_not include chronologicable
         end
       end
     end
@@ -501,40 +437,34 @@ describe Chronological, :timecop => true do
     context 'and ends later' do
       let(:end_time) { later }
 
-      describe '#in_progress?' do
-        it 'is true' do
-          chronologicable.should be_in_progress
-        end
-      end
-
       describe '.in_progress?' do
         it 'is true' do
           chronologicable
-          Chronologicable.should be_in_progress
+          AbsoluteChronologicable.should be_in_progress
         end
       end
 
       describe '.expired' do
         it 'does not include that chronologicable' do
-          Chronologicable.expired.should_not include chronologicable
+          AbsoluteChronologicable.expired.should_not include chronologicable
         end
       end
 
       describe '.started' do
         it 'includes that chronologicable' do
-          Chronologicable.started.should include chronologicable
+          AbsoluteChronologicable.started.should include chronologicable
         end
       end
 
       describe '.current' do
         it 'includes that chronologicable' do
-          Chronologicable.current.should include chronologicable
+          AbsoluteChronologicable.current.should include chronologicable
         end
       end
 
       describe '.in_progress' do
         it 'includes that chronologicable' do
-          Chronologicable.in_progress.should include chronologicable
+          AbsoluteChronologicable.in_progress.should include chronologicable
         end
       end
     end
@@ -544,110 +474,34 @@ describe Chronological, :timecop => true do
     let(:start_time) { later }
     let(:end_time)   { later }
 
-    describe '#in_progress?' do
-      it 'is false' do
-        chronologicable.should_not be_in_progress
-      end
-    end
-
     describe '.in_progress?' do
       it 'is false' do
         chronologicable
-        Chronologicable.should_not be_in_progress
+        AbsoluteChronologicable.should_not be_in_progress
       end
     end
 
     describe '.expired' do
       it 'does not include that chronologicable' do
-        Chronologicable.expired.should_not include chronologicable
+        AbsoluteChronologicable.expired.should_not include chronologicable
       end
     end
 
     describe '.started' do
       it 'does not include that chronologicable' do
-        Chronologicable.started.should_not include chronologicable
+        AbsoluteChronologicable.started.should_not include chronologicable
       end
     end
 
     describe '.current' do
       it 'includes that chronologicable' do
-        Chronologicable.current.should include chronologicable
+        AbsoluteChronologicable.current.should include chronologicable
       end
     end
 
     describe '.in_progress' do
       it 'does not include that chronologicable' do
-        Chronologicable.in_progress.should_not include chronologicable
-      end
-    end
-  end
-
-  describe '#duration' do
-    context 'when the chronologicable represents something with a complex time duration' do
-      let(:start_time) { Time.local(2012, 7, 26, 14, 13, 16) }
-      let(:end_time)   { Time.local(2012, 7, 26, 15, 57, 39) }
-
-      it 'is a hash with the correct hours' do
-        chronologicable.duration[:hours].should eql 1
-      end
-
-      it 'is a hash with the correct minutes' do
-        chronologicable.duration[:minutes].should eql 44
-      end
-
-      it 'is a hash with the correct seconds' do
-        chronologicable.duration[:seconds].should eql 23
-      end
-    end
-
-    context 'when the chronologicable represents something with an even second time duration' do
-      let(:start_time) { Time.local(2012, 7, 26, 14, 13, 16) }
-      let(:end_time)   { Time.local(2012, 7, 26, 15, 57, 16) }
-
-      it 'is a hash with the correct hours' do
-        chronologicable.duration[:hours].should eql 1
-      end
-
-      it 'is a hash with the correct minutes' do
-        chronologicable.duration[:minutes].should eql 44
-      end
-
-      it 'is a hash with the correct seconds' do
-        chronologicable.duration[:seconds].should eql 0
-      end
-    end
-
-    context 'when the chronologicable represents something with an even minute time duration' do
-      let(:start_time) { Time.local(2012, 7, 26, 14, 13, 16) }
-      let(:end_time)   { Time.local(2012, 7, 26, 15, 13, 16) }
-
-      it 'is a hash with the correct hours' do
-        chronologicable.duration[:hours].should eql 1
-      end
-
-      it 'is a hash with the correct minutes' do
-        chronologicable.duration[:minutes].should eql 0
-      end
-
-      it 'is a hash with the correct seconds' do
-        chronologicable.duration[:seconds].should eql 0
-      end
-    end
-
-    context 'when the chronologicable represents something with a zero duration' do
-      let(:start_time) { Time.local(2012, 7, 26, 14, 13, 16) }
-      let(:end_time)   { Time.local(2012, 7, 26, 14, 13, 16) }
-
-      it 'is a hash with the correct hours' do
-        chronologicable.duration[:hours].should eql 0
-      end
-
-      it 'is a hash with the correct minutes' do
-        chronologicable.duration[:minutes].should eql 0
-      end
-
-      it 'is a hash with the correct seconds' do
-        chronologicable.duration[:seconds].should eql 0
+        AbsoluteChronologicable.in_progress.should_not include chronologicable
       end
     end
   end