schedular 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/lib/schedular/time.rb

@@ -10,15 +10,23 @@ module Schedular
     named_scope :joins_events,   :joins   => :events
     named_scope :include_events, :include => :events
     named_scope :order_by_value, :order => 'value asc'
-    
+
+    named_scope :by_event, lambda { |event|
+      { :conditions => {:'schedular_events.id' => event}} 
+    }
+
     named_scope :by_time_or_period, lambda{ |time|
       time = Range === time || DateTime === time ? time : (time..time+1)
       { :conditions => {:value => time} }
     }
 
     named_scope :order_by_closest_to, lambda { |date|
-      {:limit => count, :order => "ABS(strftime('%s', value) - strftime('%s', #{date.to_formatted_s :db})) desc"}
+      {:order => %{ABS(strftime('%s', "#{date.to_formatted_s(:db)}") - strftime('%s', value)) asc} }
     }
+
+    # named_scope :order_by_following_closest_to, lambda { |date|
+    #   {:order => %{(strftime('%s', "#{date.to_formatted_s(:db)}") - strftime('%s', value))  asc} }
+    # }
     
     named_scope :all_day, lambda{ |bool| {:conditions => {'all_day' => (bool.nil? ? true : bool)} }}
     

data/test/test_event.rb

@@ -100,10 +100,6 @@ class Schedular::EventTest < Test::Unit::TestCase
       should 'find by params with no year' do
         assert_equal Schedular::Event.find(:all), Schedular::Event.by_params(:year => nil)
       end
-
-      should 'find closest prior date' do
-        assert_equal Schedular::Time.by_time_or_period(Date.civil(2010, 1, -1)), Schedular::Event.closest_dates(Date.civil(2010, 3), 1)
-      end
     end
   
     should 'allways order times by value' do

data/test/test_time.rb

@@ -71,10 +71,32 @@ class Schedular::TimeTest < Test::Unit::TestCase
         day = Date.civil(2010, 3, 2)
         assert_equal Schedular::Time.by_time_or_period(day..day + 1), Schedular::Time.by_params(:year => '2010', :month => '3', :day => '2')
       end
+    end
+
+    context 'scopes' do
+      setup do
+        Schedular::Event.destroy_all
+        @jan1_10am = Schedular::Time.create! :value => DateTime.civil(2010, 1, 1, 10), :duration => 60, :all_day => false
+        @jan1      = Schedular::Time.create! :value => DateTime.civil(2010, 1, 1), :all_day => true
+        @jan3      = Schedular::Time.create! :value => DateTime.civil(2010, 1, 3), :all_day => true
+        @jan3_10am = Schedular::Time.create! :value => DateTime.civil(2010, 1, 3, 10), :duration => 60, :all_day => false
+      end
 
-      should 'find closest' do
-        assert_equal Schedular::Time.by_time_or_period(Date.civil(2010, 2, -1)), Schedular::Time.closest_to(Date.civil(2010, 3), 1)
+      should 'order by closest to' do
+        assert_equal [@jan1_10am, @jan1, @jan3, @jan3_10am], Schedular::Time.order_by_closest_to(DateTime.civil(2010, 1, 2))
       end
+
+      should 'find by event' do
+        event = Schedular::Event.create! :name => 'evento', :dates => '1 de diciembre del 2009'
+        event.times = [@jan1]
+        assert_equal  [@jan1], event.times
+        assert_equal  [@jan1], Schedular::Time.joins_events.by_event(event)
+        assert_equal  [@jan1], Schedular::Time.joins_events.by_event(event.id)
+      end
+
+      # should 'order by following closest to' do
+      #   assert_equal [@jan3, @jan3_10am, @jan1_10am, @jan1], Schedular::Time.order_by_following_closest_to(DateTime.civil(2010, 1, 2))
+      # end
     end
   
     should 'allways order by value' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schedular
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Macario Ortega
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2010-11-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency