simple_calendar 0.0.5 → 0.0.6

data/README.md

@@ -4,16 +4,21 @@ Simple Calendar
 This is a small Rails 3.x gem for creating a quick and clean table calendar.
 Theming is up to you, but it works nicely with Twitter Bootstrap.
 
+Thanks to Josh Chernoff for an early rewrite of the calendar generation
+code.
+
 Installation
 ------------
 
 Just add this into your Gemfile followed by a bundle install:
 
-    gem "simple_calendar", "~> 0.0.4"
+    gem "simple_calendar", "~> 0.0.5"
 
 Usage
 -----
 
+####Model
+
 Here we have a model called Event with the start_time attribute that we
 will be using with simple_calendar.
 
@@ -21,6 +26,15 @@ will be using with simple_calendar.
       has_calendar
     end
 
+has_calendar has options that can be passed to it for configuration:
+
+    has_calendar :start_time => :my_start_column
+
+The `start_time` option is the field for the start time of the event. This will use
+`my_start_column` to determine which day to render the event on.
+
+####Views
+
 We query the events we want to display as usual, and then render the
 calendar in the view like so:
 
@@ -32,13 +46,20 @@ When the calendar is rendering, it yields to the block to allow you to
 render whatever you like for the item. In this example, I use the title
 attribute on the event with a link to the event.
 
-has_calendar has options that can be passed to it for configuration:
+You may even pass options to calendar renderer to customize it's behavior
 
-    has_calendar :start_time => :my_start_column
+    <%= calendar @events, {:prev_text=>"prev", :next_text=>"next"} do |event| %>
+      <div><%= link_to event.title, event %></div>
+    <% end %>
+
+This time calendar will use prev and next as labels for previous and next month links (which are normally set to &amp;laquo; (&laquo;) and &amp;raquo; (&raquo;)
 
-The start_time option is the field for the start time of the event. This will use
-my_start_column to determine which day to render the event on.
+Possible options:
 
+    :year	           # current year, default: from params or current year
+    :month		       # current month, default: from params or current month
+    :prev_text         # previous month link text, default: &laquo;
+    :next_text         # next month link text, default: &raquo;
 
 CSS
 ---
@@ -47,7 +68,7 @@ You will probably want to customize the height of the calendar so that
 all the rows are the same. You can do this by adding the following line
 to your css:
 
-  .calendar td { height: 100px; width: 14.28%; }
+    .calendar td { height: 100px; width: 14.28%; }
 
 By default simple_calendar will set the calendar to use .bordered-table
 and .calendar classes.

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/simple_calendar/view_helpers.rb

@@ -1,23 +1,30 @@
 module SimpleCalendar
   module ViewHelpers
 
-    def calendar(events, &block)
-      selected_month = Date.civil((params[:year] || Time.zone.now.year).to_i, (params[:month] || Time.zone.now.month).to_i)
+    def calendar(events, options={}, &block)
+      opts = { 
+          :year       => (params[:year] || Time.zone.now.year).to_i, 
+          :month      => (params[:month] || Time.zone.now.month).to_i,
+          :prev_text  => raw("«"),
+          :next_text  => raw("»")
+      }
+      options.reverse_merge! opts
+      selected_month = Date.civil(options[:year], options[:month])
       current_date   = Date.today
       range          = build_range selected_month
       month_array    = build_month range
 
-      draw_calendar(selected_month, month_array, current_date, events, block)
+      draw_calendar(selected_month, month_array, current_date, events, options, block)
     end
 
     private
 
     def build_range(selected_month)
       start_date = selected_month.beginning_of_month
-      start_date = start_date.sunday? ? start_date : start_date.beginning_of_week.advance(:days => -1)
+      start_date = start_date.sunday? ? start_date : start_date.beginning_of_week(:sunday)
 
       end_date   = selected_month.end_of_month
-      end_date   = end_date.sunday? ? end_date : end_date.advance(:days => 1).end_of_week
+      end_date   = end_date.saturday? ? end_date : end_date.end_of_week(:sunday)
 
       date_range = (start_date..end_date).to_a
     end
@@ -42,13 +49,13 @@ module SimpleCalendar
     end
 
     # Renders the calendar table
-    def draw_calendar(selected_month, month, current_date, events, block)
+    def draw_calendar(selected_month, month, current_date, events, options, block)
       tags = []
 
       content_tag(:table, :class => "table table-bordered table-striped calendar") do
-        tags << month_header(selected_month)
+        tags << month_header(selected_month, options)
         tags << content_tag(:thead, content_tag(:tr, I18n.t("date.abbr_day_names").collect { |name| content_tag :th, name, :class => (selected_month.month == Date.today.month && Date.today.strftime("%a") == name ? "current-day" : nil)}.join.html_safe))
-        tags << content_tag(:tbody) do
+        tags << content_tag(:tbody, :'data-month'=>selected_month.month, :'data-year'=>selected_month.year) do
 
           month.collect do |week|
             content_tag(:tr, :class => (week.include?(Date.today) ? "current-week week" : "week")) do
@@ -58,11 +65,11 @@ module SimpleCalendar
                 tb_class << not_current_month = (date.month == selected_month.month ? "" : "not-currnet-month")
                 tb_class << (Date.today == date ? "today day" : "day")
 
-                content_tag(:td, :class => tb_class.join(" ")) do
+                content_tag(:td, :class => tb_class.join(" "), :'data-date-iso'=>date.to_s, 'data-date'=>date.to_s.gsub('-', '/')) do
                   content_tag(:div) do
                     divs = []
 
-                    concat content_tag(:div, date.day.to_s)
+                    concat content_tag(:div, date.day.to_s, :class=>"day_number")
                     divs << day_events(date, events).collect {|event| block.call(event) }
                     divs.join.html_safe
                   end #content_tag :div
@@ -84,15 +91,15 @@ module SimpleCalendar
     end
 
     # Generates the header that includes the month and next and previous months
-    def month_header(selected_month)
+    def month_header(selected_month, options)
       content_tag :h2 do
         previous_month = selected_month.advance :months => -1
         next_month = selected_month.advance :months => 1
         tags = []
 
-        tags << month_link("&laquo;".html_safe, previous_month, :class => "previous-month")
-        tags << selected_month.strftime("%B %Y")
-        tags << month_link("&raquo;".html_safe, next_month, :class => "next-month")
+        tags << month_link(options[:prev_text], previous_month, {:class => "previous-month"})
+        tags << I18n.t("date.month_names")[selected_month.month]
+        tags << month_link(options[:next_text], next_month, {:class => "next-month"})
 
         tags.join.html_safe
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_calendar
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple Rails 3 calendar