cal 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 448f52e733440c6f89a21075c476e96848eb7dfb
+  data.tar.gz: 3e02e40c42d4f3444c7792f5d0476b5bdf9fecd2
+SHA512:
+  metadata.gz: 4ed601f9a089ae1809ea588166b71fee311a8bb27e63c2845420cc2beb1fafdf3798111ab72051feaf5d03372532c7e117014f71580a094c72f7b499a418f30b
+  data.tar.gz: f6b66ca1dec81bc922dcac0b6527b0b48bba101e3c6a245873c1e8d1836a14024613fb6b90328673444af3eaf9ff7d41dbd7e050411fa4740745292930f5ee1a

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .rspec
+.ruby-version
 .yardoc
 Gemfile.lock
 InstalledFiles

data/cal.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activesupport", ">= 2"
 
-  gem.add_development_dependency "rspec", "~> 2.10.0"
+  gem.add_development_dependency "rspec", "~> 2.11.0"
 end

data/lib/cal.rb

@@ -1,17 +1,7 @@
-require "cal/version"
-require 'active_support/time'
+require 'cal/monthly_calendar'
 
 module Cal
-
-  autoload :MonthlyCalendar, 'cal/monthly_calendar'
-  autoload :Day, 'cal/day'
-  autoload :Month, 'cal/month'
-  autoload :DayName, 'cal/day_name'
-
-  class << self
-    def new_monthly_calendar(*args)
-      MonthlyCalendar.new *args
-    end
+  def self.new_monthly_calendar(*args)
+    MonthlyCalendar.new *args
   end
-
-end
+end

data/lib/cal/day.rb

@@ -1,8 +1,8 @@
 require 'active_support/core_ext/module/delegation'
+require 'active_support/time'
 
 module Cal
   class Day
-
     include Comparable
 
     def initialize(date, calendar)
@@ -29,6 +29,5 @@ module Cal
     def number
       date.day
     end
-
   end
 end

data/lib/cal/day_name.rb

@@ -1,6 +1,5 @@
 module Cal
   class DayName
-
     class << self
       def all(options = {})
         if options[:start_on]
@@ -38,7 +37,7 @@ module Cal
         @saturday ||= new :saturday, 'Saturday', 7
       end
 
-    private
+      private
 
       def sunday_to_saturday
         @sunday_to_saturday ||= [sunday, monday, tuesday, wednesday, thursday, friday, saturday]
@@ -68,6 +67,5 @@ module Cal
         day_name.position == (position > 1 ? position - 1 : 7)
       end
     end
-
   end
 end

data/lib/cal/month.rb

@@ -1,6 +1,5 @@
 module Cal
   class Month
-
     include Comparable
 
     def initialize(year, number)
@@ -32,11 +31,10 @@ module Cal
       self
     end
 
-  private
+    private
 
     def date
       @date ||= Date.new year, number
     end
-
   end
 end

data/lib/cal/monthly_calendar.rb

@@ -1,28 +1,14 @@
 require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/string/conversions'
+require 'active_support/time'
+require 'cal/day'
+require 'cal/day_name'
+require 'cal/month'
 
 module Cal
   class MonthlyCalendar
-
     include Comparable
 
-    class << self
-      def from_month(month, options = {})
-        month = month.to_month
-        new month.year, month.number, options
-      end
-
-      def from_param(param, options = {})
-        year, month_number = if param.present?
-          param.split '-'
-        else
-          now = Date.current
-          [now.year, now.month]
-        end
-        new year, month_number, options
-      end
-    end
-
     def initialize(year, month_number, options = {})
       @start_week_on = options[:start_week_on] || :sunday
       @month = Month.new year, month_number
@@ -33,7 +19,7 @@ module Cal
     delegate :year, :to => :month
 
     def <=>(other)
-      if other.is_a?(MonthlyCalendar) && start_week_on == other.send(:start_week_on)
+      if other.is_a?(self.class) && start_week_on == other.send(:start_week_on)
         month <=> other.month
       end
     end
@@ -61,11 +47,13 @@ module Cal
     end
 
     def previous
-      self.class.from_month month.previous, :start_week_on => start_week_on
+      previous_month = month.previous
+      self.class.new previous_month.year, previous_month.number, :start_week_on => start_week_on
     end
 
     def next
-      self.class.from_month month.succ, :start_week_on => start_week_on
+      next_month = month.succ
+      self.class.new next_month.year, next_month.number, :start_week_on => start_week_on
     end
 
     def day_names
@@ -76,9 +64,8 @@ module Cal
       "#{year}-#{month.to_i}"
     end
 
-  private
+    private
 
     attr_reader :start_week_on
-
   end
 end

data/lib/cal/version.rb

@@ -1,5 +1,3 @@
 module Cal
-
-  VERSION = "0.6.1"
-
-end
+  VERSION = "0.6.2"
+end

data/spec/cal/day_name_spec.rb

@@ -1,134 +1,125 @@
 require 'spec_helper'
+require 'cal/day_name'
 
 describe Cal::DayName do
+  describe ".all" do
+    it "returns all the days, starting with sunday" do
+      Cal::DayName.all.should == [
+        Cal::DayName.sunday,
+        Cal::DayName.monday,
+        Cal::DayName.tuesday,
+        Cal::DayName.wednesday,
+        Cal::DayName.thursday,
+        Cal::DayName.friday,
+        Cal::DayName.saturday
+      ]
+    end
 
-  describe "class method" do
-    subject { described_class }
-
-    describe "all" do
-      it "returns all the days, starting with sunday" do
-        subject.all.should == [
-          subject.sunday,
-          subject.monday,
-          subject.tuesday,
-          subject.wednesday,
-          subject.thursday,
-          subject.friday,
-          subject.saturday
-        ]
-      end
+    it "when given a day name symbol as the :start_on option, it starts the week on that day" do
+      Cal::DayName.all(:start_on => :tuesday).should == [
+        Cal::DayName.tuesday,
+        Cal::DayName.wednesday,
+        Cal::DayName.thursday,
+        Cal::DayName.friday,
+        Cal::DayName.saturday,
+        Cal::DayName.sunday,
+        Cal::DayName.monday
+      ]
+    end
 
-      it "when given a day name symbol as the :start_on option, it starts the week on that day" do
-        subject.all(:start_on => :tuesday).should == [
-          subject.tuesday,
-          subject.wednesday,
-          subject.thursday,
-          subject.friday,
-          subject.saturday,
-          subject.sunday,
-          subject.monday
+    it "accepts the :start_on option in various formats" do
+      [:tuesday, 'Tuesday', 'tuesday'].each do |start_on|
+        Cal::DayName.all(:start_on => start_on).should == [
+          Cal::DayName.tuesday,
+          Cal::DayName.wednesday,
+          Cal::DayName.thursday,
+          Cal::DayName.friday,
+          Cal::DayName.saturday,
+          Cal::DayName.sunday,
+          Cal::DayName.monday
         ]
       end
-
-      it "accepts the :start_on option in various formats" do
-        [:tuesday, 'Tuesday', 'tuesday'].each do |start_on|
-          subject.all(:start_on => start_on).should == [
-            subject.tuesday,
-            subject.wednesday,
-            subject.thursday,
-            subject.friday,
-            subject.saturday,
-            subject.sunday,
-            subject.monday
-          ]
-        end
-      end
-
-      it "without the :start_on option, it returns the same object" do
-        subject.all.equal?(subject.all).should be_true
-      end
     end
 
-    it "doesn't allow direct initialization" do
-      expect { subject.new }.to raise_error NoMethodError
+    it "without the :start_on option, it returns the same object" do
+      Cal::DayName.all.equal?(Cal::DayName.all).should be_true
     end
   end
 
-  describe "instance method" do
-    [
-      [:sunday, 'Sunday', 1],
-      [:monday, 'Monday', 2],
-      [:tuesday, 'Tuesday', 3],
-      [:wednesday, 'Wednesday', 4],
-      [:thursday, 'Thursday', 5],
-      [:friday, 'Friday', 6],
-      [:saturday, 'Saturday', 7]
-    ].each do |day, string, position|
-      context "when the day is #{day}" do
-        subject { described_class.send day }
+  it "doesn't allow direct initialization" do
+    expect { Cal::DayName.new }.to raise_error NoMethodError
+  end
 
-        it "is the same instance as another #{day}" do
-          subject.equal?(described_class.send(day)).should be_true
-        end
+  [
+    [:sunday, 'Sunday', 1],
+    [:monday, 'Monday', 2],
+    [:tuesday, 'Tuesday', 3],
+    [:wednesday, 'Wednesday', 4],
+    [:thursday, 'Thursday', 5],
+    [:friday, 'Friday', 6],
+    [:saturday, 'Saturday', 7]
+  ].each do |day, string, position|
+    context "when the day is #{day}" do
+      it "is the same instance as another #{day}" do
+        Cal::DayName.send(day).equal?(Cal::DayName.send(day)).should be_true
+      end
 
-        describe "to_sym" do
-          it "is #{day.inspect}" do
-            subject.to_sym.should == day
-          end
+      describe "to_sym" do
+        it "is #{day.inspect}" do
+          Cal::DayName.send(day).to_sym.should == day
         end
+      end
 
-        describe "to_s" do
-          it "is #{string.inspect}" do
-            subject.to_s.should == string
-          end
+      describe "to_s" do
+        it "is #{string.inspect}" do
+          Cal::DayName.send(day).to_s.should == string
         end
+      end
 
-        describe "position" do
-          it "is #{position.inspect}" do
-            subject.position.should == position
-          end
+      describe "position" do
+        it "is #{position.inspect}" do
+          Cal::DayName.send(day).position.should == position
         end
       end
     end
+  end
 
-    describe "succ" do
-      [
-        [:sunday, :monday],
-        [:monday, :tuesday],
-        [:tuesday, :wednesday],
-        [:wednesday, :thursday],
-        [:thursday, :friday],
-        [:friday, :saturday],
-        [:saturday, :sunday]
-      ].each do |day, next_day|
-        it "is #{next_day} when the say is #{day}" do
-          described_class.send(day).succ.should == described_class.send(next_day)
-        end
+  describe "#succ" do
+    [
+      [:sunday, :monday],
+      [:monday, :tuesday],
+      [:tuesday, :wednesday],
+      [:wednesday, :thursday],
+      [:thursday, :friday],
+      [:friday, :saturday],
+      [:saturday, :sunday]
+    ].each do |day, next_day|
+      it "is #{next_day} when the say is #{day}" do
+        Cal::DayName.send(day).succ.should == Cal::DayName.send(next_day)
       end
     end
+  end
 
-    describe "next" do
-      it "is an alias of #succ" do
-        day_name = described_class.friday
-        day_name.next.should == day_name.succ
-      end
+  describe "#next" do
+    it "is an alias of #succ" do
+      day_name = Cal::DayName.friday
+      day_name.next.should == day_name.succ
     end
+  end
 
-    describe "previous" do
-      [
-        [:sunday, :saturday],
-        [:monday, :sunday],
-        [:tuesday, :monday],
-        [:wednesday, :tuesday],
-        [:thursday, :wednesday],
-        [:friday, :thursday],
-        [:saturday, :friday]
-      ].each do |day, previous_day|
-        it "is #{previous_day} when the say is #{day}" do
-          described_class.send(day).previous.should == described_class.send(previous_day)
-        end
+  describe "#previous" do
+    [
+      [:sunday, :saturday],
+      [:monday, :sunday],
+      [:tuesday, :monday],
+      [:wednesday, :tuesday],
+      [:thursday, :wednesday],
+      [:friday, :thursday],
+      [:saturday, :friday]
+    ].each do |day, previous_day|
+      it "is #{previous_day} when the say is #{day}" do
+        Cal::DayName.send(day).previous.should == Cal::DayName.send(previous_day)
       end
     end
   end
-
 end

data/spec/cal/day_spec.rb

@@ -1,63 +1,60 @@
 require 'spec_helper'
+require 'cal/day'
 
 describe Cal::Day do
-
-  subject { described_class.new @date, @calendar }
-
   before do
     @date = Date.new 2012, 1, 15
     @calendar = OpenStruct.new :current_day => Date.new(2012, 1, 5)
   end
 
-  it { should be_a(Comparable) }
+  it { Cal::Day.new(@date, @calendar).should be_a(Comparable) }
 
-  describe "==" do
+  describe "#==" do
     it "is true with another day with the same calendar and date" do
-      subject.should == described_class.new(@date, @calendar)
+      Cal::Day.new(@date, @calendar).should == Cal::Day.new(@date, @calendar)
     end
 
     it "is false with another day with a different calendar" do
-      subject.should_not == described_class.new(@date, Object.new)
+      Cal::Day.new(@date, @calendar).should_not == Cal::Day.new(@date, Object.new)
     end
 
     it "is false with another day with a different date" do
-      subject.should_not == described_class.new(Date.new(2012, 1, 14), @calendar)
+      Cal::Day.new(@date, @calendar).should_not == Cal::Day.new(Date.new(2012, 1, 14), @calendar)
     end
 
     it "is false with a non Cal::Day" do
-      subject.should_not == Object.new
+      Cal::Day.new(@date, @calendar).should_not == Object.new
     end
   end
 
-  describe "today?" do
+  describe "#today?" do
     it "is true when the date is today" do
       @date = Date.current
-      subject.should be_today
+      Cal::Day.new(@date, @calendar).should be_today
     end
   end
 
-  describe "number" do
+  describe "#number" do
     [3, 15].each do |n|
       it "is the day of the month" do
         @date = Date.new 2012, 1, n
-        subject.number.should == n
+        Cal::Day.new(@date, @calendar).number.should == n
       end
     end
   end
 
-  describe "<=>" do
+  describe "#<=>" do
     it "is the result of comparing the dates" do
       other_date = Date.new 2012, 2, 15
       result = Object.new
-      subject.date.stub(:<=>) { |obj| result if obj == other_date }
-      (subject <=> described_class.new(other_date, Object.new)).should == result
+      Cal::Day.new(@date, @calendar).date.stub(:<=>) { |obj| result if obj == other_date }
+      (Cal::Day.new(@date, @calendar) <=> Cal::Day.new(other_date, Object.new)).should == result
     end
   end
 
-  describe "succ" do
+  describe "#succ" do
     it "is the next day" do
-      subject.succ.should == described_class.new(Date.new(2012, 1, 16), @calendar)
+      Cal::Day.new(@date, @calendar).succ.should == Cal::Day.new(Date.new(2012, 1, 16), @calendar)
     end
   end
-
 end

data/spec/cal/month_spec.rb

@@ -1,28 +1,26 @@
 require 'spec_helper'
+require 'cal/month'
 
 describe Cal::Month do
-
-  subject { described_class.new @year, @month_number }
-
   before do
     @year = 2012
     @month_number = 3
   end
 
-  describe "initialize" do
+  describe ".new" do
     it "coerces the year and month number to integers" do
       @year = "2012"
       @month_number = "04"
-      subject.year.should == 2012
-      subject.number.should == 4
+      Cal::Month.new(@year, @month_number).year.should == 2012
+      Cal::Month.new(@year, @month_number).number.should == 4
     end
   end
 
-  it { should be_a(Comparable) }
+  it { Cal::Month.new(@year, @month_number).should be_a(Comparable) }
 
-  describe "<=>" do
+  describe "#<=>" do
     it "is nil with a non month" do
-      (subject <=> Object.new).should be_nil
+      (Cal::Month.new(@year, @month_number) <=> Object.new).should be_nil
     end
 
     context "given another month" do
@@ -30,93 +28,94 @@ describe Cal::Month do
 
       context "when the other's year is the same" do
         it "is 0 when the other's month is the same" do
-          (subject <=> @other).should == 0
+          (Cal::Month.new(@year, @month_number) <=> @other).should == 0
         end
 
         it "is -1 when the other's month is higher" do
           @month_number = 2
-          (subject <=> @other).should == -1
+          (Cal::Month.new(@year, @month_number) <=> @other).should == -1
         end
 
         it "is 1 when the other's month is lower" do
           @month_number = 4
-          (subject <=> @other).should == 1
+          (Cal::Month.new(@year, @month_number) <=> @other).should == 1
         end
       end
 
       it "is -1 when the other's year is higher" do
         @year = 2011
-        (subject <=> @other).should == -1
+        (Cal::Month.new(@year, @month_number) <=> @other).should == -1
       end
 
       it "is 1 when the other's year is lower" do
         @year = 2013
-        (subject <=> @other).should == 1
+        (Cal::Month.new(@year, @month_number) <=> @other).should == 1
       end
     end
   end
 
-  describe "==" do
+  describe "#==" do
     it "is false with a non month" do
-      (subject == Object.new).should be_false
+      (Cal::Month.new(@year, @month_number) == Object.new).should be_false
     end
 
     context "given another month" do
       before { @month = described_class.new @year, @month_number }
 
       it "is true if the comparison is zero" do
-        subject.stub(:<=>) { 0 }
-        (subject == @month).should be_true
+        month = Cal::Month.new(@year, @month_number)
+        month.stub(:<=>) { 0 }
+        (month == @month).should be_true
       end
 
       it "is false if the comparison is not zero" do
-        subject.stub(:<=>) { -1 }
-        (subject == @month).should be_false
+        month = Cal::Month.new(@year, @month_number)
+        month.stub(:<=>) { -1 }
+        (month == @month).should be_false
       end
     end
   end
 
-  it { subject.number.should == @month_number }
+  it { Cal::Month.new(@year, @month_number).number.should == @month_number }
 
-  describe "to_s" do
+  describe "#to_s" do
     it "is the result of formatting a date object" do
       date = Object.new
       format = Object.new
       result = Object.new
       Date.stub(:new) { |*args| date if args == [@year, @month_number] }
       date.stub(:strftime) { |f| result if f == format }
-      subject.to_s(format).should == result
+      Cal::Month.new(@year, @month_number).to_s(format).should == result
     end
   end
 
-  describe "year" do
+  describe "#year" do
     it "is the given year" do
-      subject.year.should == 2012
+      Cal::Month.new(@year, @month_number).year.should == 2012
     end
   end
 
-  describe "succ" do
+  describe "#succ" do
     [[2012, 12, 2013, 1], [2012, 1, 2012, 2]].each do |year, month_number, new_year, new_month_number|
       it "is the next month" do
         @year = year
         @month_number = month_number
-        subject.succ.should == described_class.new(new_year, new_month_number)
+        Cal::Month.new(@year, @month_number).succ.should == described_class.new(new_year, new_month_number)
       end
     end
   end
 
-  describe "previous" do
+  describe "#previous" do
     [[2012, 12, 2012, 11], [2012, 1, 2011, 12]].each do |year, month_number, new_year, new_month_number|
       it "is the previous month" do
         @year = year
         @month_number = month_number
-        subject.previous.should == described_class.new(new_year, new_month_number)
+        Cal::Month.new(@year, @month_number).previous.should == described_class.new(new_year, new_month_number)
       end
     end
   end
 
-  describe "to_month" do
-    it { subject.to_month.should == subject }
+  describe "#to_month" do
+    it { Cal::Month.new(@year, @month_number).to_month.should == Cal::Month.new(@year, @month_number) }
   end
-
 end

data/spec/cal/monthly_calendar_spec.rb

@@ -1,209 +1,157 @@
 require 'spec_helper'
+require 'cal/monthly_calendar'
 
 describe Cal::MonthlyCalendar do
+  it { Cal::MonthlyCalendar.new(2012, 2).should be_a(Comparable) }
 
-  describe "class methods" do
-    subject { described_class }
-
-    describe "from_month" do
-      it "returns a calendar for the month's year and month number" do
-        subject.from_month(Cal::Month.new(2012, 11), :start_week_on => :tuesday).should == subject.new(2012, 11, :start_week_on => :tuesday)
-      end
-
-      it "raises an error without something that can be converted to a month" do
-        [nil, Object.new].each do |object|
-          expect { subject.from_month(object) }.to raise_error(NoMethodError)
-        end
-      end
-    end
-
-    describe "from_param" do
-      it "is the calendar for the given param" do
-        calendar = subject.new 2012, 5, :start_week_on => :tuesday
-        subject.from_param(calendar.to_param, :start_week_on => :tuesday).should == calendar
-      end
-
-      context "with a blank param" do
-        it "returns a calendar for the current year and month" do
-          [' ', nil].each do |param|
-            date = Date.current
-            subject.from_param(param).should == subject.new(date.year, date.month)
-          end
-        end
-      end
+  describe ".new" do
+    it "coerces the year and month number to integers" do
+      Cal::MonthlyCalendar.new('2012', '04').should == Cal::MonthlyCalendar.new(2012, 4)
     end
   end
 
-  describe "instance methods" do
-    subject { described_class.new @year, @month, @options }
-
-    before do
-      @year = 2012
-      @month = 2
-      @options = {}
+  describe "#<=>" do
+    it "is nil with a non monthly calendar" do
+      (Cal::MonthlyCalendar.new(2012, 2) <=> Object.new).should be_nil
     end
 
-    it { should be_a(Comparable) }
-
-    describe "initialize" do
-      it "coerces the year and month number to integers" do
-        @year = "2012"
-        @month = "04"
-        subject.should == described_class.new(2012, 4)
-      end
-    end
+    context "given another monthly calendar" do
+      before { @other = Cal::MonthlyCalendar.new 2012, 2 }
 
-    describe "<=>" do
-      it "is nil with a non monthly calendar" do
-        (subject <=> Object.new).should be_nil
+      it "is nil when the other's start day is different" do
+        (Cal::MonthlyCalendar.new(2012, 2, :start_week_on => :monday) <=> @other).should be_nil
       end
 
-      it "is nil with a non monthly calendar" do
-        (subject <=> Object.new).should be_nil
+      it "is the result of comparing the months when the other's start day is the same" do
+        result = Object.new
+        calendar = Cal::MonthlyCalendar.new(2012, 2)
+        calendar.month.stub(:<=>).with(@other.month) { result }
+        (calendar <=> @other).should == result
       end
+    end
+  end
 
-      context "given another monthly calendar" do
-        before { @other = described_class.new @year, @month, @options }
+  describe "#month" do
+    it { Cal::MonthlyCalendar.new(2012, 2).month.should == Cal::Month.new(2012, 2) }
+  end
 
-        it "is nil when the other's start day is different" do
-          @options[:start_week_on] = :tuesday
-          (subject <=> @other).should be_nil
-        end
+  describe "#year" do
+    it { Cal::MonthlyCalendar.new(2012, 2).year.should == 2012 }
+  end
 
-        it "is the result of comparing the months when the other's start day is the same" do
-          result = Object.new
-          subject.month.stub(:<=>) { |m| result if m == @other.month }
-          (subject <=> @other).should == result
+  describe "#first_day" do
+    [
+      [: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
+        it "is the first viewable day on the calendar" do
+          calendar = Cal::MonthlyCalendar.new(2012, 2, :start_week_on => weekday)
+          calendar.first_day.should == Cal::Day.new(Date.new(2012, *month_day), calendar)
         end
       end
     end
 
-    describe "month" do
-      it { subject.month.should == Cal::Month.new(@year, @month) }
-    end
-
-    describe "year" do
-      it { subject.year.should == @year }
+    it "is the first viewable day on the calendar, using sunday as the default start day" do
+      calendar = Cal::MonthlyCalendar.new(2012, 2)
+      calendar.first_day.should == Cal::Day.new(Date.new(2012, 1, 29), calendar)
     end
+  end
 
-    describe "first_day" do
-      before { @year, @month = 2012, 2 }
-
-      [
-        [: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
+  describe "#last_day" do
+    [
+      [: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
+        it "is the last viewable day on the calendar" do
+          calendar = Cal::MonthlyCalendar.new(2012, 2, :start_week_on => weekday)
+          calendar.last_day.should == Cal::Day.new(Date.new(2012, *month_day), calendar)
         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
-      before { @year, @month = 2012, 2 }
-
-      [
-        [: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
+    it "is the last viewable day on the calendar, using sunday as the default start day" do
+      calendar = Cal::MonthlyCalendar.new(2012, 2)
+      calendar.last_day.should == Cal::Day.new(Date.new(2012, 3, 3), calendar)
     end
+  end
 
-    describe "days" do
-      it "is a range of the first day to the last day" do
-        @year, @month = 2012, 2
-        first_day = Cal::Day.new Date.new(2012, 1, 29), subject
-        last_day = Cal::Day.new Date.new(2012, 3, 3), subject
-        subject.days.should == (first_day..last_day)
-      end
+  describe "#days" do
+    it "is a range of the first day to the last day" do
+      calendar = Cal::MonthlyCalendar.new(2012, 2)
+      first_day = Cal::Day.new Date.new(2012, 1, 29), calendar
+      last_day = Cal::Day.new Date.new(2012, 3, 3), calendar
+      calendar.days.should == (first_day..last_day)
     end
+  end
 
-    describe "weeks" do
-      it "an array of the days in groups of 7" do
-        @year, @month = 2012, 2
-        subject.weeks.should == [
-          %w[01-29 01-30 01-31 02-01 02-02 02-03 02-04].map { |s| Cal::Day.new Date.parse("2012-#{s}"), subject },
-          %w[02-05 02-06 02-07 02-08 02-09 02-10 02-11].map { |s| Cal::Day.new Date.parse("2012-#{s}"), subject },
-          %w[02-12 02-13 02-14 02-15 02-16 02-17 02-18].map { |s| Cal::Day.new Date.parse("2012-#{s}"), subject },
-          %w[02-19 02-20 02-21 02-22 02-23 02-24 02-25].map { |s| Cal::Day.new Date.parse("2012-#{s}"), subject },
-          %w[02-26 02-27 02-28 02-29 03-01 03-02 03-03].map { |s| Cal::Day.new Date.parse("2012-#{s}"), subject }
-        ]
-      end
+  describe "#weeks" do
+    it "an array of the days in groups of 7" do
+      calendar = Cal::MonthlyCalendar.new(2012, 2)
+      calendar.weeks.should == [
+        %w[01-29 01-30 01-31 02-01 02-02 02-03 02-04].map { |s| Cal::Day.new Date.parse("2012-#{s}"), calendar },
+        %w[02-05 02-06 02-07 02-08 02-09 02-10 02-11].map { |s| Cal::Day.new Date.parse("2012-#{s}"), calendar },
+        %w[02-12 02-13 02-14 02-15 02-16 02-17 02-18].map { |s| Cal::Day.new Date.parse("2012-#{s}"), calendar },
+        %w[02-19 02-20 02-21 02-22 02-23 02-24 02-25].map { |s| Cal::Day.new Date.parse("2012-#{s}"), calendar },
+        %w[02-26 02-27 02-28 02-29 03-01 03-02 03-03].map { |s| Cal::Day.new Date.parse("2012-#{s}"), calendar }
+      ]
     end
+  end
 
-    describe "previous" do
-      it "returns the calendar for the previous month" do
-        @options[:start_week_on] = :wednesday
-        subject.previous.should == described_class.new(@year, (@month - 1), @options)
-      end
+  describe "#previous" do
+    it "returns the calendar for the previous month" do
+      calendar = Cal::MonthlyCalendar.new(2012, 12, :start_week_on => :wednesday)
+      calendar.previous.should == Cal::MonthlyCalendar.new(2012, 11, :start_week_on => :wednesday)
     end
+  end
 
-    describe "next" do
-      it "returns the calendar for the next month" do
-        @options[:start_week_on] = :wednesday
-        subject.next.should == described_class.new(@year, (@month + 1), @options)
-      end
+  describe "#next" do
+    it "returns the calendar for the next month" do
+      calendar = Cal::MonthlyCalendar.new(2012, 12, :start_week_on => :wednesday)
+      calendar.next.should == Cal::MonthlyCalendar.new(2013, 1, :start_week_on => :wednesday)
     end
+  end
 
-    describe "day_names" do
-      it "defaults to sunday through saturday" do
-        subject.day_names.should == [
-          Cal::DayName.sunday,
-          Cal::DayName.monday,
-          Cal::DayName.tuesday,
-          Cal::DayName.wednesday,
-          Cal::DayName.thursday,
-          Cal::DayName.friday,
-          Cal::DayName.saturday
-        ]
-      end
-
-      [
-        [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday],
-        [:tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :monday],
-        [:wednesday, :thursday, :friday, :saturday, :sunday, :monday, :tuesday],
-        [:thursday, :friday, :saturday, :sunday, :monday, :tuesday, :wednesday],
-        [:friday, :saturday, :sunday, :monday, :tuesday, :wednesday, :thursday],
-        [: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]
-          subject.day_names.should == day_names.map { |dn| Cal::DayName.send dn }
-        end
-      end
+  describe "#day_names" do
+    it "defaults to sunday through saturday" do
+      Cal::MonthlyCalendar.new(2012, 12).day_names.should == [
+        Cal::DayName.sunday,
+        Cal::DayName.monday,
+        Cal::DayName.tuesday,
+        Cal::DayName.wednesday,
+        Cal::DayName.thursday,
+        Cal::DayName.friday,
+        Cal::DayName.saturday,
+      ]
     end
 
-    describe "to_param" do
-      it "is the year and month string" do
-        @year, @month = 2012, 12
-        subject.to_param.should == "2012-12"
+    [
+      %i[monday tuesday wednesday thursday friday saturday sunday],
+      %i[tuesday wednesday thursday friday saturday sunday monday],
+      %i[wednesday thursday friday saturday sunday monday tuesday],
+      %i[thursday friday saturday sunday monday tuesday wednesday],
+      %i[friday saturday sunday monday tuesday wednesday thursday],
+      %i[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
+        calendar = Cal::MonthlyCalendar.new(2012, 12, :start_week_on => day_names[0])
+        calendar.day_names.should == day_names.map { |dn| Cal::DayName.send dn }
       end
     end
   end
 
+  describe "#to_param" do
+    it "is the year and month string" do
+      Cal::MonthlyCalendar.new(2012, 12).to_param.should == "2012-12"
+    end
+  end
 end

data/spec/cal_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
+require 'cal'
 
 describe Cal do
-  subject { described_class }
-
-  describe "new_monthly_calendar" do
-    it "creates a new monthly calendar with the given args" do
-      @args = [1, 2, 3]
+  describe ".new_monthly_calendar" do
+    it "is delegated to MonthlyCalendar.new" do
       monthly_calendar = Object.new
-      Cal::MonthlyCalendar.stub :new do |*args|
-        monthly_calendar if args == @args
-      end
-      subject.new_monthly_calendar(*@args).should == monthly_calendar
+      Cal::MonthlyCalendar.stub(:new).with(1, 2, 3) { monthly_calendar }
+      Cal.new_monthly_calendar(1, 2, 3).should == monthly_calendar
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
-require 'cal'
 require 'ostruct'

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cal
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Austin Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 description: A low level calendar engine.
 email:
 - austinthecoder@gmail.com
@@ -71,27 +66,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/austinthecoder/cal
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A low level calendar engine.
 test_files:
 - spec/cal/day_name_spec.rb