simple_calendar 0.1.5 → 0.1.6

data/README.md

@@ -98,6 +98,7 @@ Possible options:
     :next_text       # next month link text, default: »
     :start_day       # starting day of week, default: :sunday
     :empty_date      # block called when a date is empty
+    :class           # HTML class attribute for the calendar
 
 If you wish to have Monday as the first day of the week, you'll need to
 change a couple things. First, when rendering the calendar, use the
@@ -134,5 +135,12 @@ the following line to your css:
 .calendar td { height: 100px; width: 14.28%; }
 ```
 
-By default simple_calendar will set the calendar to use .bordered-table
-and .calendar classes.
+By default simple_calendar will set the calendar to use .table
+.table-bordered .table-striped and .calendar classes.
+
+You can also override the class by passing in the `class` option.
+
+```erb
+  <%= calendar @events, class: "simple-calendar" do |event| %>
+  <% end %>
+```

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/simple_calendar/view_helpers.rb

@@ -10,14 +10,16 @@ module SimpleCalendar
           :month      => (params[:month] || Time.zone.now.month).to_i,
           :prev_text  => raw("«"),
           :next_text  => raw("»"),
-          :start_day  => :sunday
+          :start_day  => :sunday,
+          :class      => "table table-bordered table-striped calendar",
+
       }
       options.reverse_merge! opts
       events       ||= []
-      selected_month = Date.civil(options[:year], options[:month])
+      selected_month = Date.new(options[:year], options[:month])
       current_date   = Date.today
       range          = build_range selected_month, options
-      month_array    = build_month range
+      month_array    = range.each_slice(7).to_a
 
       draw_calendar(selected_month, month_array, current_date, events, options, block)
     end
@@ -25,42 +27,20 @@ module SimpleCalendar
     private
 
     def build_range(selected_month, options)
-      start_date = selected_month.beginning_of_month
-      start_date = start_date.send(options[:start_day].to_s+'?') ? start_date : start_date.beginning_of_week(options[:start_day])
-
-      end_date   = selected_month.end_of_month
-      end_date   = end_date.saturday? ? end_date : end_date.end_of_week(options[:start_day])
+      start_date = selected_month.beginning_of_month.beginning_of_week(options[:start_day])
+      end_date   = selected_month.end_of_month.end_of_week(options[:start_day])
 
       (start_date..end_date).to_a
     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
-      end
-
-      month
-    end
-
     # Renders the calendar table
     def draw_calendar(selected_month, month, current_date, events, options, block)
       tags = []
       today = Date.today
-      content_tag(:table, :class => "table table-bordered table-striped calendar") do
+      content_tag(:table, :class => options[:class]) do
         tags << month_header(selected_month, options)
         day_names = I18n.t("date.abbr_day_names")
-        day_names.rotate(1) if options[:start_date] == :monday
+        day_names = day_names.rotate((Date::DAYS_INTO_WEEK[options[:start_day]] + 1) % 7)
         tags << content_tag(:thead, content_tag(:tr, 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, :'data-month'=>selected_month.month, :'data-year'=>selected_month.year) do
 
@@ -75,12 +55,15 @@ module SimpleCalendar
                 td_class << "future" if today < date
                 td_class << "wday-#{date.wday.to_s}" # <- to enable different styles for weekend, etc
 
+                cur_events = day_events(date, events)
+
+                td_class << (cur_events.any? ? "events" : "no-events")
+
                 content_tag(:td, :class => td_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, :class=>"day_number")
 
-                    cur_events = day_events(date, events)
                     if cur_events.empty? && options[:empty_date]
                       concat options[:empty_date].call(date)
                     else
@@ -122,14 +105,8 @@ module SimpleCalendar
     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
+    def month_link(text, date, opts={})
+      link_to(text, {:month => date.month, :year => date.year}, opts)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 676043402436518100
+      hash: 2470290329357686492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 676043402436518100
+      hash: 2470290329357686492
 requirements: []
 rubyforge_project: simple_calendar
 rubygems_version: 1.8.24