calendrier 0.9.0 → 0.9.1

data/lib/calendrier/calendrier_builder.rb

@@ -25,6 +25,8 @@ module Calendrier
       def render(header, content)
         display = @options[:display]
         title = @options[:title] || ''
+        cell_date_format = @options[:cell_date_format] || (display == :month ? '%A' : :default)
+        time_slot_title = @options[:time_slot_title] || ''
 
         @context.content_tag(:div, nil, :class => "calendar #{display.to_s}") do
           cal = @context.content_tag(:span, title)
@@ -32,13 +34,14 @@ module Calendrier
 
             unless header.nil?
               thead = @context.content_tag(:thead, nil) do
-                ths = "".html_safe
-                ths << @context.content_tag(:th, 'Horaires') if display == :week
-                header.each do |cell_date|
-                  ths << @context.content_tag(:th, I18n.l(cell_date)) if display == :week
-                  ths << @context.content_tag(:th, I18n.l(cell_date, :format => '%A')) if display == :month
+                @context.content_tag(:tr, nil) do
+                  ths = "".html_safe
+                  ths << @context.content_tag(:th, time_slot_title) if display == :week
+                  header.each do |cell_date|
+                    ths << @context.content_tag(:th, I18n.l(cell_date, :format => cell_date_format))
+                  end
+                  ths
                 end
-                ths
               end
             end
 
@@ -48,7 +51,7 @@ module Calendrier
                 content.each_with_index do |row, index|
                   trs << @context.content_tag(:tr, nil) do 
                     tds = "".html_safe
-                    tds << @context.content_tag(:td, index) if display == :week
+                    tds << @context.content_tag(:td, "#{index}h") if display == :week
                     row.collect do |cell|
                       cell_content = "".html_safe
                       cell_time = cell[:time]

data/lib/calendrier/helpers/event_helper.rb

@@ -11,6 +11,12 @@ module Calendrier
       sorted_events_do(events_by_date, cell_begin_time, cell_end_time) { |event| yield event }
     end
 
+    def get_cell_sorted_events(events_by_date, cell_begin_time, cell_end_time)
+      events = []
+      sorted_events_do(events_by_date, cell_begin_time, cell_end_time) { |event| events << event }
+      events
+    end
+
     protected
 
     def sorted_events_do(events_by_date, cell_begin_time, cell_end_time, &block)

data/lib/calendrier/version.rb

@@ -1,3 +1,3 @@
 module Calendrier
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/lib/calendrier/calendrier_builder_test.rb

@@ -19,7 +19,7 @@ describe Calendrier::CalendrierBuilder do
     # preparing array for the week of the 25th of may 2012
     @days_of_may_weekly = []
     24.times do |hour_idx|
-      @days_of_may_weekly << (hour_idx).to_s
+      @days_of_may_weekly << "#{(hour_idx).to_s}h"
       7.times do |day_idx|
         @days_of_may_weekly << ''
       end
@@ -81,7 +81,7 @@ describe Calendrier::CalendrierBuilder do
     html_doc = Nokogiri::HTML(cal.html_safe)
     calendar_lines = html_doc.css('div.calendar tr')
     calendar_lines_count = html_doc.css('div.calendar tr').count
-    calendar_lines_count.must_equal 5
+    calendar_lines_count.must_equal 6
   end
 
   it "should have the right amount of columns for monthly calendar" do
@@ -109,7 +109,7 @@ describe Calendrier::CalendrierBuilder do
     cal = generate_calendar(:week)
     html_doc = Nokogiri::HTML(cal.html_safe)
     calendar_lines_count = html_doc.css('div.calendar tr').count
-    calendar_lines_count.must_equal 24
+    calendar_lines_count.must_equal 25
   end
 
   it "should have the right amount of columns for monthly calendar" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calendrier
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors: