is_business_day 0.1.1 → 0.1.2

data/lib/is_business_day/digitalopera/business_day_calculations.rb

@@ -8,14 +8,14 @@ module DigitalOpera
     # this also accounts for holidays
     #
     def is_a_business_day?
-      (self.monday? || self.tuesday? || self.wednesday? || self.thursday? || self.friday?)
+      (self.monday? || self.tuesday? || self.wednesday? || self.thursday? || self.friday?) && self.is_not_a_holiday?
     end
 
     # Returns TRUE || FALSE if the date IS NOT a valid business day
     # this also accounts for holidays
     #
     def is_not_a_business_day?
-      self.saturday? || self.sunday?
+      self.saturday? || self.sunday? || self.is_a_holiday?
     end
 
     # Returns the first business day following the date.  This will account for

data/lib/is_business_day/version.rb

@@ -1,3 +1,3 @@
 module IsBusinessDay
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/active_support/core_ext/date/calculations_spec.rb

@@ -58,67 +58,81 @@ describe Date do
       test_date.thanksgiving_day_this_year.should eql(Date.parse("22/11/2012"))
     end
 
-    it "should be able to tell if it is memorial day" do
+    it "should be able to tell if it is memorial day and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("28/05/2012")
       bad_date.is_memorial_day?.should be_false
       bad_date.is_not_memorial_day?.should be_true
       good_date.is_memorial_day?.should be_true
       good_date.is_not_memorial_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is labor day" do
+    it "should be able to tell if it is labor day and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("03/09/2012")
       bad_date.is_labor_day?.should be_false
       bad_date.is_not_labor_day?.should be_true
       good_date.is_labor_day?.should be_true
       good_date.is_not_labor_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is thanksgiving day" do
+    it "should be able to tell if it is thanksgiving day and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("22/11/2012")
       bad_date.is_thanksgiving_day?.should be_false
       bad_date.is_not_thanksgiving_day?.should be_true
       good_date.is_thanksgiving_day?.should be_true
       good_date.is_not_thanksgiving_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is xmas day" do
+    it "should be able to tell if it is xmas day and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("25/12/2012")
       bad_date.is_christmas_day?.should be_false
       bad_date.is_not_christmas_day?.should be_true
       good_date.is_christmas_day?.should be_true
       good_date.is_not_christmas_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is xmas eve" do
+    it "should be able to tell if it is xmas eve and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("24/12/2012")
       bad_date.is_christmas_eve?.should be_false
       bad_date.is_not_christmas_eve?.should be_true
       good_date.is_christmas_eve?.should be_true
       good_date.is_not_christmas_eve?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is new year's day" do
+    it "should be able to tell if it is new year's day and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("01/01/2012")
       bad_date.is_new_years_day?.should be_false
       bad_date.is_not_new_years_day?.should be_true
       good_date.is_new_years_day?.should be_true
       good_date.is_not_new_years_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is the fourth of july" do
+    it "should be able to tell if it is the fourth of july and that it is not a valid business day" do
       bad_date  = Date.parse("06/06/2012")
       good_date = Date.parse("04/07/2012")
       bad_date.is_fourth_of_july?.should be_false
       bad_date.is_not_fourth_of_july?.should be_true
       good_date.is_fourth_of_july?.should be_true
       good_date.is_not_fourth_of_july?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
     it "should be able to tell if it is a holiday or not" do

data/spec/active_support/core_ext/time/calculations_spec.rb

@@ -58,67 +58,81 @@ describe Time do
       test_time.thanksgiving_day_this_year.should eql(Time.parse("22/11/2012"))
     end
 
-    it "should be able to tell if it is memorial day" do
+    it "should be able to tell if it is memorial day and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("28/05/2012")
       bad_date.is_memorial_day?.should be_false
       bad_date.is_not_memorial_day?.should be_true
       good_date.is_memorial_day?.should be_true
       good_date.is_not_memorial_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is labor day" do
+    it "should be able to tell if it is labor day and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("03/09/2012")
       bad_date.is_labor_day?.should be_false
       bad_date.is_not_labor_day?.should be_true
       good_date.is_labor_day?.should be_true
       good_date.is_not_labor_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is thanksgiving day" do
+    it "should be able to tell if it is thanksgiving day and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("22/11/2012")
       bad_date.is_thanksgiving_day?.should be_false
       bad_date.is_not_thanksgiving_day?.should be_true
       good_date.is_thanksgiving_day?.should be_true
       good_date.is_not_thanksgiving_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is xmas day" do
+    it "should be able to tell if it is xmas day and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("25/12/2012")
       bad_date.is_christmas_day?.should be_false
       bad_date.is_not_christmas_day?.should be_true
       good_date.is_christmas_day?.should be_true
       good_date.is_not_christmas_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is xmas eve" do
+    it "should be able to tell if it is xmas eve and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("24/12/2012")
       bad_date.is_christmas_eve?.should be_false
       bad_date.is_not_christmas_eve?.should be_true
       good_date.is_christmas_eve?.should be_true
       good_date.is_not_christmas_eve?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is new year's day" do
+    it "should be able to tell if it is new year's day and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("01/01/2012")
       bad_date.is_new_years_day?.should be_false
       bad_date.is_not_new_years_day?.should be_true
       good_date.is_new_years_day?.should be_true
       good_date.is_not_new_years_day?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
-    it "should be able to tell if it is the fourth of july" do
+    it "should be able to tell if it is the fourth of july and that it is not a valid business day" do
       bad_date  = Time.parse("06/06/2012")
       good_date = Time.parse("04/07/2012")
       bad_date.is_fourth_of_july?.should be_false
       bad_date.is_not_fourth_of_july?.should be_true
       good_date.is_fourth_of_july?.should be_true
       good_date.is_not_fourth_of_july?.should be_false
+      good_date.is_not_a_business_day?.should be_true
+      good_date.is_a_business_day?.should be_false
     end
 
     it "should be able to tell if it is a holiday or not" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: is_business_day
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: is_business_day
-rubygems_version: 1.8.18
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple business day detection