cal 0.2.0 → 0.2.1

data/lib/cal.rb

@@ -1,4 +1,5 @@
 require "cal/version"
+require 'active_support/time'
 
 module Cal
 

data/lib/cal/day.rb

@@ -3,6 +3,8 @@ require 'active_support/core_ext/module/delegation'
 module Cal
   class Day
 
+    include Comparable
+
     def initialize(date, calendar)
       @date = date
       @calendar = calendar
@@ -13,7 +15,15 @@ module Cal
     delegate :today?, :to => :date
 
     def ==(other)
-      other.is_a?(Day) && other.calendar == calendar && other.date == date
+      other.is_a?(Day) && calendar == other.calendar && date == other.date
+    end
+
+    def <=>(other)
+      date <=> other.date
+    end
+
+    def succ
+      self.class.new date.tomorrow, calendar
     end
 
     def number

data/lib/cal/monthly_calendar.rb

@@ -1,4 +1,3 @@
-require 'active_support/time'
 require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/string/conversions'
 
@@ -21,12 +20,20 @@ module Cal
       @month ||= Month.new self
     end
 
+    def first_day
+      @first_day ||= Day.new date.beginning_of_month.beginning_of_week(:sunday), self
+    end
+
+    def last_day
+      @last_day ||= Day.new date.end_of_month.end_of_week(:sunday), self
+    end
+
     def days
-      @days ||= dates.map { |date| Day.new self, date }
+      @days ||= first_day..last_day
     end
 
     def weeks
-      @weeks ||= days.in_groups_of 7
+      @weeks ||= days.to_a.in_groups_of 7
     end
 
     def previous
@@ -37,20 +44,5 @@ module Cal
       self.class.new date.next_month
     end
 
-  private
-
-    # TODO: simplify/improve this
-    def dates
-      [].tap do |dates|
-        day = date.beginning_of_month.beginning_of_week :sunday
-        last_day = date.end_of_month.end_of_week :sunday
-
-        while day <= last_day
-          dates << day
-          day = day.tomorrow
-        end
-      end
-    end
-
   end
 end

data/lib/cal/version.rb

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

data/spec/cal/day_spec.rb

@@ -9,6 +9,8 @@ describe Cal::Day do
     @calendar = OpenStruct.new :current_day => Date.new(2012, 1, 5)
   end
 
+  it { should be_a(Comparable) }
+
   describe "==" do
     it "is true with another day with the same calendar and date" do
       subject.should == described_class.new(@date, @calendar)
@@ -43,4 +45,19 @@ describe Cal::Day do
     end
   end
 
+  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
+    end
+  end
+
+  describe "succ" do
+    it "is the next day" do
+      subject.succ.should == described_class.new(Date.new(2012, 1, 16), @calendar)
+    end
+  end
+
 end

data/spec/cal/monthly_calendar_spec.rb

@@ -51,29 +51,38 @@ describe Cal::MonthlyCalendar do
     it { subject.month.should == Cal::Month.new(subject) }
   end
 
-  describe "days" do
-    it "is an array of all the viewable days" do
+  describe "first_day" do
+    it "is the first viewable day on the calendar" do
       @date = Date.new 2012, 2, 23
+      subject.first_day.should == Cal::Day.new(Date.new(2012, 1, 29), subject)
+    end
+  end
 
-      prev_month_days = %w[01-29 01-30 01-31]
-      days = %w[02-01 02-02 02-03 02-04 02-05 02-06 02-07 02-08 02-09 02-10 02-11 02-12 02-13 02-14 02-15 02-16 02-17 02-18 02-19 02-20 02-21 02-22 02-23 02-24 02-25 02-26 02-27 02-28 02-29]
-      next_month_days = %w[03-01 03-02 03-03]
+  describe "last_day" do
+    it "is the last viewable day on the calendar" do
+      @date = Date.new 2012, 2, 23
+      subject.last_day.should == Cal::Day.new(Date.new(2012, 3, 3), subject)
+    end
+  end
 
-      subject.days.should == (prev_month_days + days + next_month_days).map do |s|
-        Cal::Day.new subject, Date.parse("2012-#{s}")
-      end
+  describe "days" do
+    it "is a range of all the viewable days" 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
+      subject.days.should == (first_day..last_day)
     end
   end
 
   describe "weeks" do
-    it "is the days in groups of 7" do
+    it "an array of the days in groups of 7" do
       @date = Date.parse "2012-02-23"
       subject.weeks.should == [
-        %w[01-29 01-30 01-31 02-01 02-02 02-03 02-04].map { |s| Cal::Day.new subject, Date.parse("2012-#{s}") },
-        %w[02-05 02-06 02-07 02-08 02-09 02-10 02-11].map { |s| Cal::Day.new subject, Date.parse("2012-#{s}") },
-        %w[02-12 02-13 02-14 02-15 02-16 02-17 02-18].map { |s| Cal::Day.new subject, Date.parse("2012-#{s}") },
-        %w[02-19 02-20 02-21 02-22 02-23 02-24 02-25].map { |s| Cal::Day.new subject, Date.parse("2012-#{s}") },
-        %w[02-26 02-27 02-28 02-29 03-01 03-02 03-03].map { |s| Cal::Day.new subject, Date.parse("2012-#{s}") }
+        %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
   end

metadata

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