cal 0.3.0 → 0.4.0

data/README.md

@@ -20,34 +20,31 @@ Or install it yourself as:
 
 ## Usage
 
+See the Rails app [https://github.com/austinthecoder/cal-app](https://github.com/austinthecoder/cal-app) for an example.
+
 ### Rails example
 
 ``` ruby
 # in the controller
-- calendar = Cal::MonthlyCalendar.new params[:date]
+- calendar = Cal::MonthlyCalendar.new((params[:date] || Date.current), :start_week_on => :monday)
 
 # in the view
 %h3
   = link_to 'Previous month', url_for(:date => calendar.previous.date)
   |
-  = calendar.month
+  = "#{calendar.month} #{calendar.year}"
   |
   = link_to 'Next month', url_for(:date => calendar.next.date)
 
 %table
   %thead
     %tr
-      %th Sunday
-      %th Monday
-      %th Tuesday
-      %th Wednesday
-      %th Thursday
-      %th Friday
-      %th Saturday
+      - calendar.day_names.each do |name|
+        %th= name
   %tbody
     - calendar.weeks.each do |week|
       %tr
-        - week.days.each do |day|
+        - week.each do |day|
           %td{:class => ('today' if day.today?)}
             = day.number
 ```

data/lib/cal.rb

@@ -6,5 +6,6 @@ module Cal
   autoload :MonthlyCalendar, 'cal/monthly_calendar'
   autoload :Day, 'cal/day'
   autoload :Month, 'cal/month'
+  autoload :Year, 'cal/year'
 
 end

data/lib/cal/monthly_calendar.rb

@@ -4,13 +4,24 @@ require 'active_support/core_ext/string/conversions'
 module Cal
   class MonthlyCalendar
 
+    DAY_NAMES = {
+      :sunday => 0,
+      :monday => 1,
+      :tuesday => 2,
+      :wednesday => 3,
+      :thursday => 4,
+      :friday => 5,
+      :saturday => 6
+    }
+
     def initialize(dateable, options = {})
-      options = options.reverse_merge :start_week_on => :sunday
       @date = dateable.to_date
-      @options = options
+      @start_week_on = options[:start_week_on] || :sunday
+      @month = Month.new self
+      @year = Year.new self
     end
 
-    attr_reader :date
+    attr_reader :date, :month, :year
 
     def ==(other)
       other.is_a?(MonthlyCalendar) &&
@@ -18,16 +29,12 @@ module Cal
         other.date.month == date.month
     end
 
-    def month
-      @month ||= Month.new self
-    end
-
     def first_day
-      @first_day ||= Day.new date.beginning_of_month.beginning_of_week(@options[:start_week_on]), self
+      @first_day ||= Day.new date.beginning_of_month.beginning_of_week(@start_week_on), self
     end
 
     def last_day
-      @last_day ||= Day.new date.end_of_month.end_of_week(@options[:start_week_on]), self
+      @last_day ||= Day.new date.end_of_month.end_of_week(@start_week_on), self
     end
 
     def days
@@ -46,5 +53,9 @@ module Cal
       self.class.new date.next_month
     end
 
+    def day_names
+      %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday].rotate DAY_NAMES[@start_week_on]
+    end
+
   end
 end

data/lib/cal/version.rb

@@ -1,5 +1,5 @@
 module Cal
 
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
 end

data/lib/cal/year.rb

@@ -0,0 +1,19 @@
+module Cal
+  class Year
+
+    def initialize(calendar)
+      @calendar = calendar
+    end
+
+    attr_reader :calendar
+
+    def ==(other)
+      other.is_a?(Year) && other.calendar == calendar
+    end
+
+    def to_s
+      calendar.date.strftime "%Y"
+    end
+
+  end
+end

data/spec/cal/monthly_calendar_spec.rb

@@ -54,6 +54,10 @@ describe Cal::MonthlyCalendar do
     it { subject.month.should == Cal::Month.new(subject) }
   end
 
+  describe "year" do
+    it { subject.year.should == Cal::Year.new(subject) }
+  end
+
   describe "first_day" do
     before { @date = Date.new 2012, 2, 23 }
 
@@ -136,4 +140,24 @@ describe Cal::MonthlyCalendar do
     end
   end
 
+  describe "day_names" do
+    it "defaults to sunday through saturday" do
+      subject.day_names.should == %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday]
+    end
+
+    [
+      %w[Monday Tuesday Wednesday Thursday Friday Saturday Sunday],
+      %w[Tuesday Wednesday Thursday Friday Saturday Sunday Monday],
+      %w[Wednesday Thursday Friday Saturday Sunday Monday Tuesday],
+      %w[Thursday Friday Saturday Sunday Monday Tuesday Wednesday],
+      %w[Friday Saturday Sunday Monday Tuesday Wednesday Thursday],
+      %w[Saturday Sunday Monday Tuesday Wednesday Thursday Friday]
+    ].each do |day_names|
+      it "is #{day_names[0]} through #{day_names[6]} when the weekday is set to start on #{day_names[0]}" do
+        @options[:start_week_on] = day_names[0].downcase.to_sym
+        subject.day_names.should == day_names
+      end
+    end
+  end
+
 end

data/spec/cal/year_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Cal::Year do
+
+  subject { described_class.new @calendar }
+
+  before { @calendar = OpenStruct.new }
+
+  describe "==" do
+    it "is true with another year with the same calendar" do
+      (subject == described_class.new(@calendar)).should be_true
+    end
+
+    it "is false with another year with a different calendar" do
+      (subject == described_class.new(Object.new)).should be_false
+    end
+
+    it "is false with a non year" do
+      (subject == Object.new).should be_false
+    end
+  end
+
+  describe "calendar" do
+    it "is the given calendar" do
+      subject.calendar.should == @calendar
+    end
+  end
+
+  describe "to_s" do
+    before { @calendar.date = Date.new 1983 }
+    it { subject.to_s.should == '1983' }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,9 +62,11 @@ files:
 - lib/cal/month.rb
 - lib/cal/monthly_calendar.rb
 - lib/cal/version.rb
+- lib/cal/year.rb
 - spec/cal/day_spec.rb
 - spec/cal/month_spec.rb
 - spec/cal/monthly_calendar_spec.rb
+- spec/cal/year_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -94,4 +96,5 @@ test_files:
 - spec/cal/day_spec.rb
 - spec/cal/month_spec.rb
 - spec/cal/monthly_calendar_spec.rb
+- spec/cal/year_spec.rb
 - spec/spec_helper.rb