data_calendar 0.1.2 → 0.1.3

data/README.rdoc

@@ -16,12 +16,12 @@ Generates the data needed to represent a given schedule a calendar.
     
     pp dc.all_days #=>
     
-    [{:types=>[:preview_month], :date=>Mon, 26 Oct 2009},
-     {:types=>[:preview_month], :date=>Tue, 27 Oct 2009},
-     {:types=>[:preview_month], :date=>Wed, 28 Oct 2009},
-     {:types=>[:preview_month], :date=>Thu, 29 Oct 2009},
-     {:types=>[:preview_month], :date=>Fri, 30 Oct 2009},
-     {:types=>[:preview_month, :weekend], :date=>Sat, 31 Oct 2009},
+    [{:types=>[:previous_month], :date=>Mon, 26 Oct 2009},
+     {:types=>[:previous_month], :date=>Tue, 27 Oct 2009},
+     {:types=>[:previous_month], :date=>Wed, 28 Oct 2009},
+     {:types=>[:previous_month], :date=>Thu, 29 Oct 2009},
+     {:types=>[:previous_month], :date=>Fri, 30 Oct 2009},
+     {:types=>[:previous_month, :weekend], :date=>Sat, 31 Oct 2009},
      {:types=>[:weekend], :date=>Sun, 01 Nov 2009},
      {:types=>[], :date=>Mon, 02 Nov 2009},
      {:types=>[], :date=>Tue, 03 Nov 2009},

data/lib/data_calendar/data_calendar.rb

@@ -1,11 +1,11 @@
 class DataCalendar
                                    
-  attr_accessor :events, :preview_month, :date_method, :next_month
+  attr_accessor :events, :previous_month, :date_method, :next_month
   
   def initialize(options = {})
      @date = options[:date] 
      @date = @date.to_date
-     @preview_month = options[:preview_month] || :preview_month
+     @previous_month = options[:previous_month] || :previous_month
      @date_method = options[:date_method] || :start_at 
      @next_month = options[:next_month] || :next_month
      @events = options[:events] || [] 
@@ -14,7 +14,7 @@ class DataCalendar
    
   
   def all_days    
-    [days_to_preview_month,days_to_current_month,days_to_next_month].flatten
+    [days_to_previous_month,days_to_current_month,days_to_next_month].flatten
   end
   
   # Return the days of the current week
@@ -29,15 +29,16 @@ class DataCalendar
     days_of_week
   end
   
-  def days_to_preview_month                                                
+  def days_to_previous_month                                                
     fill_days = first_day_of_month.wday
-    fill_days = 7 if fill_days == 0
+    fill_days = 7 if fill_days == 0    
     fill_days -= 1
-    first_day_of_month - fill_days.days
       
-    days = []
-    fill_days.times do |time|
-     days << day_and_types(first_day_of_month - (6 - time).day, [@preview_month])
+    days = [] 
+    fill_array = []
+    fill_days.times{|e| fill_array << e + 1}
+    fill_array.reverse.each do |time| 
+      days << day_and_types(first_day_of_month - time.day, [@previous_month])
     end      
     days
   end 

data/lib/data_calendar/version.rb

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

data/test/unit/data_calendar_test.rb

@@ -29,9 +29,11 @@ class DataCalendarTest < Test::Unit::TestCase
        # 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]}     
+     should "return its days to previous 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_previous_month.map{|x| x[:date].to_s}     
+       dic_calendar = DataCalendar.new(:date => Date.parse('2009-12-5'))
+       assert_equal ["2009-11-30"], dic_calendar.days_to_previous_month.map{|x| x[:date].to_s}     
+       #assert_equal [[:previous_month], [:previous_month], [:previous_month], [:previous_month], [:previous_month], [:previous_month, :weekend]], @calendar.days_to_previous_month.map{|x| x[:types]}     
        # TODO [:events]
      end  
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_calendar
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Galisteo Ruiz"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +01:00
+date: 2009-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency