timetress 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+
+script: bundle exec rspec spec

data/README.md

@@ -3,6 +3,8 @@
 Knows about workdays and holidays, public and otherwise.
 Answers the age-old question _When is mothersday this year?_.
 
+[![Build Status](https://secure.travis-ci.org/kytrinyx/timetress.png?branch=master)](http://travis-ci.org/kytrinyx/timetress)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,17 +24,17 @@ Or install it yourself as:
 ### Timetress knows about holidays
 
 ```
-Timetress.mothersday 2012
-=> #<Date: 2012-02-12>
+Timetress.christmas 2012
+=> #<Date: 2012-12-25>
 ```
 
 ```
-# In October of 2011
-Timetress.next_mothersday
-=> #<Date: 2012-02-12>
+# On New Year's Eve, 2011
+Timetress.next_christmas
+=> #<Date: 2012-12-25>
 ```
 
-### Public Holidays
+### Public Holidays (Norway only)
 
 > A public holiday, national holiday or legal holiday is a holiday generally established by law and is usually a non-working day during the year.
 > - Wikipedia
@@ -64,7 +66,7 @@ Timetress::Norway.nth_workday_after 1, Date.new(2012, 10, 25)
 
 ## Implemented holidays (Norway)
 
-Public holidays are emphasized.
+Public holidays are emphasized below.
 
 * *New Year's Day*: January 1st.
 * Mothersday: Second Sunday in February.

data/lib/timetress/holiday.rb

@@ -3,6 +3,8 @@ module Timetress
 
     JANUARY = 1
     FEBRUARY = 2
+    MAY = 5
+    NOVEMBER = 11
     DECEMBER = 12
 
     def new_years_day(year)
@@ -53,16 +55,41 @@ module Timetress
       Date.new(year, DECEMBER, 26)
     end
 
+    def new_years_eve(year)
+      Date.new(year, DECEMBER, 31)
+    end
+
     def official_holidays(year)
-      raise NotImplementedError
+      raise NotImplementedError.new localization_error_message
+    end
+
+    def mothersday(year)
+      raise NotImplementedError.new localization_error_message
+    end
+
+    def fathersday(year)
+      raise NotImplementedError.new localization_error_message
+    end
+
+    def labour_day(year)
+      raise NotImplementedError.new localization_error_message
+    end
+    alias_method :labor_day, :labour_day
+
+    def national_holiday(year)
+      raise NotImplementedError.new localization_error_message
     end
 
     private
 
+    def localization_error_message
+      "Different in different countries. Try the Norway module."
+    end
+
     def next_holiday(holiday, given_date)
       given_date ||= Date.today
 
-      unless given_date.respond_to?(:to_datetime)
+      unless given_date.respond_to?(:asctime)
         raise ArgumentError.new("#{given_date.inspect} must be a date or time object")
       end
 

data/lib/timetress/norway/holiday.rb

@@ -3,9 +3,6 @@ module Timetress
     module Holiday
       include Timetress::Holiday
 
-      MAY = 5
-      NOVEMBER = 11
-
       def mothersday(year)
         second_sunday_in(FEBRUARY, year)
       end
@@ -23,6 +20,16 @@ module Timetress
         Date.new(year, MAY, 17)
       end
 
+      def christmas(year)
+        raise AmbiguousHolidayError.new("Do you mean `christmas_eve` or `first_day_of_christmas`?")
+      end
+
+      def first_day_of_christmas(year)
+        Date.new(year, DECEMBER, 25)
+      end
+
+      alias_method :second_day_of_christmas, :boxing_day
+
       def official_holidays(year)
         [
           new_years_day(year),
@@ -35,7 +42,7 @@ module Timetress
           ascension(year),
           pentecost_sunday(year),
           pentecost_monday(year),
-          christmas(year),
+          first_day_of_christmas(year),
           boxing_day(year)
         ]
       end

data/lib/timetress/norway.rb

@@ -1,6 +1,8 @@
 require 'timetress/norway/holiday'
 
 module Timetress
+  class AmbiguousHolidayError < StandardError; end
+
   module Norway
     extend Timetress::Norway::Holiday
     extend Timetress::Workday

data/lib/timetress/version.rb

@@ -1,3 +1,3 @@
 module Timetress
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/holiday_spec.rb

@@ -82,9 +82,23 @@ describe Timetress::Holiday do
     end
   end
 
+  describe "New Year's Eve" do
+    it "is on Dec 31st" do
+      Timetress.new_years_eve(2011).should eq Date.new(2011, 12, 31)
+    end
+  end
+
   describe "official holidays" do
     it "must be implemented in subclass" do
-      ->{ Timetress.official_holidays(2012) }.should raise_error
+      lambda { Timetress.official_holidays(2012) }.should raise_error
+    end
+  end
+
+  describe "it complains helpfully about" do
+    [:mothersday, :fathersday, :labor_day, :labour_day, :national_holiday].each do |holiday|
+      specify holiday.to_s do
+        lambda { Timetress.send(holiday, 2012) }.should raise_error /Norway/
+      end
     end
   end
 
@@ -109,9 +123,12 @@ describe Timetress::Holiday do
       Timetress::Norway.next_pi_day.should eq(Timetress::Norway.next_pi_day(Date.today))
     end
 
-    it "complains if given a non-date argument" do
-      ->{ Timetress::Norway.next_pi_day("a string") }.should raise_error(ArgumentError)
-      ->{ Timetress::Norway.next_pi_day(1) }.should raise_error(ArgumentError)
+    it "rejects string input" do
+      lambda { Timetress::Norway.next_pi_day("a string") }.should raise_error(ArgumentError)
+    end
+
+    it "rejects integer input" do
+      lambda { Timetress::Norway.next_pi_day(1) }.should raise_error(ArgumentError)
     end
 
   end

data/spec/norway/holiday_spec.rb

@@ -72,4 +72,10 @@ describe Timetress::Norway do
     end
   end
 
+  describe "christmas" do
+    it "is ambiguous" do
+      lambda { Timetress::Norway.christmas(2012) }.should raise_error(Timetress::AmbiguousHolidayError)
+    end
+  end
+
 end

data/timetress.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetress
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
-dependencies: []
+date: 2012-11-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70165893417640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70165893417640
 description: Answers the age-old question 'When is mothersday this year?'
 email:
 - katrina.owen@gmail.com
@@ -19,6 +30,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -64,3 +76,4 @@ test_files:
 - spec/norway/holiday_spec.rb
 - spec/norway/workday_spec.rb
 - spec/workday_spec.rb
+has_rdoc: