calendar_helper 0.2.5 → 0.2.6

data/app/assets/stylesheets/calendar_styles/blue.css

@@ -1,10 +1,10 @@
 /*
   A blue based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com
-  
+
   AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
-  
-  Colors: 
-    Light Blue: bbccff 
+
+  Colors:
+    Light Blue: bbccff
     White: eeddee
     Turq: 003355
     Cream: ffffdd
@@ -64,3 +64,6 @@
 .today{
 	background-color: #4682b4;
 }
+.weekNumber {
+  background-color: #dedede;
+}

data/app/assets/stylesheets/calendar_styles/grey.css

@@ -1,9 +1,9 @@
 /*
   A grey based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com
-  
+
   AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
-  
-  Colors: 
+
+  Colors:
     dk: 787888
     lt: 4f4f5b
     lter: a8a8a8
@@ -73,10 +73,6 @@ thead tr {
 	background-color: white;
 	color: black;
 }
-
-Colors: 
-  dk: 787888
-  lt: 4f4f5b
-  lter: a8a8a8
-  white: ffffff
-
+.weekNumber {
+  background-color: #222;
+}

data/app/assets/stylesheets/calendar_styles/red.css

@@ -1,6 +1,6 @@
 /*
   A red, white, and grey theme.
-  
+
   AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
 */
 
@@ -58,3 +58,6 @@
 	background-color: #1e90ff;
 	color: white;
 }
+.weekNumber {
+  background-color: #BADA55;
+}

data/lib/calendar_helper.rb

@@ -40,6 +40,7 @@ module CalendarHelper
   #   :next_month_text   => nil                                 # Displayed right of the month name if set
   #   :month_header      => false                               # If you use false, the current month header will disappear.
   #   :calendar_title    => month_names[options[:month]]        # Pass in a custom title for the calendar. Defaults to month name
+  #   :show_other_months => true                                # Do not show the days for the previous and next months
   #
   # For more customization, you can pass a code block to this method, that will get one argument, a Date object,
   # and return a values for the individual table cells. The block can return an array, [cell_text, cell_attrs],
@@ -96,7 +97,12 @@ module CalendarHelper
       :next_month_text     => nil,
       :month_header        => true,
       :calendar_title      => month_names[options[:month]],
-      :summary             => "Calendar for #{month_names[options[:month]]} #{options[:year]}"
+      :summary             => "Calendar for #{month_names[options[:month]]} #{options[:year]}",
+      :show_week_numbers   => false,
+      :week_number_class   => 'weekNumber',
+      :week_number_title   => 'CW',
+      :week_number_format  => :iso8601, # :iso8601 or :us_canada,
+      :show_other_months   => true
     }
     options = defaults.merge options
 
@@ -121,9 +127,9 @@ module CalendarHelper
       cal << %(<tr>)
       if options[:previous_month_text] or options[:next_month_text]
         cal << %(<th colspan="2">#{options[:previous_month_text]}</th>)
-        colspan=3
+        colspan = options[:show_week_numbers] ? 4 : 3
       else
-        colspan=7
+        colspan = options[:show_week_numbers] ? 8 : 7
       end
       cal << %(<th colspan="#{colspan}" class="#{options[:month_name_class]}">#{options[:calendar_title]}</th>)
       cal << %(<th colspan="2">#{options[:next_month_text]}</th>) if options[:next_month_text]
@@ -132,6 +138,8 @@ module CalendarHelper
 
     cal << %(<tr class="#{options[:day_name_class]}">)
 
+    cal << %(<th>#{options[:week_number_title]}</th>) if options[:show_week_numbers]
+
     week_days.each do |wday|
       cal << %(<th id="#{th_id(Date::DAYNAMES[wday], options[:table_id])}" scope="col">)
       cal << (options[:abbrev] ? %(<abbr title="#{day_names[wday]}">#{abbr_day_names[wday]}</abbr>) : day_names[wday])
@@ -141,7 +149,10 @@ module CalendarHelper
     cal << "</tr></thead><tbody><tr>"
 
     # previous month
-    beginning_of_week(first, first_weekday).upto(first - 1) do |d|
+    begin_of_week = beginning_of_week(first, first_weekday)
+    cal << %(<td class="#{options[:week_number_class]}">#{week_number(begin_of_week, options[:week_number_format])}</td>) if options[:show_week_numbers]
+
+    begin_of_week.upto(first - 1) do |d|
       cal << generate_other_month_cell(d, options)
     end unless first.wday == first_weekday
 
@@ -149,6 +160,7 @@ module CalendarHelper
       cell_text, cell_attrs = block.call(cur)
       cell_text  ||= cur.mday
       cell_attrs ||= {}
+      cell_attrs["data-date"] = cur
       cell_attrs[:headers] = th_id(cur, options[:table_id])
       cell_attrs[:class] ||= options[:day_class]
       cell_attrs[:class] += " weekendDay" if [0, 6].include?(cur.wday)
@@ -156,7 +168,14 @@ module CalendarHelper
       cell_attrs[:class] += " today" if (cur == today) and options[:show_today]
 
       cal << generate_cell(cell_text, cell_attrs)
-      cal << "</tr><tr>" if cur.wday == last_weekday
+
+      if cur.wday == last_weekday
+        cal << %(</tr>)
+        if cur != last
+          cal << %(<tr>)
+          cal << %(<td class="#{options[:week_number_class]}">#{week_number(cur + 1, options[:week_number_format])}</td>) if options[:show_week_numbers]
+        end
+      end
     end
 
     # next month
@@ -170,6 +189,29 @@ module CalendarHelper
 
   private
 
+  def week_number(day, format)
+    case format
+    when :iso8601
+      reference_day = seek_previous_wday(day, 1)
+      reference_day.strftime('%V').to_i
+    when :us_canada
+      # US: the first day of the year defines the first calendar week
+      first_day_of_year = Date.new((day + 7).year, 1, 1)
+      reference_day = seek_next_wday(seek_next_wday(day, first_day_of_year.wday), 0)
+      reference_day.strftime('%U').to_i
+    else
+      raise "Invalid calendar week format provided."
+    end
+  end
+
+  def seek_previous_wday(ref_date, wday)
+    ref_date - days_between(ref_date.wday, wday)
+  end
+
+  def seek_next_wday(ref_date, wday)
+    ref_date + days_between(ref_date.wday, wday)
+  end
+
   def first_day_of_week(day)
     day
   end
@@ -201,10 +243,14 @@ module CalendarHelper
   end
 
   def generate_other_month_cell(date, options)
+    unless options[:show_other_months]
+      return generate_cell("", {})
+    end
     cell_attrs = {}
     cell_attrs[:headers] = th_id(date, options[:table_id])
     cell_attrs[:class] = options[:other_month_class]
     cell_attrs[:class] += " weekendDay" if weekend?(date)
+    cell_attrs["data-date"] = date
 
     cell_text = date.day
     if options[:accessible]

data/test/test_calendar_helper.rb

@@ -135,6 +135,16 @@ class CalendarHelperTest < Test::Unit::TestCase
     assert_match %r{<td [^>]*headers=\"calendar-2011-08-mon\"[^>]*>1</td>}, html
   end
 
+  def test_week_number_iso8601
+    html = calendar_with_defaults(:year => 2011, :month => 1, :week_number_format => :iso8601, :show_week_numbers => true, :first_day_of_week => 1)
+    [52,1,2,3,4,5].each { |cw| assert_match %r{<td class=\"weekNumber\">#{cw}</td>}, html }
+  end
+
+  def test_week_number_us_canada
+    html = calendar_with_defaults(:year => 2011, :month => 1, :week_number_format => :us_canada, :show_week_numbers => true)
+    [1,2,3,4,5,6].each { |cw| assert_match %r{<td class=\"weekNumber\">#{cw}</td>}, html }
+  end
+
   def test_non_english_language
     # mock I18n.t to simulate internationalized setting
     CalendarHelper.const_set :I18n, Class.new {

metadata

@@ -1,91 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: calendar_helper
-version: !ruby/object:Gem::Version
-  version: 0.2.5
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
-authors:
+authors: 
 - Geoffrey Grosenbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-08-05 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.10'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: flexmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "    A simple helper for creating an HTML calendar. The \"calendar\"
-  method will\n    be automatically available to your Rails view templates, or can
-  be used\n    with Sinatra or other webapps.\n\n    There is also a Rails generator
-  that copies some stylesheets for use alone\n    or alongside existing stylesheets.\n"
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: "    A simple helper for creating an HTML calendar. The \"calendar\" method will\n    be automatically available to your Rails view templates, or can be used\n    with Sinatra or other webapps.\n\n    There is also a Rails generator that copies some stylesheets for use alone\n    or alongside existing stylesheets.\n"
 email: boss@topfunky.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - History.rdoc
-files:
+files: 
 - MIT-LICENSE
 - README.rdoc
 - History.rdoc
@@ -95,31 +94,40 @@ files:
 - app/assets/stylesheets/calendar_styles/grey.css
 - app/assets/stylesheets/calendar_styles/red.css
 - test/test_calendar_helper.rb
+has_rdoc: true
 homepage: 
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple helper for creating an HTML calendar
-test_files:
+test_files: 
 - test/test_calendar_helper.rb