later_dude 0.2.1 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+2010/03/07
+----------
+- Make LaterDude Rails 3-compatible
+- Include Rails 2 compatibility layer
+
+2009/11/18
+----------
+- Make it possible for subclasses to override default settings.
+
 2009/10/30
 ----------
 - Introduced new :yield_surrounding_days option to yield surrounding days of other months to passed block.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/init.rb

@@ -1,2 +1 @@
 require 'later_dude'
-ActionView::Base.send(:include, LaterDude::CalendarHelper)

data/lib/later_dude.rb

@@ -1,5 +1,4 @@
-require 'i18n'
-require 'action_view'
+require 'rails2_compat'
 
 module LaterDude
   module CalendarHelper
@@ -10,12 +9,15 @@ module LaterDude
 
   # TODO: Maybe make output prettier?
   class Calendar
+    include ActionView::Helpers::CaptureHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
 
+    attr_accessor :output_buffer
+
     def initialize(year, month, options={}, &block)
       @year, @month = year, month
-      @options = options.symbolize_keys.reverse_merge(Calendar.default_calendar_options)
+      @options = options.symbolize_keys.reverse_merge(self.class.default_calendar_options)
 
       # next_month and previous_month take precedence over next_and_previous_month
       @options[:next_month]     ||= @options[:next_and_previous_month]
@@ -26,22 +28,14 @@ module LaterDude
     end
 
     def to_html
-      <<-EOF
-        <table class="#{@options[:calendar_class]}">
-          <thead>
-            #{show_month_names}
-            #{show_day_names}
-          </thead>
-          <tbody>
-            #{show_days}
-          </tbody>
-        </table>
-      EOF
+      content_tag(:table, :class => "#{@options[:calendar_class]}") do
+        content_tag(:tbody, show_days)+ content_tag(:thead, "#{show_month_names}#{show_day_names}".html_safe)
+      end
     end
 
     private
     def show_days
-      "<tr>#{show_previous_month}#{show_current_month}#{show_following_month}</tr>"
+      content_tag(:tr, "#{show_previous_month}#{show_current_month}#{show_following_month}".html_safe)
     end
 
     def show_previous_month
@@ -49,13 +43,13 @@ module LaterDude
 
       returning "" do |output|
         beginning_of_week(@days.first).upto(@days.first - 1) { |d| output << show_day(d) }
-      end
+      end.html_safe
     end
 
     def show_current_month
       returning "" do |output|
         @days.first.upto(@days.last) { |d| output << show_day(d) }
-      end
+      end.html_safe
     end
 
     def show_following_month
@@ -63,7 +57,7 @@ module LaterDude
 
       returning "" do |output|
         (@days.last + 1).upto(beginning_of_week(@days.last + 1.week) - 1) { |d| output << show_day(d) }
-      end
+      end.html_safe
     end
 
     def show_day(day)
@@ -85,11 +79,12 @@ module LaterDude
         content = day.day
       end
 
-      returning content_tag(:td, content, options) do |output|
-        if day < @days.last && day.wday == last_day_of_week # opening and closing tag for the first and last week are included in #show_days
-          output << "</tr><tr>" # close table row at the end of a week and start a new one
-        end
-      end
+      content = content_tag(:td, content.to_s.html_safe, options)
+
+      # close table row at the end of a week and start a new one
+      # opening and closing tag for the first and last week are included in #show_days
+      content << "</tr><tr>".html_safe if day < @days.last && day.wday == last_day_of_week
+      content
     end
 
     def beginning_of_week(day)
@@ -101,9 +96,7 @@ module LaterDude
     def show_month_names
       return if @options[:hide_month_name]
 
-      %(<tr class="month_names">
-        #{previous_month}#{current_month}#{next_month}
-      </tr>)
+      content_tag(:tr, "#{previous_month}#{current_month}#{next_month}".html_safe, :class => 'month_names')
     end
 
     # @options[:previous_month] can either be a single value or an array containing two values. For a single value, the
@@ -133,14 +126,13 @@ module LaterDude
     def show_month(month, format, options={})
       options[:colspan] ||= 2
 
-      returning %(<th colspan="#{options[:colspan]}" class="#{options[:class]} #{Date::MONTHNAMES[month.month].downcase}">) do |output|
-        output << if format.kind_of?(Array) && format.size == 2
-          text = I18n.localize(month, :format => format.first.to_s)
+      content_tag(:th, :colspan => options[:colspan], :class => "#{options[:class]} #{Date::MONTHNAMES[month.month].downcase}") do
+        if format.kind_of?(Array) && format.size == 2
+          text = I18n.localize(month, :format => format.first.to_s).html_safe
           format.last.respond_to?(:call) ? link_to(text, format.last.call(month)) : text
         else
-          format.respond_to?(:call) ? format.call(month) : I18n.localize(month, :format => format.to_s)
+          format.respond_to?(:call) ? format.call(month) : I18n.localize(month, :format => format.to_s).html_safe
         end
-        output << '</th>'
       end
     end
 
@@ -158,12 +150,10 @@ module LaterDude
 
     def show_day_names
       return if @options[:hide_day_names]
-
-      returning '<tr class="day_names">' do |output|
-        apply_first_day_of_week(day_names).each do |day|
-          output << %(<th scope="col" class="#{Date::DAYNAMES[day_names.index(day)].downcase}">#{include_day_abbreviation(day)}</th>)
-        end
-        output << "</tr>"
+      content_tag(:tr, :class => 'day_names') do
+        apply_first_day_of_week(day_names).inject('') do |output, day|
+          output << content_tag(:th, include_day_abbreviation(day), :scope => 'col', :class => Date::DAYNAMES[day_names.index(day)].downcase)
+        end.html_safe
       end
     end
 
@@ -171,7 +161,7 @@ module LaterDude
     def include_day_abbreviation(day)
       return day if @options[:use_full_day_names]
 
-      %(<abbr title="#{full_day_names[abbreviated_day_names.index(day)]}">#{day}</abbr>)
+      content_tag(:abbr, day, :title => full_day_names[abbreviated_day_names.index(day)])
     end
 
     def apply_first_day_of_week(day_names)
@@ -209,4 +199,6 @@ module LaterDude
       end
     end
   end
-end
+end
+
+ActionView::Base.send(:include, LaterDude::CalendarHelper)

data/test/calendar_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+I18n.load_path += Dir[File.expand_path('fixtures/locales', File.dirname(__FILE__)) + '/*.yml']
+
 # TODO: figure out why I have to reference Calendar via its module ...
 class CalendarTest < ActiveSupport::TestCase
   # some constants for increased readability
@@ -8,6 +10,10 @@ class CalendarTest < ActiveSupport::TestCase
   FULL_MONTH_NAMES = I18n.translate(:'date.month_names')
   ABBR_MONTH_NAMES = I18n.translate(:'date.abbr_month_names')
 
+  setup do
+    I18n.locale = 'en'
+  end
+
   test "has default options" do
     # TODO improve this so that every call gets a fresh copy of the default options
     default_calendar_options = LaterDude::Calendar.send(:default_calendar_options)
@@ -28,12 +34,10 @@ class CalendarTest < ActiveSupport::TestCase
     assert !default_calendar_options[:previous_month]
     assert !default_calendar_options[:next_and_previous_month]
 
-    # some options use i18n ...
-    I18n.stubs(:translate).with(:'date.first_day_of_week', :default => "0").then.returns("1")
-    I18n.stubs(:translate).with(:'date.formats.calendar_header', :default => "%B").then.returns("%B %Y")
-
     # default first day of week is Sunday (= 0) if no translation is set in locale
     assert_equal 0, default_calendar_options[:first_day_of_week]
+
+    I18n.locale = 'de'
     # with default first day of week set in locale
     assert_equal 1, (LaterDude::Calendar.send(:default_calendar_options)[:first_day_of_week]) # have to do this so that we don't use the cached version
 
@@ -70,7 +74,7 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "uses next month for proc" do
-    assert_match %r(<a href="/events/2009/2">&raquo;</a>), LaterDude::Calendar.new(2009, 1, :next_month => lambda { |date| link_to "&raquo;", "/events/#{date.year}/#{date.month}" }).send(:next_month)
+    assert_match %r(<a href="/events/2009/2">&raquo;</a>), LaterDude::Calendar.new(2009, 1, :next_month => lambda { |date| %(<a href="/events/#{date.year}/#{date.month}">&raquo;</a>) }).send(:next_month)
   end
 
   test "uses next month for array if first value is a string and second is a proc" do
@@ -90,7 +94,7 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "uses previous month for proc" do
-    assert_match %r(<a href="/events/2008/12">&laquo;</a>), LaterDude::Calendar.new(2009, 1, :previous_month => lambda { |date| link_to "&laquo;", "/events/#{date.year}/#{date.month}" }).send(:previous_month)
+    assert_match %r(<a href="/events/2008/12">&laquo;</a>), LaterDude::Calendar.new(2009, 1, :previous_month => lambda { |date| %(<a href="/events/#{date.year}/#{date.month}">&laquo;</a>) }).send(:previous_month)
   end
 
   test "uses previous month for array if first value is a string and second is a proc" do
@@ -122,7 +126,7 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "uses current month for proc" do
-    assert_match %r(<a href="/events/2009/1">Current</a>), LaterDude::Calendar.new(2009, 1, :current_month => lambda { |date| link_to "Current", "/events/#{date.year}/#{date.month}" }).send(:current_month)
+    assert_match %r(<a href="/events/2009/1">Current</a>), LaterDude::Calendar.new(2009, 1, :current_month => lambda { |date| %(<a href="/events/#{date.year}/#{date.month}">Current</a>) }).send(:current_month)
   end
 
   test "uses current month for array if first value is a string and second is a proc" do
@@ -135,8 +139,14 @@ class CalendarTest < ActiveSupport::TestCase
 
   # helper methods
   test "shows whether a given day is on a weekend or not" do
-    [0, 6].each { |day| assert  LaterDude::Calendar.weekend?(mock(:wday => day)) }
-    (1..5).each { |day| assert !LaterDude::Calendar.weekend?(mock(:wday => day)) }
+    # first week of March 2010 starts on Monday => :-)
+    (Date.civil(2010, 3, 1)..Date.civil(2010, 3, 5)).each do |day|
+      assert !LaterDude::Calendar.weekend?(day)
+    end
+
+    [Date.civil(2010, 3, 6), Date.civil(2010, 3, 7)].each do |day|
+      assert LaterDude::Calendar.weekend?(day)
+    end
   end
 
   test "includes day name abbreviation" do
@@ -194,12 +204,10 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "shows special days as designated by a block" do
-    CalendarTest.send(:include, ActionView::Helpers)
-
     # all even days should be linked
     special_days_proc = lambda do |day|
       if day.day.even?
-        [link_to(day.day, "/calendar/#{day.year}/#{day.month}/#{day.day}"), { :class => "specialDay" } ]
+        [%(<a href="/calendar/#{day.year}/#{day.month}/#{day.day}">#{day.day}</a>), { :class => 'specialDay' }]
       else
         day.day
       end
@@ -218,8 +226,6 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "yields days of surrounding months :yield_surrounding_days is set to true" do
-    CalendarTest.send(:include, ActionView::Helpers)
-
     # make it bold
     special_days_proc = lambda { |day| "<b>#{day.day}</b>" }
 
@@ -234,8 +240,6 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   test "yields days of surrounding months :yield_surrounding_days isn't set to true" do
-    CalendarTest.send(:include, ActionView::Helpers)
-
     # make it bold
     special_days_proc = lambda { |day| "<b>#{day.day}</b>" }
 
@@ -252,4 +256,4 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   # TODO: Should I do "real" output testing despite the good coverage of output-related methods? Testing HTML is tedious ...
-end
+end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
 require 'active_support'
 require 'active_support/test_case'
-
-require 'later_dude'
+require 'mocha'
+require 'later_dude'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: later_dude
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Clemens Kofler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 +01:00
+date: 2010-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: []