simple_calendar 0.0.4 → 0.0.5

data/README.md

@@ -9,7 +9,7 @@ Installation
 
 Just add this into your Gemfile followed by a bundle install:
 
-    gem "simple_calendar", "~> 0.0.3"
+    gem "simple_calendar", "~> 0.0.4"
 
 Usage
 -----

data/lib/simple_calendar/version.rb

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

data/lib/simple_calendar/view_helpers.rb

@@ -1,78 +1,112 @@
 module SimpleCalendar
   module ViewHelpers
+
     def calendar(events, &block)
-      day = Date.civil((params[:year] || Time.zone.now.year).to_i, (params[:month] || Time.zone.now.month).to_i)
+      selected_month = Date.civil((params[:year] || Time.zone.now.year).to_i, (params[:month] || Time.zone.now.month).to_i)
+      current_date   = Date.today
+      range          = build_range selected_month
+      month_array    = build_month range
 
-      content_tag :table, :class => "bordered-table calendar" do
-        month_header(day) + day_header + body(day, events, block)
-      end
+      draw_calendar(selected_month, month_array, current_date, events, block)
     end
 
-    def start_date(date)
-      start_date = date.beginning_of_month
-      start_date = start_date.beginning_of_week.advance(:days => -1) unless start_date.sunday?
-      start_date
-    end
+    private
 
-    def end_date(date)
-      end_date = date.end_of_month
-      end_date = end_date.advance(:days => 1).end_of_week if end_date.sunday?
-      end_date
-    end
+    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)
 
-    def month_header(day)
-      content_tag :h2 do
-        previous_month = day.advance :months => -1
-        next_month = day.advance :months => 1
-        tags = []
-        tags << link_to("<", request.fullpath.split('?').first + "?month=#{previous_month.month}&year=#{previous_month.year}")
-        tags << day.strftime("%B %Y")
-        tags << link_to(">", request.fullpath.split('?').first + "?month=#{next_month.month}&year=#{next_month.year}")
-        tags.join.html_safe
-      end
-    end
+      end_date   = selected_month.end_of_month
+      end_date   = end_date.sunday? ? end_date : end_date.advance(:days => 1).end_of_week
 
-    def day_header
-      content_tag :thead do
-        content_tag :tr do
-          I18n.t(:"date.abbr_day_names").map{ |day| content_tag :th, day }.join.html_safe
-        end
-      end
+      date_range = (start_date..end_date).to_a
     end
 
-    def body(day, events, block)
-      current_date = start_date(day).dup
-
-      content_tag :tbody do
-        weeks = []
-        while current_date < end_date(day)
-          weeks << content_tag(:tr) do
-            tags = []
-            while not current_date.saturday?
-              tags << day(current_date, events, block)
-              current_date = current_date.tomorrow
-            end
-            tags << day(current_date, events, block)
-            current_date = current_date.tomorrow
-            tags.join.html_safe
-          end
+    def build_month(date_range)
+      month = []
+      week  = []
+      i     = 0
+
+      date_range.each do |date|
+        week << date
+        if i == 6
+          i = 0
+          month << week
+          week = []
+        else
+          i += 1
         end
-        weeks.join.html_safe
       end
+
+      month
     end
 
-    def day(date, events, block)
-      content_tag :td do
-        concat content_tag(:div, date.day, :class => "day")
+    # Renders the calendar table
+    def draw_calendar(selected_month, month, current_date, events, block)
+      tags = []
 
-        day_events(date, events).map do |event|
-          block.call(event)
-        end.join.html_safe
-      end
+      content_tag(:table, :class => "table table-bordered table-striped calendar") do
+        tags << month_header(selected_month)
+        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
+
+          month.collect do |week|
+            content_tag(:tr, :class => (week.include?(Date.today) ? "current-week week" : "week")) do
+
+              week.collect do |date|
+                tb_class = []
+                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(:div) do
+                    divs = []
+
+                    concat content_tag(:div, date.day.to_s)
+                    divs << day_events(date, events).collect {|event| block.call(event) }
+                    divs.join.html_safe
+                  end #content_tag :div
+                end #content_tag :td
+
+              end.join.html_safe
+            end #content_tag :tr
+
+          end.join.html_safe
+        end #content_tag :tbody
+
+        tags.join.html_safe
+      end #content_tag :table
     end
 
+    # Returns an array of events for a given day
     def day_events(date, events)
       events.select { |e| e.start_time_column.to_date == date }
     end
+
+    # Generates the header that includes the month and next and previous months
+    def month_header(selected_month)
+      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.join.html_safe
+      end
+    end
+
+    # Generates the link to next and previous months
+    def month_link(text, month, opts={})
+      link_to(text, "#{simple_calendar_path}?month=#{month.month}&year=#{month.year}", opts)
+    end
+
+    # Returns the full path to the calendar
+    # This is used for generating the links to the next and previous months
+    def simple_calendar_path
+      request.fullpath.split('?').first
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-06-11 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.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple Rails 3 calendar