simple_calendar 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c146f5a7b38c2327df0f20dc4026598a0f9d8a
-  data.tar.gz: ac0162169f6c8fb91de3ec38db5fea38e9a82678
+  metadata.gz: 796aabd52df101faf850fc78a815ff5c77cdec9f
+  data.tar.gz: 624565897e01b55df78704601826f9c7bac1d432
 SHA512:
-  metadata.gz: 761eaa0a862661b6a6e50794f7ed4a7ff286eae058019abd49b70ec298dd0b5d1971a73e475da816114298007aadcf8eac59a90474c6988e66f541c99012ec80
-  data.tar.gz: ca7d0f0b8cbbfcd82d2543d769f6d92cd78b16ec8c397e5e1f226ebc490e7fc5199dd4e3956000326a93a8811a9fd7ba43c6b15bac0faf769168c097a3c1e3de
+  metadata.gz: 5998574923fe285b6bbe1ff027961dec8217fa2a88dfcb15985dbd1926c5ddb8d39ac74d585aa5f2f9fb19343d2e1f620dff5f4132f7a25e218fe6697ff7a3be
+  data.tar.gz: 4e06bc29b002fcb7dfb288907634637dee753bddf74b6db7e7a02c1b3b4986cc41aab3fc35636590a4c49d39a2f71c61e93296c785f49f3ea0d15d4e2837259a

data/README.md

@@ -224,25 +224,27 @@ And then your view would use `month_calendar_td_options` as the value.
 <% end %>
 ```
 
-### Custom Header Links
+### Custom Header Title And Links
 
 Each of the calendar methods will generate a header with links to the
 previous and next views. The `month_calendar` also includes a header
-that tells you the current month and year that you are viewing.
+with a title that tells you the current month and year that you are viewing.
 
-To change these, you can pass in the `prev_link`, `header`, and
+To change these, you can pass in the `prev_link`, `title`, and
 `next_link` options into the calendar methods.
 
 The default `month_calendar` look like this:
 
 ```erb
 <%= month_calendar prev_link: ->(range) { link_to raw("&laquo;"), param_name => range.first - 1.day },
-  header: ->{ content_tag :span, "#{I18n.t("date.month_names")[start_date.month]} #{start_date.year}", class: "calendar-header" },
+  title: ->{ content_tag :span, "#{I18n.t("date.month_names")[start_date.month]} #{start_date.year}", class: "calendar-title" },
   next_link: ->(range) { link_to raw("&raquo;"), param_name => range.last + 1.day } do |day| %>
 
 <% end %>
 ```
 
+`title` option is a lambda that
+
 `prev_link` option is a standard `link_to` that is a left arrow and
 with the current url having `?start_date=2014-04-30` appended to it as
 a date in the previous view of the calendar.
@@ -251,17 +253,71 @@ a date in the previous view of the calendar.
 with the current url having `?start_date=2014-06-01` appended to it as
 a date in the next view of the calendar.
 
-`header` option is just a simple span tag with the month and year
+`title` option is, by default, a simple span tag with the month and year
 inside of it.
 
-If you wish to disable any of these partsof the header, just pass in
-`false` and that will hide it:
+If you wish to add some styles to the header, you can use the `header`
+option:
+
+```erb
+<%= month_calendar header: {class: "calendar-header"} do |day| %>
+<% end %>
+```
+
+The table header (thead) is the row of day names across the top. It
+tells you which column is which day. For example `Sun Mon Tue Wed`
+
+If you want to use full day names instead of the abbreviated ones in the
+table header, you can pass in the `day_names` option which points to a
+validate I18n array.
+
+```erb
+<%= calendar day_names: "date.day_names" do |day, events| %>
+<% end %>
+```
+
+Which renders:
+
+```html
+<thead>
+  <tr>
+    <th>Sunday</th>
+    <th>Monday</th>
+    <th>Tuesday</th>
+    <th>Wednesday</th>
+  </tr>
+</thead>
+```
+
+By default we use the `date.abbr_day_names` translation to have shorter
+header names.
 
 ```erb
-<%= month_calendar header: false do |day| %>
+<%= calendar day_names: "date.abbr_day_names" do |day, events| %>
 <% end %>
 ```
 
+This renders:
+
+```html
+<thead>
+  <tr>
+    <th>Sun</th>
+    <th>Mon</th>
+    <th>Tue</th>
+    <th>Wed</th>
+  </tr>
+</thead>
+```
+
+You can disable the `thead` line if you like by passing in `false`.
+
+```erb
+<%= month_calendar thead: false do |day| %>
+<% end %>
+```
+
+
 ## TODO
 
 - Multi-day events?

data/lib/simple_calendar/calendar.rb

@@ -9,11 +9,12 @@ module SimpleCalendar
       @events       = opts.delete(:events) { [] }
 
       opts.reverse_merge!(
+        header: {class: "calendar-header"},
         previous_link: default_previous_link,
-        header: default_header,
+        title: default_title,
         next_link: default_next_link,
         td: default_td_classes,
-        header_div: {class: "calendar-header"}
+        thead: default_thead,
       )
 
       @options      = opts
@@ -30,9 +31,9 @@ module SimpleCalendar
 
     def render_header
       capture do
-        content_tag :div, get_option(:header_div) do
+        content_tag :header, get_option(:header) do
           concat get_option(:previous_link, param_name, date_range)
-          concat get_option(:header, start_date)
+          concat get_option(:title, start_date)
           concat get_option(:next_link, param_name, date_range)
         end
       end
@@ -40,8 +41,9 @@ module SimpleCalendar
 
     def render_table
       content_tag :table, get_option(:table)  do
-        content_tag :tbody, get_option(:tbody) do
-          render_weeks
+        capture do
+          concat get_option(:thead, date_range.to_a.slice(0, 7))
+          concat content_tag(:tbody, render_weeks, get_option(:tbody))
         end
       end
     end
@@ -57,7 +59,7 @@ module SimpleCalendar
     def render_week(week)
       results = week.map do |day|
         content_tag :td, get_option(:td, start_date, day) do
-          block.call day, events_for_date(day)
+          block.call(day, events_for_date(day))
         end
       end
       safe_join results
@@ -81,7 +83,7 @@ module SimpleCalendar
       ->(param, date_range) { link_to raw("«"), param => date_range.first - 1.day }
     end
 
-    def default_header
+    def default_title
       ->(start_date) {  }
     end
 
@@ -89,8 +91,22 @@ module SimpleCalendar
       ->(param, date_range) { link_to raw("»"), param => date_range.last + 1.day }
     end
 
+    def default_thead
+      ->(dates) {
+        content_tag(:thead) do
+          content_tag(:tr) do
+            capture do
+              dates.each do |date|
+                concat content_tag(:th, I18n.t(options.fetch(:day_names, "date.abbr_day_names"))[date.wday])
+              end
+            end
+          end
+        end
+      }
+    end
+
     def start_date
-      @start_date ||= (params[param_name] ||Time.zone.now).to_date
+      @start_date ||= (params[param_name] || Time.zone.now).to_date
     end
 
     def date_range

data/lib/simple_calendar/month_calendar.rb

@@ -4,8 +4,8 @@ module SimpleCalendar
       @date_range ||= start_date.beginning_of_month.beginning_of_week..start_date.end_of_month.end_of_week
     end
 
-    def default_header
-      ->(start_date) { content_tag :span, month_name(start_date), class: "calendar-header" }
+    def default_title
+      ->(start_date) { content_tag :span, month_name(start_date) }
     end
 
     def month_name(start_date)

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Chris Oliver