schedular 0.1.5 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.7

data/generators/schedular_migrations/templates/schedular_migrations.rb

@@ -10,6 +10,7 @@ class SchedularMigrations < ActiveRecord::Migration
     create_table :schedular_times do |t|
       t.datetime :value
       t.boolean  :all_day
+      t.integer  :duration
       t.timestamps
     end
     

data/lib/schedular/event.rb

@@ -8,7 +8,7 @@ module Schedular
     
     named_scope :all, {}
     named_scope :include_times,     :include => :times
-    named_scope :by_time_or_period, lambda{ |time|
+    named_scope :by_time_or_period, lambda { |time|
       time = Range === time || DateTime === time ? time : (time..time+1)
       {:conditions => {'schedular_times.value' => time}, :include => :times }
     }
@@ -18,9 +18,16 @@ module Schedular
       
       if parsed
         self.times = parsed.map do |time|
+          all_day  = time.class == Date
+          
+          if Range === time
+            duration = ((time.last.to_f - time.first.to_f) / 60).to_i
+            time     = time.first
+          else
+            duration = nil
+          end
           # TODO: This method is soooo uneficient
-          all_day  = !(DateTime === time)
-          Schedular::Time.all_day(all_day).by_time_or_period(time).first || Schedular::Time.new(:value => time, :all_day => all_day)
+          Schedular::Time.by_time_or_period(time).all_day(all_day).duration(duration).first || Schedular::Time.new(:value => time, :all_day => all_day, :duration => duration)
         end
       else
         self.times = []

data/lib/schedular/time.rb

@@ -16,6 +16,10 @@ module Schedular
     
     named_scope :all_day, lambda{ |bool| {:conditions => {'all_day' => (bool.nil? ? true : bool)} }}
     
+    named_scope :duration, lambda{ |duration| {:conditions => {:duration => duration}} }
+    named_scope :duration_less_or_equal, lambda{ |duration| {:conditions => ['duration <= ?', duration]} }
+    named_scope :duration_more_or_equal, lambda{ |duration| {:conditions => ['duration >= ?', duration]} }
+    
     def self.by_params params
       return if params[:year].nil? and params[:month].nil? #TODO: By year
       day = Date.civil params[:year].to_i, params[:month].to_i, (params[:day] || 1).to_i

data/test/support/migrations.rb

@@ -13,6 +13,7 @@ ActiveRecord::Schema.define :version => 1 do
   create_table :schedular_times do |t|
     t.datetime :value
     t.boolean  :all_day
+    t.integer  :duration
   end
   
   create_table :schedular_events_times, :id => false do |t|

data/test/test_event.rb

@@ -10,7 +10,12 @@ class Schedular::EventTest < Test::Unit::TestCase
     subject { @event }
     
     should_validate_presence_of :name
-    # should_validate_presence_of :dates
+    
+    should 'accept time ranges' do
+      @event.dates = '1 de enero del 2010 de las 15:00 a las 16:00 y de las 17:00 a las 19:00'
+      assert_equal [DateTime.civil(2010, 1, 1, 15), DateTime.civil(2010, 1, 1, 17)], @event.times.map(&:value)
+      assert_equal [60, 120], @event.times.map(&:duration)
+    end
     
     should 'not accept bad date' do
       @event.dates = 'bad dates'

data/test/test_partials.rb

@@ -12,6 +12,17 @@ class PartialsTest < ActionView::TestCase
       html = <<-HTML
         <table id="events-calendar">
           <thead>
+            <tr class="links">
+              <th colspan="2">
+                <a href="/events/2009/12">&lt;&lt;</a>
+              </th>
+              <th colspan="3">
+                <a href="/events/2010/1">Ene 2010</a>
+              </th>
+              <th colspan="2">
+                <a href="/events/2010/2">&gt;&gt;</a>
+              </th>
+            </tr>
             <tr><th>dom</th><th>lun</th><th>mar</th><th>mie</th><th>jue</th><th>vie</th><th>sab</th></tr>
           </thead>
           <tbody>
@@ -25,13 +36,24 @@ class PartialsTest < ActionView::TestCase
         </table>
       HTML
 
-      assert_dom_equal html, render('schedular/events/month', :events => [], :year => 2010, :month => 1)
+      assert_dom_equal html, render('schedular/events/calendar', :events => [], :year => 2010, :month => 1)
     end
     
     should 'render day numbers with events' do
       html = <<-HTML
         <table id="events-calendar">
           <thead>
+            <tr class="links">
+              <th colspan="2">
+                <a href="/events/2009/12">&lt;&lt;</a>
+              </th>
+              <th colspan="3">
+                <a href="/events/2010/1">Ene 2010</a>
+              </th>
+              <th colspan="2">
+                <a href="/events/2010/2">&gt;&gt;</a>
+              </th>
+            </tr>
             <tr><th>dom</th><th>lun</th><th>mar</th><th>mie</th><th>jue</th><th>vie</th><th>sab</th></tr>
           </thead>
           <tbody>
@@ -45,7 +67,7 @@ class PartialsTest < ActionView::TestCase
         </table>
       HTML
 
-      assert_dom_equal html, render('schedular/events/month', :events => [@event], :year => 2010, :month => 1)
+      assert_dom_equal html, render('schedular/events/calendar', :events => [@event], :year => 2010, :month => 1)
     end
   end
   

data/test/test_time.rb

@@ -9,28 +9,32 @@ class Schedular::TimeTest < Test::Unit::TestCase
     end
     subject { @time }
 
-    should_have_and_belong_to_many :events
+    should have_and_belong_to_many :events
+
+    should 'validate all day not null'
+
     
     context 'named scopes' do
       setup do
-        @event  = Schedular::Event.create! :dates => '1 de enero 2010 a las 10:00', :name => 'Evento 1'
-        @event2 = Schedular::Event.create! :dates => 'enero y febrero 2010',        :name => 'Evento 2'
+        Schedular::Time.create!  :value => DateTime.civil(2010, 1, 1, 10), :duration => 60,  :all_day => false
+        Schedular::Time.create!  :value => DateTime.civil(2010, 1, 1, 10), :duration => 120, :all_day => false
+        Schedular::Event.create! :dates => 'enero y febrero 2010', :name => 'Evento 2'
       end
 
       should 'have 60 times' do
-        assert_equal 60, Schedular::Time.count
+        assert_equal 61, Schedular::Time.count
       end
 
       should 'find by time or period (Range)' do
-        assert_equal 32, Schedular::Time.by_time_or_period(Date.civil(2010)..Date.civil(2010, 2)).size
+        assert_equal 33, Schedular::Time.by_time_or_period(Date.civil(2010)..Date.civil(2010, 2)).size
       end
       
       should 'find by time or period (Date)' do
-        assert_equal 2, Schedular::Time.by_time_or_period(Date.civil(2010)).size
+        assert_equal 3, Schedular::Time.by_time_or_period(Date.civil(2010)).size
       end
       
       should 'find by time or period (DateTime)' do
-        assert_equal 1, Schedular::Time.by_time_or_period(DateTime.civil(2010, 1, 1, 10)).size
+        assert_equal 2, Schedular::Time.by_time_or_period(DateTime.civil(2010, 1, 1, 10)).size
       end
       
       should 'find by all day' do
@@ -38,7 +42,26 @@ class Schedular::TimeTest < Test::Unit::TestCase
       end
       
       should 'find by not all day' do
-        assert_equal 1, Schedular::Time.all_day(false).size
+        assert_equal 2, Schedular::Time.all_day(false).size
+      end
+      
+      should 'find by duration' do
+        assert_equal 1, Schedular::Time.duration(60).size
+        assert_equal 1, Schedular::Time.duration(120).size
+      end
+      
+      should 'find by duration less than' do
+        assert_equal 2, Schedular::Time.duration_less_or_equal(120).size
+        assert_equal 2, Schedular::Time.duration_less_or_equal(121).size
+        assert_equal 1, Schedular::Time.duration_less_or_equal(60).size
+        assert_equal 1, Schedular::Time.duration_less_or_equal(61).size
+      end
+      
+      should 'find by duration more than' do
+        assert_equal 2, Schedular::Time.duration_more_or_equal(59).size
+        assert_equal 2, Schedular::Time.duration_more_or_equal(60).size
+        assert_equal 1, Schedular::Time.duration_more_or_equal(119).size
+        assert_equal 1, Schedular::Time.duration_more_or_equal(120).size
       end
       
       should 'find by params with month' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Macario Ortega
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -05:00
+date: 2010-09-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,6 @@ files:
 - test/rails_app/lib/event.rb
 - test/rails_app/log/production.log
 - test/rails_app/log/server.log
-- test/rails_app/log/test.log
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html