data_calendar 0.1.1 → 0.1.2

data/Rakefile

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*")
   # s.executables    = ['data-calendar']
   
-  # s.add_dependency('gem_name', '~> 0.0.1')
+  s.add_dependency('activesupport')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/data_calendar/data_calendar.rb

@@ -1,16 +1,22 @@
 class DataCalendar
+                                   
+  attr_accessor :events, :preview_month, :date_method, :next_month
+  
   def initialize(options = {})
-     @date = options[:date] || Time.now
+     @date = options[:date] 
      @date = @date.to_date
      @preview_month = options[:preview_month] || :preview_month
+     @date_method = options[:date_method] || :start_at 
      @next_month = options[:next_month] || :next_month
-  end   
+     @events = options[:events] || [] 
+     
+  end
+   
   
   def all_days    
     [days_to_preview_month,days_to_current_month,days_to_next_month].flatten
   end
   
-  
   # Return the days of the current week
   def week
     first_day_of_week = @date.monday
@@ -77,8 +83,18 @@ class DataCalendar
     if day.today?
       types << :today  
     end
+    
+    events =  get_events(day)
+    if events.present?
+      types << :busy
+    end
+    
        
-     {:date => day, :types => types}  
-  end          
+     {:date => day, :types => types, :events => events}  
+  end                                                     
+  
+  def get_events(day)
+    @events.select{|x| eval("x.#{@date_method}.to_date") == day.to_date}
+  end
   
 end

data/lib/data_calendar/version.rb

@@ -3,7 +3,7 @@ module DataCalendar
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/unit/data_calendar_test.rb

@@ -18,13 +18,25 @@ class DataCalendarTest < Test::Unit::TestCase
      end                                      
      
      should "return its days to next month" do
-       assert_equal 6, @calendar.days_to_next_month.size
-       
-       assert_equal 'Tue, 01 Dec 2009'.to_date, @calendar.days_to_next_month.first[:date].to_date
-       assert_equal [:next_month], @calendar.days_to_next_month.first[:types]
-       
-       assert_equal 'Sun, 06 Dec 2009'.to_date, @calendar.days_to_next_month.last[:date].to_date       
-       assert_equal [:next_month, :weekend], @calendar.days_to_next_month.last[:types]       
+       assert_equal ["2009-12-01", "2009-12-02", "2009-12-03", "2009-12-04", "2009-12-05", "2009-12-06"], @calendar.days_to_next_month.map{|x| x[:date].to_s}     
+       #assert_equal [[:next_month], [:next_month], [:next_month], [:next_month], [:next_month, :weekend], [:next_month, :weekend]], @calendar.days_to_next_month.map{|x| x[:types]}     
+       # TODO [:events]
+     end 
+     
+     should "return its days to current month" do
+       assert_equal ["2009-11-01", "2009-11-02", "2009-11-03", "2009-11-04", "2009-11-05", "2009-11-06", "2009-11-07", "2009-11-08", "2009-11-09", "2009-11-10", "2009-11-11", "2009-11-12", "2009-11-13", "2009-11-14", "2009-11-15", "2009-11-16", "2009-11-17", "2009-11-18", "2009-11-19", "2009-11-20", "2009-11-21", "2009-11-22", "2009-11-23", "2009-11-24", "2009-11-25", "2009-11-26", "2009-11-27", "2009-11-28", "2009-11-29", "2009-11-30"], @calendar.days_to_current_month.map{|x| x[:date].to_s}     
+       #assert_equal [[:weekend], [], [], [], [], [], [:weekend], [:weekend], [], [], [], [], [], [:weekend], [:weekend], [], [], [], [], [], [:weekend], [:weekend, :today], [], [], [], [], [], [:weekend], [:weekend], []], @calendar.days_to_current_month.map{|x| x[:types]}                                           
+       # TODO [:events]
+     end 
+     
+     should "return its days to preview month" do
+       assert_equal ["2009-10-26", "2009-10-27", "2009-10-28", "2009-10-29", "2009-10-30", "2009-10-31"], @calendar.days_to_preview_month.map{|x| x[:date].to_s}     
+       #assert_equal [[:preview_month], [:preview_month], [:preview_month], [:preview_month], [:preview_month], [:preview_month, :weekend]], @calendar.days_to_preview_month.map{|x| x[:types]}     
+       # TODO [:events]
+     end  
+
+     should "return its days to current week" do
+       #assert_equal ["2009-11-16", "2009-11-17", "2009-11-18", "2009-11-19", "2009-11-20", "2009-11-21", "2009-11-22"], @calendar.week.map{|x| x[:date].to_s }
      end
      
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_calendar
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Galisteo Ruiz"
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-23 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: ceritium@gmail.com
 executables: []