calorie 0.0.2 → 0.0.3

data/README.md

@@ -23,13 +23,13 @@ The data can be anything; only your code will be interacting with it.
         # ... etc
       }
 
-Obviously, you don't need to pass in any data -- if it's easy enough to just loop through and check what day it is and do whatever you need to do in your view, that's up to you.
+Obviously, you don't need to pass in any data -- if it's easy enough to just loop through and check what day it is and do whatever you need to do in your template, that's up to you.
 
-Create a presenter for a month by sending in `year`, `month`, and the data:
+Create a decorator for a month by sending in `year`, `month`, and the data:
 
       cal = Calorie.new(2010, 6, data)
 
-In your view, you can style it however you wish.
+In your template, you can style it however you wish.
 
       # previous month, e.g. December 2009
       cal.previous

data/calorie.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["katrina.owen@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{A calendar is a calendar is a calendar.}
-  s.description = %q{A simple, ruby calendar presenter.}
+  s.description = %q{A simple, ruby calendar decorator.}
 
   s.rubyforge_project = "calorie"
 

data/lib/calorie/calendar.rb

@@ -1,7 +1,6 @@
 module Calorie
 
   class Calendar
-    include WeeksInMonth
 
     attr_reader :days, :weeks, :year, :month, :data
     def initialize(year, month, data = {})
@@ -9,7 +8,7 @@ module Calorie
       @year = year
       @month = month
       initialize_days
-      initialize_weeks
+      @weeks = WeeksInMonth.new(days).weeks
     end
 
     def first_day
@@ -22,18 +21,6 @@ module Calorie
       @last_day
     end
 
-    def days_in_month
-      days.size
-    end
-
-    def first_day_falls_on
-      if Calorie.configuration.week_starts_on?(:monday)
-        (first_day.wday - 1) % 7
-      else
-        first_day.wday
-      end
-    end
-
     def initialize_days
       @days = []
       (first_day.mday..last_day.mday).map do |i|
@@ -42,39 +29,6 @@ module Calorie
       end
     end
 
-    def initialize_weeks
-      @weeks = []
-      padded_days = days_for_slicing
-      number_of_weeks.times do
-        @weeks << Calorie::Week.new(padded_days.slice!(0..6))
-      end
-    end
-
-    def days_for_slicing
-      slices = days.clone
-
-      (1..blank_days_at_start).each do |i|
-        slices.unshift(Calorie::NullDay.new(first_day - i))
-      end
-      (1..blank_days_at_end).each do |i|
-        slices.push(Calorie::NullDay.new(last_day + i))
-      end
-
-      slices
-    end
-
-    def blank_days_at_start
-      first_day_falls_on
-    end
-
-    def blank_days_at_end
-      7 - ((blank_days_at_start + days_in_month) % 7)
-    end
-
-    def days_in_month
-      last_day.mday
-    end
-
     def each_day(&block)
       days.each {|day| block.call(day) }
     end
@@ -92,21 +46,15 @@ module Calorie
     end
 
     def previous
-      date = first_day.prev_month
-      the_month = I18n.translate('calorie.months')[date.month-1]
-      "#{the_month} #{date.year}"
+      Calorie.label_for(first_day.prev_month)
     end
 
     def current
-      date = first_day
-      the_month = I18n.translate('calorie.months')[date.month-1]
-      "#{the_month} #{date.year}"
+      Calorie.label_for(first_day)
     end
 
     def next
-      date = first_day.next_month
-      the_month = I18n.translate('calorie.months')[date.month-1]
-      "#{the_month} #{date.year}"
+      Calorie.label_for(first_day.next_month)
     end
   end
 end

data/lib/calorie/day_of_the_week.rb

@@ -1,17 +1,11 @@
 module Calorie
   class DayOfTheWeek
-    class << self
-      def day_names
-        I18n.translate('calorie.days_of_the_week')
-      end
-    end
-
     def initialize(day_of_the_week)
       @day_of_the_week = day_of_the_week
     end
 
     def label
-      DayOfTheWeek.day_names[@day_of_the_week]
+      @label ||= Calorie.day_names[@day_of_the_week]
     end
 
     def weekend?

data/lib/calorie/version.rb

@@ -1,3 +1,3 @@
 module Calorie
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/calorie/weeks_in_month.rb

@@ -1,9 +1,61 @@
 module Calorie
-  module WeeksInMonth
+  class WeeksInMonth
+    def initialize(days = [])
+      @source_days = days
+    end
+
+    def weeks
+      result = []
+      padded_days = days_for_slicing
+      number_of_weeks.times do
+        result << Calorie::Week.new(padded_days.slice!(0..6))
+      end
+      result
+    end
+
+    def days_for_slicing
+      slices = @source_days.clone
+
+      (1..blank_days_at_start).each do |i|
+        slices.unshift(Calorie::NullDay.new(first_day - i))
+      end
+      (1..blank_days_at_end).each do |i|
+        slices.push(Calorie::NullDay.new(last_day + i))
+      end
+
+      slices
+    end
+
+    def blank_days_at_start
+      first_day_falls_on
+    end
+
+    def blank_days_at_end
+      7 - ((blank_days_at_start + days_in_month) % 7)
+    end
 
     def number_of_weeks
       ((days_in_month + first_day_falls_on) / 7.0).ceil
     end
 
+    def days_in_month
+      @source_days.length
+    end
+
+    def first_day
+      @source_days.first.date
+    end
+
+    def last_day
+      @source_days.last.date
+    end
+
+    def first_day_falls_on
+      if Calorie.configuration.week_starts_on?(:monday)
+        (first_day.wday - 1) % 7
+      else
+        first_day.wday
+      end
+    end
   end
 end

data/lib/calorie.rb

@@ -44,6 +44,22 @@ module Calorie
     def new(year, month, data = {})
       Calendar.new(year, month, data)
     end
+
+    def day_names
+      @day_names ||= I18n.translate('calorie.days_of_the_week')
+    end
+
+    def month_names
+      @month_names ||= I18n.translate('calorie.months')
+    end
+
+    def month_name(i)
+      month_names[i-1]
+    end
+
+    def label_for(date)
+      "#{Calorie.month_name(date.month)} #{date.year}"
+    end
   end
 
 end

data/spec/calendar_spec.rb

@@ -61,50 +61,6 @@ describe Calorie::Calendar do
     end
   end
 
-  context "when week starts on sunday" do
-    before(:each) { Calorie.config = nil }
-
-    describe "first day falls on" do
-      {
-        2003 => 2,
-        2004 => 4,
-        2005 => 5,
-        2006 => 6,
-        2007 => 0,
-        2008 => 2
-      }.each do |year, offset|
-        it "#{offset} in #{year}" do
-          cal = Calorie::Calendar.new(year, 4, {})
-          cal.first_day_falls_on.should eq(offset)
-        end
-      end
-    end
-  end
-
-  context "when week starts on monday" do
-    before :each do
-      Calorie.configuration do |config|
-        config.week_starts_on :monday
-      end
-    end
-
-    describe "first day falls on" do
-      {
-        2003 => 3,
-        2004 => 5,
-        2005 => 6,
-        2006 => 0,
-        2007 => 1,
-        2008 => 3
-      }.each do |year, offset|
-        it "#{offset} in #{year}" do
-          cal = Calorie::Calendar.new(year, 5, {})
-          cal.first_day_falls_on.should eq(offset)
-        end
-      end
-    end
-  end
-
   describe "translation" do
     around :each do |example|
       I18n.with_locale(:xx) do

data/spec/weeks_in_month_spec.rb

@@ -1,7 +1,7 @@
-require 'calorie/weeks_in_month'
+require 'calorie'
 
 describe Calorie::WeeksInMonth do
-  let(:cal) { stub.extend(Calorie::WeeksInMonth) }
+  let(:cal) { Calorie::WeeksInMonth.new }
 
   context "with a 28 day month" do
     before :each do
@@ -92,4 +92,51 @@ describe Calorie::WeeksInMonth do
       cal.number_of_weeks.should eq(6)
     end
   end
+
+  context "when week starts on sunday" do
+    before(:each) { Calorie.config = nil }
+
+    describe "first day falls on" do
+      {
+        2003 => 2,
+        2004 => 4,
+        2005 => 5,
+        2006 => 6,
+        2007 => 0,
+        2008 => 2
+      }.each do |year, offset|
+        it "#{offset} in April #{year}" do
+          apr1 = Calorie::Day.new(Date.new(year, 4, 1))
+          cal = Calorie::WeeksInMonth.new [apr1]
+          cal.first_day_falls_on.should eq(offset)
+        end
+      end
+    end
+  end
+
+  context "when week starts on monday" do
+    before :each do
+      Calorie.configuration do |config|
+        config.week_starts_on :monday
+      end
+    end
+
+    describe "first day falls on" do
+      {
+        2003 => 3,
+        2004 => 5,
+        2005 => 6,
+        2006 => 0,
+        2007 => 1,
+        2008 => 3
+      }.each do |year, offset|
+        it "#{offset} in May #{year}" do
+          may1 = Calorie::Day.new(Date.new(year, 5, 1))
+          cal = Calorie::WeeksInMonth.new [may1]
+          cal.first_day_falls_on.should eq(offset)
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calorie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161868520 !ruby/object:Gem::Requirement
+  requirement: &2160865760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161868520
+  version_requirements: *2160865760
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2161868100 !ruby/object:Gem::Requirement
+  requirement: &2160865340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161868100
+  version_requirements: *2160865340
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161867680 !ruby/object:Gem::Requirement
+  requirement: &2160864920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +43,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161867680
-description: A simple, ruby calendar presenter.
+  version_requirements: *2160864920
+description: A simple, ruby calendar decorator.
 email:
 - katrina.owen@gmail.com
 executables: []