norwegian_holidays 0.0.3 → 0.0.4

data/lib/norwegian_holidays.rb

@@ -1,15 +1,17 @@
 require 'date'
-require "norwegian_holidays/version"
 
 module NorwegianHolidays
 
   class << self
 
-    # In Norway the big day is Christmas Eve
-    def christmas(year)
+    def christmas_eve(year)
       Date.new(year, 12, 24)
     end
 
+    def christmas(year)
+      Date.new(year, 12, 25)
+    end
+
     def valentines_day(year)
       Date.new(year, 2, 14)
     end

data/norwegian_holidays.gemspec

@@ -1,13 +1,12 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "norwegian_holidays/version"
 
 Gem::Specification.new do |s|
   s.name        = "norwegian_holidays"
-  s.version     = NorwegianHolidays::VERSION
+  s.version     = "0.0.4"
   s.authors     = ["Katrina Owen"]
   s.email       = ["katrina.owen@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/kytrinyx/norwegian_holidays"
   s.summary     = %q{A Norwegian holiday calendar.}
   s.description = %q{A Norwegian holiday calendar. Answers the age-old question: "When is mothersday this year?"}
 
@@ -18,9 +17,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_development_dependency "active_support"
-  s.add_development_dependency "i18n" #active support requires i18n but doesn't add dependency in bundle
-  # s.add_runtime_dependency "rest-client"
 end

data/spec/norwegian_holidays_spec.rb

@@ -1,5 +1,4 @@
 require 'norwegian_holidays'
-require 'active_support/core_ext'
 
 describe NorwegianHolidays do
   describe "#second_sunday_in(month, year)" do
@@ -16,34 +15,79 @@ describe NorwegianHolidays do
     end
   end
 
-  describe "Christmas" do
+  describe "Christmas Eve" do
+    let(:last_christmas) { Date.new(2010, 12, 24) }
     let(:christmas) { Date.new(2011, 12, 24) }
+    let(:next_christmas) { Date.new(2012, 12, 24) }
 
-    it "is on Christmas Eve" do
-      NorwegianHolidays.christmas(2011).should eq(christmas)
+    it "is on Dec 24th" do
+      NorwegianHolidays.christmas_eve(2011).should eq(christmas)
     end
 
     describe "#next_christmas" do
 
       it "is on Dec 24th" do
-        NorwegianHolidays.next_christmas(christmas - 1.day).should eq(christmas)
+        NorwegianHolidays.next_christmas_eve(christmas - 1).should eq(christmas)
       end
 
       it "is this year if today is Christmas Eve" do
+        NorwegianHolidays.next_christmas_eve(christmas).should eq(christmas)
+      end
+
+      it "is next year if it's already passed" do
+        NorwegianHolidays.next_christmas_eve(christmas + 1).should eq(next_christmas)
+      end
+    end
+
+    describe "#christmas_for_season(date, timespan)" do
+      let(:timeframe) { 60 } # 60 days
+      let(:cutoff) { christmas - timeframe }
+
+      it "is this year if it's coming up within the timeframe" do
+        NorwegianHolidays.christmas_eve_for_season(cutoff + 1, timeframe).should eq(christmas)
+      end
+
+      it "is this year if it's coming up in exactly the timeframe" do
+        NorwegianHolidays.christmas_eve_for_season(cutoff, timeframe).should eq(christmas)
+      end
+
+      it "is last year if it's too long til the next one" do
+        NorwegianHolidays.christmas_eve_for_season(cutoff - 1, timeframe).should eq(last_christmas)
+      end
+    end
+  end
+
+
+  describe "Christmas" do
+    let(:last_christmas) { Date.new(2010, 12, 25) }
+    let(:christmas) { Date.new(2011, 12, 25) }
+    let(:next_christmas) { Date.new(2012, 12, 25) }
+
+    it "is on Dec 25th" do
+      NorwegianHolidays.christmas(2011).should eq(christmas)
+    end
+
+    describe "#next_christmas" do
+
+      it "is on Dec 25th" do
+        NorwegianHolidays.next_christmas(christmas - 1).should eq(christmas)
+      end
+
+      it "is this year if today is Christmas" do
         NorwegianHolidays.next_christmas(christmas).should eq(christmas)
       end
 
       it "is next year if it's already passed" do
-        NorwegianHolidays.next_christmas(christmas + 1.day).should eq(christmas + 1.year)
+        NorwegianHolidays.next_christmas(christmas + 1).should eq(next_christmas)
       end
     end
 
     describe "#christmas_for_season(date, timespan)" do
-      let(:timeframe) { 2.months }
-      let(:cutoff) { christmas - 2.months }
+      let(:timeframe) { 60 } # 60 days
+      let(:cutoff) { christmas - timeframe }
 
       it "is this year if it's coming up within the timeframe" do
-        NorwegianHolidays.christmas_for_season(cutoff + 1.day, timeframe).should eq(christmas)
+        NorwegianHolidays.christmas_for_season(cutoff + 1, timeframe).should eq(christmas)
       end
 
       it "is this year if it's coming up in exactly the timeframe" do
@@ -51,13 +95,15 @@ describe NorwegianHolidays do
       end
 
       it "is last year if it's too long til the next one" do
-        NorwegianHolidays.christmas_for_season(cutoff - 1.day, timeframe).should eq(christmas - 1.year)
+        NorwegianHolidays.christmas_for_season(cutoff - 1, timeframe).should eq(last_christmas)
       end
     end
   end
 
   describe "Valentines Day" do
+    let(:last_valentines_day) { Date.new(2010, 2, 14) }
     let(:valentines_day) { Date.new(2011, 2, 14) }
+    let(:next_valentines_day) { Date.new(2012, 2, 14) }
 
     it "is on Feb 14th" do
       NorwegianHolidays.valentines_day(2011).should eq(valentines_day)
@@ -66,7 +112,7 @@ describe NorwegianHolidays do
     describe "#next_valentines_day" do
 
       it "is on Feb 14th" do
-        NorwegianHolidays.next_valentines_day(valentines_day - 1.day).should eq(valentines_day)
+        NorwegianHolidays.next_valentines_day(valentines_day - 1).should eq(valentines_day)
       end
 
       it "is this year if today is valentines day" do
@@ -74,16 +120,16 @@ describe NorwegianHolidays do
       end
 
       it "is next year if it's already passed" do
-        NorwegianHolidays.next_valentines_day(valentines_day + 1.day).should eq(valentines_day + 1.year)
+        NorwegianHolidays.next_valentines_day(valentines_day + 1).should eq(next_valentines_day)
       end
     end
 
     describe "#valentines_day_for_season(date, timespan)" do
-      let(:timeframe) { 2.months }
-      let(:cutoff) { valentines_day - 2.months }
+      let(:timeframe) { 60 } # 60 days
+      let(:cutoff) { valentines_day - timeframe }
 
       it "is this year if it's coming up within the timeframe" do
-        NorwegianHolidays.valentines_day_for_season(cutoff + 1.day, timeframe).should eq(valentines_day)
+        NorwegianHolidays.valentines_day_for_season(cutoff + 1, timeframe).should eq(valentines_day)
       end
 
       it "is this year if it's coming up in exactly the timeframe" do
@@ -91,7 +137,7 @@ describe NorwegianHolidays do
       end
 
       it "is last year if it's too long til the next one" do
-        NorwegianHolidays.valentines_day_for_season(cutoff - 1.day, timeframe).should eq(valentines_day - 1.year)
+        NorwegianHolidays.valentines_day_for_season(cutoff - 1, timeframe).should eq(last_valentines_day)
       end
     end
 
@@ -130,13 +176,13 @@ describe NorwegianHolidays do
 
       context "before mothersday" do
         it "is this year" do
-          NorwegianHolidays.next_mothersday(mothersday_2010 - 1.day).should eq(mothersday_2010)
+          NorwegianHolidays.next_mothersday(mothersday_2010 - 1).should eq(mothersday_2010)
         end
       end
 
       context "after mothersday" do
         it "is next year" do
-          NorwegianHolidays.next_mothersday(mothersday_2010 + 1.day).should eq(mothersday_2011)
+          NorwegianHolidays.next_mothersday(mothersday_2010 + 1).should eq(mothersday_2011)
         end
       end
     end
@@ -145,11 +191,11 @@ describe NorwegianHolidays do
       let(:mothersday) { mothersday_2011 }
       let(:last_mothersday) { mothersday_2010 }
 
-      let(:cutoff) { mothersday - 2.months }
-      let(:timeframe) { 2.months }
+      let(:timeframe) { 60 } # 60 days
+      let(:cutoff) { mothersday - timeframe }
 
       it "is this year if it's coming up within the timeframe" do
-        NorwegianHolidays.mothersday_for_season(cutoff + 1.day, timeframe).should eq(mothersday)
+        NorwegianHolidays.mothersday_for_season(cutoff + 1, timeframe).should eq(mothersday)
       end
 
       it "is this year if it's coming up in exactly the timeframe" do
@@ -157,7 +203,7 @@ describe NorwegianHolidays do
       end
 
       it "is last year if it's too long til the next one" do
-        NorwegianHolidays.mothersday_for_season(cutoff - 1.day, timeframe).should eq(last_mothersday)
+        NorwegianHolidays.mothersday_for_season(cutoff - 1, timeframe).should eq(last_mothersday)
       end
     end
   end
@@ -194,13 +240,13 @@ describe NorwegianHolidays do
 
       context "before fathersday" do
         it "is this year" do
-          NorwegianHolidays.next_fathersday(fathersday_2010 - 1.day).should eq(fathersday_2010)
+          NorwegianHolidays.next_fathersday(fathersday_2010 - 1).should eq(fathersday_2010)
         end
       end
 
       context "after fathersday" do
         it "is next year" do
-          NorwegianHolidays.next_fathersday(fathersday_2010 + 1.day).should eq(fathersday_2011)
+          NorwegianHolidays.next_fathersday(fathersday_2010 + 1).should eq(fathersday_2011)
         end
       end
     end
@@ -208,11 +254,11 @@ describe NorwegianHolidays do
     describe "#fathersday_for_season(date, timespan)" do
       let(:fathersday) { fathersday_2011 }
       let(:last_fathersday) { fathersday_2010 }
-      let(:timeframe) { 2.months }
-      let(:cutoff) { fathersday - 2.months }
+      let(:timeframe) {  60 } # 60 days
+      let(:cutoff) { fathersday - timeframe }
 
       it "is this year if it's coming up within the timeframe" do
-        NorwegianHolidays.fathersday_for_season(cutoff + 1.day, timeframe).should eq(fathersday)
+        NorwegianHolidays.fathersday_for_season(cutoff + 1, timeframe).should eq(fathersday)
       end
 
       it "is this year if it's coming up in exactly the timeframe" do
@@ -220,7 +266,7 @@ describe NorwegianHolidays do
       end
 
       it "is last year if it's too long til the next one" do
-        NorwegianHolidays.fathersday_for_season(cutoff - 1.day, timeframe).should eq(last_fathersday)
+        NorwegianHolidays.fathersday_for_season(cutoff - 1, timeframe).should eq(last_fathersday)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norwegian_holidays
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70358087822420 !ruby/object:Gem::Requirement
+  requirement: &70247961821980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,29 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358087822420
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70358087822000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70358087822000
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70358087821580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70358087821580
+  version_requirements: *70247961821980
 description: ! 'A Norwegian holiday calendar. Answers the age-old question: "When
   is mothersday this year?"'
 email:
@@ -58,10 +36,9 @@ files:
 - README.md
 - Rakefile
 - lib/norwegian_holidays.rb
-- lib/norwegian_holidays/version.rb
 - norwegian_holidays.gemspec
 - spec/norwegian_holidays_spec.rb
-homepage: ''
+homepage: http://github.com/kytrinyx/norwegian_holidays
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -81,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: norwegian_holidays
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Norwegian holiday calendar.

data/lib/norwegian_holidays/version.rb

@@ -1,3 +0,0 @@
-module NorwegianHolidays
-  VERSION = "0.0.3"
-end