later_dude 0.3.0 → 0.3.1

data/CHANGELOG

@@ -2,6 +2,7 @@
 ----------
 - Make LaterDude Rails 3-compatible
 - Include Rails 2 compatibility layer
+- Fix broken gem release (0.3.1)
 
 2009/11/18
 ----------

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Clemens Kofler
+Copyright (c) 2009, 2010 Clemens Kofler
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -16,12 +16,20 @@ You can use LaterDude either as a gem (preferred) or as a Rails plugin.
 
 To use the gem version, put the following gem requirement in your environment.rb:
 
-  config.gem "later_dude", :source => 'http://gemcutter.org'
+  config.gem 'later_dude', :source => 'http://gemcutter.org'
+
+Or with Rails 3, add the gem requirement to your Gemfile:
+
+  gem 'later_dude', '>= 0.3.1' # 0.3.0 was broken!
 
 To install it as a plugin, fire up your terminal, go to your Rails app and type:
 
   $ ruby script/plugin install git://github.com/clemens/later_dude.git
 
+To use the CalendarHelper, put this in a controller:
+
+  helper LaterDude::CalendarHelper
+
 Examples
 ========
 
@@ -139,4 +147,4 @@ Bugs & Feedback
 
 You can send me feedback, bug reports and patches via "GitHub":http://github.com/clemens.
 
-Copyright (c) 2009 Clemens Kofler <clemens@railway.at>, released under the MIT license.
+Copyright (c) 2009, 2010 Clemens Kofler <clemens@railway.at>, released under the MIT license.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/later_dude.rb

@@ -1,204 +1,3 @@
-require 'rails2_compat'
-
-module LaterDude
-  module CalendarHelper
-    def calendar_for(year, month, options={}, &block)
-      Calendar.new(year, month, options, &block).to_html
-    end
-  end
-
-  # 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(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]
-      @options[:previous_month] ||= @options[:next_and_previous_month]
-
-      @days = Date.civil(@year, @month, 1)..Date.civil(@year, @month, -1)
-      @block = block
-    end
-
-    def to_html
-      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
-      content_tag(:tr, "#{show_previous_month}#{show_current_month}#{show_following_month}".html_safe)
-    end
-
-    def show_previous_month
-      return if @days.first.wday == first_day_of_week # don't display anything if the first day is the first day of a week
-
-      returning "" do |output|
-        beginning_of_week(@days.first).upto(@days.first - 1) { |d| output << show_day(d) }
-      end.html_safe
-    end
-
-    def show_current_month
-      returning "" do |output|
-        @days.first.upto(@days.last) { |d| output << show_day(d) }
-      end.html_safe
-    end
-
-    def show_following_month
-      return if @days.last.wday == last_day_of_week # don't display anything if the last day is the last day of a week
-
-      returning "" do |output|
-        (@days.last + 1).upto(beginning_of_week(@days.last + 1.week) - 1) { |d| output << show_day(d) }
-      end.html_safe
-    end
-
-    def show_day(day)
-      options = { :class => "day" }
-      options[:class] << " otherMonth" if day.month != @days.first.month
-      options[:class] << " weekend" if Calendar.weekend?(day)
-      options[:class] << " today" if day.today?
-
-      # block is only called for current month or if :yield_surrounding_days is set to true
-      if @block && (@options[:yield_surrounding_days] || day.month == @days.first.month)
-        content, options_from_block = Array(@block.call(day))
-
-        # passing options is optional
-        if options_from_block.is_a?(Hash)
-          options[:class] << " #{options_from_block.delete(:class)}" if options_from_block[:class]
-          options.merge!(options_from_block)
-        end
-      else
-        content = day.day
-      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)
-      diff = day.wday - first_day_of_week
-      diff += 7 if first_day_of_week > day.wday # hackish ;-)
-      day - diff
-    end
-
-    def show_month_names
-      return if @options[:hide_month_name]
-
-      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
-    # value can either be a strftime compatible string or a proc.
-    # For an array, the first value is considered to be a strftime compatible string and the second is considered to be
-    # a proc. If the second value is not a proc then it will be ignored.
-    def previous_month
-      return unless @options[:previous_month]
-
-      show_month(@days.first - 1.month, @options[:previous_month], :class => "previous")
-    end
-
-    # see previous_month
-    def next_month
-      return unless @options[:next_month]
-
-      show_month(@days.first + 1.month, @options[:next_month], :class => "next")
-    end
-
-    # see previous_month and next_month
-    def current_month
-      colspan = @options[:previous_month] || @options[:next_month] ? 3 : 7 # span across all 7 days if previous and next month aren't shown
-
-      show_month(@days.first, @options[:current_month], :colspan => colspan, :class => "current")
-    end
-
-    def show_month(month, format, options={})
-      options[:colspan] ||= 2
-
-      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).html_safe
-        end
-      end
-    end
-
-    def day_names
-      @day_names ||= @options[:use_full_day_names] ? full_day_names : abbreviated_day_names
-    end
-
-    def full_day_names
-      @full_day_names ||= I18n.translate(:'date.day_names')
-    end
-
-    def abbreviated_day_names
-      @abbreviated_day_names ||= I18n.translate(:'date.abbr_day_names')
-    end
-
-    def show_day_names
-      return if @options[:hide_day_names]
-      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
-
-    # => <abbr title="Sunday">Sun</abbr>
-    def include_day_abbreviation(day)
-      return day if @options[:use_full_day_names]
-
-      content_tag(:abbr, day, :title => full_day_names[abbreviated_day_names.index(day)])
-    end
-
-    def apply_first_day_of_week(day_names)
-      names = day_names.dup
-      first_day_of_week.times { names.push(names.shift) }
-      names
-    end
-
-    def first_day_of_week
-      @options[:first_day_of_week]
-    end
-
-    def last_day_of_week
-      @options[:first_day_of_week] > 0 ? @options[:first_day_of_week] - 1 : 6
-    end
-
-    class << self
-      def weekend?(day)
-        [0,6].include?(day.wday) # 0 = Sunday, 6 = Saturday
-      end
-
-      def default_calendar_options
-        {
-          :calendar_class => "calendar",
-          :first_day_of_week => I18n.translate(:'date.first_day_of_week', :default => "0").to_i,
-          :hide_day_names => false,
-          :hide_month_name => false,
-          :use_full_day_names => false,
-          :current_month => I18n.translate(:'date.formats.calendar_header', :default => "%B"),
-          :next_month => false,
-          :previous_month => false,
-          :next_and_previous_month => false,
-          :yield_surrounding_days => false
-        }
-      end
-    end
-  end
-end
-
-ActionView::Base.send(:include, LaterDude::CalendarHelper)
+require 'later_dude/calendar'
+require 'later_dude/calendar_helper'
+require 'later_dude/rails2_compat'

data/lib/later_dude/calendar.rb

@@ -0,0 +1,194 @@
+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(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]
+      @options[:previous_month] ||= @options[:next_and_previous_month]
+
+      @days = Date.civil(@year, @month, 1)..Date.civil(@year, @month, -1)
+      @block = block
+    end
+
+    def to_html
+      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
+      content_tag(:tr, "#{show_previous_month}#{show_current_month}#{show_following_month}".html_safe)
+    end
+
+    def show_previous_month
+      return if @days.first.wday == first_day_of_week # don't display anything if the first day is the first day of a week
+
+      returning "" do |output|
+        beginning_of_week(@days.first).upto(@days.first - 1) { |d| output << show_day(d) }
+      end.html_safe
+    end
+
+    def show_current_month
+      returning "" do |output|
+        @days.first.upto(@days.last) { |d| output << show_day(d) }
+      end.html_safe
+    end
+
+    def show_following_month
+      return if @days.last.wday == last_day_of_week # don't display anything if the last day is the last day of a week
+
+      returning "" do |output|
+        (@days.last + 1).upto(beginning_of_week(@days.last + 1.week) - 1) { |d| output << show_day(d) }
+      end.html_safe
+    end
+
+    def show_day(day)
+      options = { :class => "day" }
+      options[:class] << " otherMonth" if day.month != @days.first.month
+      options[:class] << " weekend" if Calendar.weekend?(day)
+      options[:class] << " today" if day.today?
+
+      # block is only called for current month or if :yield_surrounding_days is set to true
+      if @block && (@options[:yield_surrounding_days] || day.month == @days.first.month)
+        content, options_from_block = Array(@block.call(day))
+
+        # passing options is optional
+        if options_from_block.is_a?(Hash)
+          options[:class] << " #{options_from_block.delete(:class)}" if options_from_block[:class]
+          options.merge!(options_from_block)
+        end
+      else
+        content = day.day
+      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)
+      diff = day.wday - first_day_of_week
+      diff += 7 if first_day_of_week > day.wday # hackish ;-)
+      day - diff
+    end
+
+    def show_month_names
+      return if @options[:hide_month_name]
+
+      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
+    # value can either be a strftime compatible string or a proc.
+    # For an array, the first value is considered to be a strftime compatible string and the second is considered to be
+    # a proc. If the second value is not a proc then it will be ignored.
+    def previous_month
+      return unless @options[:previous_month]
+
+      show_month(@days.first - 1.month, @options[:previous_month], :class => "previous")
+    end
+
+    # see previous_month
+    def next_month
+      return unless @options[:next_month]
+
+      show_month(@days.first + 1.month, @options[:next_month], :class => "next")
+    end
+
+    # see previous_month and next_month
+    def current_month
+      colspan = @options[:previous_month] || @options[:next_month] ? 3 : 7 # span across all 7 days if previous and next month aren't shown
+
+      show_month(@days.first, @options[:current_month], :colspan => colspan, :class => "current")
+    end
+
+    def show_month(month, format, options={})
+      options[:colspan] ||= 2
+
+      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).html_safe
+        end
+      end
+    end
+
+    def day_names
+      @day_names ||= @options[:use_full_day_names] ? full_day_names : abbreviated_day_names
+    end
+
+    def full_day_names
+      @full_day_names ||= I18n.translate(:'date.day_names')
+    end
+
+    def abbreviated_day_names
+      @abbreviated_day_names ||= I18n.translate(:'date.abbr_day_names')
+    end
+
+    def show_day_names
+      return if @options[:hide_day_names]
+      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
+
+    # => <abbr title="Sunday">Sun</abbr>
+    def include_day_abbreviation(day)
+      return day if @options[:use_full_day_names]
+
+      content_tag(:abbr, day, :title => full_day_names[abbreviated_day_names.index(day)])
+    end
+
+    def apply_first_day_of_week(day_names)
+      names = day_names.dup
+      first_day_of_week.times { names.push(names.shift) }
+      names
+    end
+
+    def first_day_of_week
+      @options[:first_day_of_week]
+    end
+
+    def last_day_of_week
+      @options[:first_day_of_week] > 0 ? @options[:first_day_of_week] - 1 : 6
+    end
+
+    class << self
+      def weekend?(day)
+        [0,6].include?(day.wday) # 0 = Sunday, 6 = Saturday
+      end
+
+      def default_calendar_options
+        {
+          :calendar_class => "calendar",
+          :first_day_of_week => I18n.translate(:'date.first_day_of_week', :default => "0").to_i,
+          :hide_day_names => false,
+          :hide_month_name => false,
+          :use_full_day_names => false,
+          :current_month => I18n.translate(:'date.formats.calendar_header', :default => "%B"),
+          :next_month => false,
+          :previous_month => false,
+          :next_and_previous_month => false,
+          :yield_surrounding_days => false
+        }
+      end
+    end
+  end
+end

data/lib/later_dude/calendar_helper.rb

@@ -0,0 +1,7 @@
+module LaterDude
+  module CalendarHelper
+    def calendar_for(year, month, options={}, &block)
+      Calendar.new(year, month, options, &block).to_html
+    end
+  end
+end

data/lib/later_dude/rails2_compat.rb

@@ -0,0 +1,7 @@
+unless ''.respond_to?(:html_safe)
+  class String
+    def html_safe
+      self
+    end
+  end
+end

data/tasks/distribution.rb

@@ -9,7 +9,7 @@ begin
     s.authors     = ["Clemens Kofler"]
     s.files       =  FileList["CHANGELOG",
                               "init.rb",
-                              "lib/later_dude.rb",
+                              "lib/**/*.rb",
                               "MIT-LICENSE",
                               "Rakefile",
                               "README",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: later_dude
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Clemens Kofler
@@ -29,6 +29,9 @@ files:
 - VERSION
 - init.rb
 - lib/later_dude.rb
+- lib/later_dude/calendar.rb
+- lib/later_dude/calendar_helper.rb
+- lib/later_dude/rails2_compat.rb
 - tasks/distribution.rb
 - tasks/documentation.rb
 - tasks/testing.rb