semantic_calendar 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/builders/monthly/table_builder.rb

@@ -0,0 +1,138 @@
+module SemanticCalendar
+  module Monthly
+    class TableCalendarBuilder
+
+      attr_accessor :t
+
+      def initialize(template, date, options = {}, &proc)
+        @t, @date = template, date
+
+        @year = date.year
+        @month = date.month
+        @today = (Time.respond_to?(:zone) && !(zone = Time.zone).nil? ? zone.now.to_date : Date.today)
+        @month_days = []
+
+        @first = Date.civil(@year, @month, 1)
+        @last  = Date.civil(@year, @month, -1)
+
+        @first_weekday = first_day_of_week(options[:first_day_of_week] || 0)
+        @last_weekday = last_day_of_week(options[:first_day_of_week] || 0)
+
+        @day_names = Date::DAYNAMES.dup
+        @first_weekday.times { @day_names.push(@day_names.shift) }
+
+        render(options.delete(:html), &proc)
+      end
+
+      def render(options, &proc)
+        buffer = t.capture(self, &proc)
+        t.concat(t.content_tag(:table, buffer, options))
+      end
+
+      def head(options = {}, &proc)
+        options[:abbrev] ||= (0..2)
+
+        options[:html] ||= {}
+
+        buffer = ''
+        if block_given?
+          value = t.capture(self, &proc).gsub('{month}', Date::MONTHNAMES[@month])
+          buffer = t.content_tag(:tr, t.content_tag(:th, value, {:colspan => 7}))
+        end
+
+        day_titles = @day_names.map do |d|
+          d[options[:abbrev]] == d ? d[options[:abbrev]] : t.content_tag(:abbr, d[options[:abbrev]], :title => d)
+        end
+      
+        head = [
+          buffer,
+          t.content_tag(:tr, day_titles.map { |d| t.content_tag(:th, d) }.join(''), {}, false)
+        ].join('')
+
+        t.content_tag(:thead, head, options.delete(:html), false)
+      end
+
+      def days(options = {}, &proc)
+        options[:html] ||= {}
+
+        collect_days(&proc)
+
+        buffer = ''
+        month_days = ''
+        @month_days.each_with_index do |d, index|
+          month_days << d
+          if (index+1) % 7 == 0
+            buffer << t.content_tag(:tr, month_days, {}, false)
+            month_days = ''
+          end
+        end
+
+        t.content_tag(:tbody, buffer, options.delete(:html), false)
+      end
+
+      def collect_days(&proc)
+        collect_previous_month_days(&proc)
+        collect_month_days(&proc)
+        collect_next_month_days(&proc)
+      end
+
+      def collect_month_days(&proc)
+        @first.upto(@last) do |d|
+          value, options = t.capture(d, &proc) if block_given?
+          @month_days << day(d, value, options)
+        end
+      end
+
+      def collect_previous_month_days(&proc)
+        beginning_of_week(@first, @first_weekday).upto(@first - 1) do |d|
+          value, options = t.capture(d, &proc) if block_given?
+          @month_days << day(d, value, options, 'previous-month')
+        end unless @first.wday == @first_weekday
+      end
+
+      def collect_next_month_days(&proc)
+        (@last + 1).upto(beginning_of_week(@last + 7, @first_weekday) - 1)  do |d|
+          value, options = t.capture(d, &proc) if block_given?
+          @month_days << day(d, value, options, 'next-month')
+        end unless @last.wday == @last_weekday
+      end
+
+      def day(d, value, options, extra_class = nil)
+        options ||= {}
+        options[:class] ||= ''
+
+        value = t.content_tag(:span, d.mday, {:class => 'month-day'}) + value || ''
+
+        options[:class] = t.add_class(options[:class], weekend?(d) ? 'weekend' : 'weekday')
+        options[:class] = t.add_class(options[:class], 'today') if (d == @today)
+        options[:class] = t.add_class(options[:class], extra_class) unless extra_class.blank?
+
+        t.content_tag(:td, value, options, false)
+      end
+
+      private
+
+      def first_day_of_week(day)
+        day
+      end
+
+      def last_day_of_week(day)
+        day > 0 ? day - 1 : 6
+      end
+
+      def days_between(first, second)
+        first > second ? second + (7 - first) : second - first
+      end
+
+      def beginning_of_week(date, start = 1)
+        days_to_beg = days_between(start, date.wday)
+        date - days_to_beg
+      end
+
+      def weekend?(date)
+        [0, 6].include?(date.wday)
+      end
+
+    end
+  end
+end

data/lib/semantic_calendar.rb

@@ -1,12 +1,11 @@
 # coding: utf-8
-require 'builders/table_builder'
-require 'builders/div_builder'
+require 'builders/monthly/table_builder'
 
 module SemanticCalendar #:nodoc:
 
   module SemanticCalendarHelper
 
-    @@builder = ::SemanticCalendar::TableCalendarBuilder
+    @@builder = ::SemanticCalendar::Monthly::TableCalendarBuilder
     mattr_accessor :builder
 
     def semantic_calendar(date, options = {}, &proc)

data/semantic_calendar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{semantic_calendar}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-10-28}
   s.description = %q{Semantic calendar; a semantic way to build beautifully simple calendars in Rails}
   s.email = %q{jejacks0n@gmail.com}
   s.extra_rdoc_files = [
@@ -23,8 +23,7 @@ Gem::Specification.new do |s|
      "README.textile",
      "Rakefile",
      "VERSION",
-     "lib/builders/div_builder.rb",
-     "lib/builders/table_builder.rb",
+     "lib/builders/monthly/table_builder.rb",
      "lib/semantic_calendar.rb",
      "semantic_calendar.gemspec",
      "spec/semantic_calendar_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: semantic_calendar
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeremy Jackson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -06:00
+date: 2010-10-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,8 +50,7 @@ files:
 - README.textile
 - Rakefile
 - VERSION
-- lib/builders/div_builder.rb
-- lib/builders/table_builder.rb
+- lib/builders/monthly/table_builder.rb
 - lib/semantic_calendar.rb
 - semantic_calendar.gemspec
 - spec/semantic_calendar_spec.rb

data/lib/builders/table_builder.rb

@@ -1,132 +0,0 @@
-module SemanticCalendar
-  class TableCalendarBuilder
-
-    attr_accessor :t
-
-    def initialize(template, date, options = {}, &proc)
-      @t, @date = template, date
-
-      @year = date.year
-      @month = date.month
-      @today = (Time.respond_to?(:zone) && !(zone = Time.zone).nil? ? zone.now.to_date : Date.today)
-      @month_days = []
-
-      @first = Date.civil(@year, @month, 1)
-      @last  = Date.civil(@year, @month, -1)
-
-      @first_weekday = first_day_of_week(options[:first_day_of_week] || 0)
-      @last_weekday = last_day_of_week(options[:first_day_of_week] || 0)
-
-      @day_names = Date::DAYNAMES.dup
-      @first_weekday.times { @day_names.push(@day_names.shift) }
-
-      render(options.delete(:html), &proc)
-    end
-
-    def render(options, &proc)
-      buffer = t.capture(self, &proc)
-      t.concat(t.content_tag(:table, buffer, options))
-    end
-
-    def head(options = {}, &proc)
-      options[:abbrev] ||= (0..2)
-
-      options[:html] ||= {}
-
-      buffer = ''
-      if block_given?
-        value = t.capture(self, &proc).gsub('{month}', Date::MONTHNAMES[@month])
-        buffer = t.content_tag(:tr, t.content_tag(:th, value, {:colspan => 7}))
-      end
-
-      day_titles = @day_names.map do |d|
-        d[options[:abbrev]] == d ? d[options[:abbrev]] : t.content_tag(:abbr, d[options[:abbrev]], :title => d)
-      end
-      
-      head = [
-        buffer,
-        t.content_tag(:tr, day_titles.map { |d| t.content_tag(:th, d) }.join(''), {}, false)
-      ].join('')
-
-      t.content_tag(:thead, head, options.delete(:html), false)
-    end
-
-    def days(options = {}, &proc)
-      options[:html] ||= {}
-
-      collect_days(&proc)
-
-      buffer = ''
-      month_days = ''
-      @month_days.each_with_index do |d, index|
-        month_days << d
-        if (index+1) % 7 == 0
-          buffer << t.content_tag(:tr, month_days, {}, false)
-          month_days = ''
-        end
-      end
-
-      t.content_tag(:tbody, buffer, options.delete(:html), false)
-    end
-
-    def collect_days(&proc)
-      collect_previous_month_days
-      collect_month_days(&proc)
-      collect_next_month_days
-    end
-
-    def collect_month_days(&proc)
-      @first.upto(@last) do |d|
-        value, options = t.capture(d, &proc) if block_given?
-        @month_days << day(d, value, options)
-      end
-    end
-
-    def collect_previous_month_days
-      beginning_of_week(@first, @first_weekday).upto(@first - 1) do |d|
-        @month_days << day(d, nil, :class => 'previous-month')
-      end unless @first.wday == @first_weekday
-    end
-
-    def collect_next_month_days
-      (@last + 1).upto(beginning_of_week(@last + 7, @first_weekday) - 1)  do |d|
-        @month_days << day(d, nil, :class => 'next-month')
-      end unless @last.wday == @last_weekday
-    end
-
-    def day(d, value, options)
-      value = value..blank? d.mday : value
-      options ||= {}
-      options[:class] ||= ''
-
-      options[:class] = t.add_class(options[:class], weekend?(d) ? 'weekend' : 'weekday')
-      options[:class] = t.add_class(options[:class], 'today') if (d == @today)
-
-      t.content_tag(:td, value, options, false)
-    end
-
-    private
-
-    def first_day_of_week(day)
-      day
-    end
-
-    def last_day_of_week(day)
-      day > 0 ? day - 1 : 6
-    end
-
-    def days_between(first, second)
-      first > second ? second + (7 - first) : second - first
-    end
-
-    def beginning_of_week(date, start = 1)
-      days_to_beg = days_between(start, date.wday)
-      date - days_to_beg
-    end
-
-    def weekend?(date)
-      [0, 6].include?(date.wday)
-    end
-
-  end
-end