chronological 1.0.0beta9 → 1.0.0beta10

data/lib/chronological/strategies/absolute.rb

@@ -40,7 +40,8 @@ module Chronological
     end
 
     def has_absolute_timeframe?(object)
-      object.send(field_names[:starting_time]).present? && object.send(field_names[:ending_time]).present?
+      object.send(field_names[:starting_time]).present? &&
+      object.send(field_names[:ending_time]).present?
     end
   end
 end

data/lib/chronological/strategies/base.rb

@@ -53,15 +53,15 @@ module Chronological
     def in_progress?(object)
       return false unless has_absolute_timeframe?(object)
 
-      (object.send(field_names[:starting_time]) <= Time.now.utc) && object.send(field_names[:ending_time]).future?
+      started?(object) && !ended?(object)
     end
 
-    def started?(object, options = {})
-      Time.now >= object.send(field_names[:starting_time], options)
+    def started?(object, *args)
+      Time.now.utc >= object.send(field_names[:starting_time], *args)
     end
 
-    def ended?(object, options = {})
-      Time.now >= object.send(field_names[:ending_time], options)
+    def ended?(object, *args)
+      Time.now.utc >= object.send(field_names[:ending_time], *args)
     end
 
     def not_yet_ended?(object, options = {})

data/lib/chronological/strategies/duration_from_start.rb

@@ -20,14 +20,6 @@ module Chronological
       scheduled_time_zone(object, false).present?
     end
 
-    def self.in_progress(object, field_names)
-      object.all.select(&:in_progress?)
-    end
-
-    def self.in_progress?(object, field_names)
-      object.all.any?(&:in_progress?)
-    end
-
     def has_absolute_start?
       true
     end
@@ -56,7 +48,8 @@ module Chronological
     end
 
     def has_absolute_timeframe?(object)
-      object.scheduled?
+      object.send(field_names[:starting_time]).present? &&
+      object.send(field_names[:duration]).present?
     end
   end
 end

data/lib/chronological/strategies/relative.rb

@@ -30,14 +30,6 @@ module Chronological
       scheduled_time_zone(object, false).present?
     end
 
-    def self.in_progress(object, field_names)
-      object.all.select(&:in_progress?)
-    end
-
-    def self.in_progress?(object, field_names)
-      object.all.any?(&:in_progress?)
-    end
-
     def has_absolute_start?
       false
     end
@@ -60,13 +52,16 @@ module Chronological
     end
 
     def duration_in_seconds(object)
-      return nil unless object.send(field_names[:starting_offset]).present? && object.send(field_names[:ending_offset]).present?
+      return nil unless object.send(field_names[:starting_offset]).present? &&
+                        object.send(field_names[:ending_offset]).present?
 
       object.send(field_names[:starting_offset]) - object.send(field_names[:ending_offset])
     end
 
     def has_absolute_timeframe?(object)
-      object.scheduled?
+      object.send(field_names[:base_of_offset]).present?  &&
+      object.send(field_names[:starting_offset]).present? &&
+      object.send(field_names[:ending_offset]).present?
     end
   end
 end

data/lib/chronological/version.rb

@@ -1,3 +1,3 @@
 module Chronological
-  VERSION = '1.0.0beta9'
+  VERSION = '1.0.0beta10'
 end

data/spec/strategies/absolute_spec.rb

@@ -382,6 +382,36 @@ describe Chronological::AbsoluteStrategy do
         end
       end
 
+      describe '.started' do
+        it 'is empty' do
+          AbsoluteChronologicable.started.should be_empty
+        end
+      end
+
+      describe '.ended' do
+        it 'is empty' do
+          AbsoluteChronologicable.ended.should be_empty
+        end
+      end
+
+      describe '.not_yet_ended' do
+        it 'is empty' do
+          AbsoluteChronologicable.not_yet_ended.should be_empty
+        end
+      end
+
+      describe '.in_progress' do
+        it 'is empty' do
+          AbsoluteChronologicable.in_progress.should be_empty
+        end
+      end
+
+      describe '.in_progress?' do
+        it 'is false' do
+          AbsoluteChronologicable.should_not be_in_progress
+        end
+      end
+
       context 'but the time zone is blank' do
         let(:time_zone) { '' }
 

metadata

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