cal 0.2.1 → 0.3.0

data/lib/cal/monthly_calendar.rb

@@ -4,8 +4,10 @@ require 'active_support/core_ext/string/conversions'
 module Cal
   class MonthlyCalendar
 
-    def initialize(dateable)
+    def initialize(dateable, options = {})
+      options = options.reverse_merge :start_week_on => :sunday
       @date = dateable.to_date
+      @options = options
     end
 
     attr_reader :date
@@ -21,11 +23,11 @@ module Cal
     end
 
     def first_day
-      @first_day ||= Day.new date.beginning_of_month.beginning_of_week(:sunday), self
+      @first_day ||= Day.new date.beginning_of_month.beginning_of_week(@options[:start_week_on]), self
     end
 
     def last_day
-      @last_day ||= Day.new date.end_of_month.end_of_week(:sunday), self
+      @last_day ||= Day.new date.end_of_month.end_of_week(@options[:start_week_on]), self
     end
 
     def days

data/lib/cal/version.rb

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

data/spec/cal/monthly_calendar_spec.rb

@@ -2,9 +2,12 @@ require 'spec_helper'
 
 describe Cal::MonthlyCalendar do
 
-  subject { described_class.new @date }
+  subject { described_class.new @date, @options }
 
-  before { @date = Date.new 2012, 2 }
+  before do
+    @date = Date.new 2012, 2
+    @options = {}
+  end
 
   describe "initialize" do
     it "raises an error if arg can't be converted to a date" do
@@ -52,21 +55,55 @@ describe Cal::MonthlyCalendar do
   end
 
   describe "first_day" do
-    it "is the first viewable day on the calendar" do
-      @date = Date.new 2012, 2, 23
+    before { @date = Date.new 2012, 2, 23 }
+
+    [
+      [:monday, [1, 30]],
+      [:tuesday, [1, 31]],
+      [:wednesday, [2, 1]],
+      [:thursday, [1, 26]],
+      [:friday, [1, 27]],
+      [:saturday, [1, 28]]
+    ].each do |weekday, month_day|
+      context "when the weekday is set to start on #{weekday}" do
+        before { @options[:start_week_on] = weekday }
+        it "is the first viewable day on the calendar" do
+          subject.first_day.should == Cal::Day.new(Date.new(2012, *month_day), subject)
+        end
+      end
+    end
+
+    it "is the first viewable day on the calendar, using sunday as the default start day" do
       subject.first_day.should == Cal::Day.new(Date.new(2012, 1, 29), subject)
     end
   end
 
   describe "last_day" do
-    it "is the last viewable day on the calendar" do
-      @date = Date.new 2012, 2, 23
+    before { @date = Date.new 2012, 2, 23 }
+
+    [
+      [:monday, [3, 4]],
+      [:tuesday, [3, 5]],
+      [:wednesday, [3, 6]],
+      [:thursday, [2, 29]],
+      [:friday, [3, 1]],
+      [:saturday, [3, 2]]
+    ].each do |weekday, month_day|
+      context "when the weekday is set to start on #{weekday}" do
+        before { @options[:start_week_on] = weekday }
+        it "is the last viewable day on the calendar" do
+          subject.last_day.should == Cal::Day.new(Date.new(2012, *month_day), subject)
+        end
+      end
+    end
+
+    it "is the last viewable day on the calendar, using sunday as the default start day" do
       subject.last_day.should == Cal::Day.new(Date.new(2012, 3, 3), subject)
     end
   end
 
   describe "days" do
-    it "is a range of all the viewable days" do
+    it "is a range of the first day to the last day" do
       @date = Date.new 2012, 2, 23
       first_day = Cal::Day.new Date.new(2012, 1, 29), subject
       last_day = Cal::Day.new Date.new(2012, 3, 3), subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: