cal 0.1.0 → 0.2.0

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 
 ``` ruby
 # in the controller
-- calendar = Cal::Ender.new params[:date]
+- calendar = Cal::MonthlyCalendar.new params[:date]
 
 # in the view
 %h3

data/lib/cal.rb

@@ -2,7 +2,7 @@ require "cal/version"
 
 module Cal
 
-  autoload :Ender, 'cal/ender'
+  autoload :MonthlyCalendar, 'cal/monthly_calendar'
   autoload :Day, 'cal/day'
   autoload :Month, 'cal/month'
 

data/lib/cal/{ender.rb → monthly_calendar.rb}

@@ -3,23 +3,18 @@ require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/string/conversions'
 
 module Cal
-  class Ender
-
-    def initialize(dateable, options = {})
-      options = {:format => :monthly}.merge options
-
-      if options[:format] != :monthly
-        raise ArgumentError, "only supported format currently is :monthly"
-      end
+  class MonthlyCalendar
 
+    def initialize(dateable)
       @date = dateable.to_date
-      @format = options[:format]
     end
 
-    attr_reader :format, :date
+    attr_reader :date
 
     def ==(other)
-      other.is_a?(Ender) && other.date == date
+      other.is_a?(MonthlyCalendar) &&
+        other.date.year == date.year &&
+        other.date.month == date.month
     end
 
     def month

data/lib/cal/version.rb

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

data/spec/cal/day_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Cal::Day do
+
   subject { described_class.new @date, @calendar }
 
   before do

data/spec/cal/month_spec.rb

@@ -4,21 +4,19 @@ describe Cal::Month do
 
   subject { described_class.new @calendar }
 
-  before do
-    @calendar = OpenStruct.new :date => Date.new(2012, 3, 13)
-  end
+  before { @calendar = OpenStruct.new }
 
   describe "==" do
-    it "is true with a Cal::Month with the same calendar" do
-      subject.should == described_class.new(@calendar)
+    it "is true with another month with the same calendar" do
+      (subject == described_class.new(@calendar)).should be_true
     end
 
-    it "is false with a Cal::Month with a different calendar" do
-      subject.should_not == described_class.new(Object.new)
+    it "is false with another month with a different calendar" do
+      (subject == described_class.new(Object.new)).should be_false
     end
 
-    it "is false with a non-Cal::Month" do
-      subject.should_not == Object.new
+    it "is false with a non month" do
+      (subject == Object.new).should be_false
     end
   end
 
@@ -29,6 +27,7 @@ describe Cal::Month do
   end
 
   describe "to_s" do
+    before { @calendar.stub(:date) { Date.new 2012, 3 } }
     it { subject.to_s.should == 'March' }
   end
 

data/spec/cal/{ender_spec.rb → monthly_calendar_spec.rb}

@@ -1,43 +1,25 @@
 require 'spec_helper'
 
-describe Cal::Ender do
-  subject { described_class.new @date, @options }
+describe Cal::MonthlyCalendar do
 
-  before do
-    @date = Date.new 2012, 2, 1
-    @options = {}
-  end
+  subject { described_class.new @date }
 
-  describe "initialize" do
-    it "raises argument error if given format isn't :monthly" do
-      @options[:format] = :weekly
-      expect { subject }.to raise_error(ArgumentError)
-    end
+  before { @date = Date.new 2012, 2 }
 
-    it "raises an error if the first arg can't be converted to a date" do
+  describe "initialize" do
+    it "raises an error if arg can't be converted to a date" do
       ['Octember', Object.new, '2012'].each do |obj|
         expect { described_class.new obj }.to raise_error
       end
     end
 
-    it "doesn't raise an error if the first arg can be converted to a date" do
+    it "doesn't raise an error if arg can be converted to a date" do
       [Date.current, Date.new(2012, 1, 15), '2012-02-24'].each do |obj|
         expect { described_class.new obj }.to_not raise_error
       end
     end
   end
 
-  describe "format" do
-    it "defaults to monthly" do
-      subject.format.should == :monthly
-    end
-
-    it "otherwise is the given format" do
-      @options[:format] = :monthly
-      subject.format.should == :monthly
-    end
-  end
-
   describe "date" do
     it "is the given date" do
       subject.date.should == @date
@@ -45,20 +27,23 @@ describe Cal::Ender do
   end
 
   describe "==" do
-    it "is true with another calendar with the same format and date" do
-      @date = Date.new 2012, 2, 1
-      @options[:format] = :monthly
-      subject.should == described_class.new(@date, @options)
+    it "is true with another monthly calendar in the same month and year" do
+      calendar = described_class.new Date.new(@date.year, @date.month, (@date.day + 1))
+      (subject == calendar).should be_true
+    end
+
+    it "is false with another monthly calendar with a different month" do
+      calendar = described_class.new Date.new(@date.year, (@date.month + 1), @date.day)
+      (subject == calendar).should be_false
     end
 
-    it "is false with another calendar with a different date" do
-      @date = Date.new 2012, 2, 1
-      @options[:format] = :monthly
-      subject.should_not == described_class.new(Date.new(2012, 2, 2), @options)
+    it "is false with another monthly calendar with a different year" do
+      calendar = described_class.new Date.new((@date.year + 1), @date.month, @date.day)
+      (subject == calendar).should be_false
     end
 
-    it "is false with a non-Ender object" do
-      subject.should_not == Object.new
+    it "is false with a non monthly calendar" do
+      (subject == Object.new).should be_false
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,12 +59,12 @@ files:
 - cal.gemspec
 - lib/cal.rb
 - lib/cal/day.rb
-- lib/cal/ender.rb
 - lib/cal/month.rb
+- lib/cal/monthly_calendar.rb
 - lib/cal/version.rb
 - spec/cal/day_spec.rb
-- spec/cal/ender_spec.rb
 - spec/cal/month_spec.rb
+- spec/cal/monthly_calendar_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -92,6 +92,6 @@ specification_version: 3
 summary: A low level calendar engine.
 test_files:
 - spec/cal/day_spec.rb
-- spec/cal/ender_spec.rb
 - spec/cal/month_spec.rb
+- spec/cal/monthly_calendar_spec.rb
 - spec/spec_helper.rb