business_calendar 0.0.6 → 0.0.7

data/business_calendar.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-debugger"
+  spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "timecop"
 end

data/data/holidays.yml

@@ -71,25 +71,20 @@ CN:
     - '2014-10-06'
     - '2014-10-07'
     - '2015-01-01'
+    - '2015-01-02'
+    - '2015-01-03'
+    - '2015-02-18'
     - '2015-02-19'
     - '2015-02-20'
     - '2015-02-21'
     - '2015-02-22'
     - '2015-02-23'
     - '2015-02-24'
-    - '2015-02-25'
     - '2015-04-05'
     - '2015-04-06'
-    - '2015-04-07'
     - '2015-05-01'
-    - '2015-05-02'
-    - '2015-05-03'
-    - '2015-06-20'
-    - '2015-06-21'
     - '2015-06-22'
     - '2015-09-27'
-    - '2015-09-28'
-    - '2015-09-29'
     - '2015-10-01'
     - '2015-10-02'
     - '2015-10-03'
@@ -97,6 +92,34 @@ CN:
     - '2015-10-05'
     - '2015-10-06'
     - '2015-10-07'
+    - '2016-01-01'
+    - '2016-01-02'
+    - '2016-01-03'
+    - '2016-02-18'
+    - '2016-02-19'
+    - '2016-02-20'
+    - '2016-02-21'
+    - '2016-02-22'
+    - '2016-02-23'
+    - '2016-02-24'
+    - '2016-04-05'
+    - '2016-04-06'
+    - '2016-05-01'
+    - '2016-05-02'
+    - '2016-05-03'
+    - '2016-06-20'
+    - '2016-06-21'
+    - '2016-06-22'
+    - '2016-09-27'
+    - '2016-09-28'
+    - '2016-09-29'
+    - '2016-10-01'
+    - '2016-10-02'
+    - '2016-10-03'
+    - '2016-10-04'
+    - '2016-10-05'
+    - '2016-10-06'
+    - '2016-10-07'
   additions_only: true
   holiday_names: []   # Not needed cause all holidays are via manual +additions+
 

data/lib/business_calendar/version.rb

@@ -1,3 +1,3 @@
 module BusinessCalendar
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/acceptance_br_spec.rb

@@ -20,7 +20,7 @@ describe "BR bank holidays" do
       2015-12-25
     ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
-      BusinessCalendar.for(:BR).is_holiday?(expected_holiday).should be_true
+      expect(BusinessCalendar.for(:BR).is_holiday?(expected_holiday)).to be true
     end
   end
 
@@ -31,7 +31,7 @@ describe "BR bank holidays" do
       2014-03-04
     ).map { |x| Date.parse x }.each do |date|
     it "treats #{date} as not a holiday" do
-      BusinessCalendar.for(:BR).is_holiday?(date).should be_false
+      expect(BusinessCalendar.for(:BR).is_holiday?(date)).to be false
     end
   end
 end

data/spec/acceptance_cn_spec.rb

@@ -30,25 +30,20 @@ describe "CN holidays" do
     2014-10-06
     2014-10-07
     2015-01-01
+    2015-01-02
+    2015-01-03
+    2015-02-18
     2015-02-19
     2015-02-20
     2015-02-21
     2015-02-22
     2015-02-23
     2015-02-24
-    2015-02-25
     2015-04-05
     2015-04-06
-    2015-04-07
     2015-05-01
-    2015-05-02
-    2015-05-03
-    2015-06-20
-    2015-06-21
     2015-06-22
     2015-09-27
-    2015-09-28
-    2015-09-29
     2015-10-01
     2015-10-02
     2015-10-03
@@ -56,9 +51,37 @@ describe "CN holidays" do
     2015-10-05
     2015-10-06
     2015-10-07
+    2016-01-01
+    2016-01-02
+    2016-01-03
+    2016-02-18
+    2016-02-19
+    2016-02-20
+    2016-02-21
+    2016-02-22
+    2016-02-23
+    2016-02-24
+    2016-04-05
+    2016-04-06
+    2016-05-01
+    2016-05-02
+    2016-05-03
+    2016-06-20
+    2016-06-21
+    2016-06-22
+    2016-09-27
+    2016-09-28
+    2016-09-29
+    2016-10-01
+    2016-10-02
+    2016-10-03
+    2016-10-04
+    2016-10-05
+    2016-10-06
+    2016-10-07
   ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
-      BusinessCalendar.for(:CN).is_holiday?(expected_holiday).should be_true
+      expect(BusinessCalendar.for(:CN).is_holiday?(expected_holiday)).to be true
     end
   end
 end

data/spec/acceptance_gb_spec.rb

@@ -20,7 +20,7 @@ describe "GB bank holidays" do
       2015-12-28
     ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
-      BusinessCalendar.for(:GB).is_holiday?(expected_holiday).should be_true
+      expect(BusinessCalendar.for(:GB).is_holiday?(expected_holiday)).to be true
     end
   end
 
@@ -28,7 +28,7 @@ describe "GB bank holidays" do
       2012-05-28
     ).map { |x| Date.parse x }.each do |date|
     it "treats #{date} as not a holiday" do
-      BusinessCalendar.for(:GB).is_holiday?(date).should be_false
+      expect(BusinessCalendar.for(:GB).is_holiday?(date)).to be false
     end
   end
 end

data/spec/acceptance_us_spec.rb

@@ -42,7 +42,7 @@ describe "US holidays" do
       2018-01-01
     ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
-      BusinessCalendar.for(:US).is_holiday?(expected_holiday).should be_true
+      expect(BusinessCalendar.for(:US).is_holiday?(expected_holiday)).to be true
     end
   end
 end

data/spec/business_calendar/holiday_determiner_spec.rb

@@ -6,8 +6,8 @@ describe BusinessCalendar::HolidayDeterminer do
   subject { BusinessCalendar::HolidayDeterminer.new(regions, ["Independence Day"], opts) }
 
   it "initializes with list of regions and a list of accepted holidays" do
-    subject.regions.should == regions
-    subject.holiday_names.should == ["Independence Day"]
+    expect(subject.regions).to eq regions
+    expect(subject.holiday_names).to eq ["Independence Day"]
   end
 
   it "knows which dates are holidays" do
@@ -15,7 +15,7 @@ describe BusinessCalendar::HolidayDeterminer do
     (Date.today.year - 1 .. Date.today.year + 10).each do |year|
       fourth = Date.new year, 7, 4
       obs_date = fourth.sunday? ? fourth + 1 : (fourth.saturday? ? fourth - 1 : fourth)
-      subject.call(obs_date).should be_true
+      expect(subject.call(obs_date)).to be true
     end
   end
 
@@ -26,11 +26,11 @@ describe BusinessCalendar::HolidayDeterminer do
     }}
 
     it "correctly determines false for the exceptions" do
-      subject.call('2101-07-04'.to_date).should be_false
+      expect(subject.call('2101-07-04'.to_date)).to be false
     end
 
     it "correctly determines true for the additions" do
-      subject.call('2101-07-05'.to_date).should be_true
+      expect(subject.call('2101-07-05'.to_date)).to be true
     end
   end
 
@@ -41,11 +41,11 @@ describe BusinessCalendar::HolidayDeterminer do
     }}
 
     it "correctly determines true for the additions" do
-      subject.call('2101-07-05'.to_date).should be_true
+      expect(subject.call('2101-07-05'.to_date)).to be true
     end
 
     it "correctly determines false for dates not in additions, nor exceptions" do
-      subject.call('2101-07-04'.to_date).should be_false
+      expect(subject.call('2101-07-04'.to_date)).to be_falsy
     end
   end
 end

data/spec/business_calendar_spec.rb

@@ -6,72 +6,72 @@ describe BusinessCalendar do
 
   shared_examples_for "standard business time" do
     specify "a weekend is not a business day" do
-      subject.is_business_day?('2014-03-09'.to_date).should be_false
+      expect(subject.is_business_day?('2014-03-09'.to_date)).to be false
     end
 
     specify "a normal weekday is a business day" do
-      subject.is_business_day?('2014-03-10'.to_date).should be_true
+      expect(subject.is_business_day?('2014-03-10'.to_date)).to be true
     end
 
     specify 'the nearest business day to monday is monday in both directions' do
-      subject.nearest_business_day('2014-03-10'.to_date)            .should == '2014-03-10'.to_date
-      subject.nearest_business_day('2014-03-10'.to_date, :backward) .should == '2014-03-10'.to_date
-      subject.nearest_business_day('2014-03-10'.to_date, :forward)  .should == '2014-03-10'.to_date
+      expect(subject.nearest_business_day('2014-03-10'.to_date)).to eq '2014-03-10'.to_date
+      expect(subject.nearest_business_day('2014-03-10'.to_date, :backward)).to eq '2014-03-10'.to_date
+      expect(subject.nearest_business_day('2014-03-10'.to_date, :forward)).to eq '2014-03-10'.to_date
     end
 
     specify 'the nearest business day to a saturday, forward, is monday' do
-      subject.nearest_business_day('2014-03-08'.to_date)          .should == '2014-03-10'.to_date
-      subject.nearest_business_day('2014-03-08'.to_date, :forward).should == '2014-03-10'.to_date
+      expect(subject.nearest_business_day('2014-03-08'.to_date)).to eq '2014-03-10'.to_date
+      expect(subject.nearest_business_day('2014-03-08'.to_date, :forward)).to eq '2014-03-10'.to_date
     end
 
     specify 'the nearest business day to a saturday, backward, is friday' do
-      subject.nearest_business_day('2014-03-08'.to_date, :backward).should == '2014-03-07'.to_date
+      expect(subject.nearest_business_day('2014-03-08'.to_date, :backward)).to eq '2014-03-07'.to_date
     end
 
     specify 'one business day added to a monday is the next day' do
-      subject.add_business_day('2014-03-10'.to_date).should == '2014-03-11'.to_date
+      expect(subject.add_business_day('2014-03-10'.to_date)).to eq '2014-03-11'.to_date
     end
 
     specify 'one business day added to a friday is the coming monday' do
-      subject.add_business_day('2014-03-07'.to_date).should == '2014-03-10'.to_date
+      expect(subject.add_business_day('2014-03-07'.to_date)).to eq '2014-03-10'.to_date
     end
 
     specify 'one business day added to a weekend is the coming tuesday' do
-      subject.add_business_day('2014-03-08'.to_date).should == '2014-03-11'.to_date
+      expect(subject.add_business_day('2014-03-08'.to_date)).to eq '2014-03-11'.to_date
     end
 
     specify 'one business day added to a monday as well as a tuesday is tuesday and wednesday' do
       d1, d2 = subject.add_business_days ['2014-03-10'.to_date, '2014-03-11'.to_date]
-      d1.should == '2014-03-11'.to_date
-      d2.should == '2014-03-12'.to_date
+      expect(d1).to eq '2014-03-11'.to_date
+      expect(d2).to eq '2014-03-12'.to_date
     end
 
     specify 'the following business day of a saturday is the coming monday' do
-      subject.following_business_day('2014-03-08'.to_date).should == '2014-03-10'.to_date
+      expect(subject.following_business_day('2014-03-08'.to_date)).to eq '2014-03-10'.to_date
     end
 
     specify 'a saturday plus zero business days is the nearest business day, monday' do
-      subject.add_business_days('2014-03-08'.to_date, 0).should == '2014-03-10'.to_date
+      expect(subject.add_business_days('2014-03-08'.to_date, 0)).to eq '2014-03-10'.to_date
     end
 
     specify 'a saturday plus zero business days with initial direction backward is the nearest preceding business day, friday' do
-      subject.add_business_days('2014-03-08'.to_date, 0, :backward).should == '2014-03-07'.to_date
+      expect(subject.add_business_days('2014-03-08'.to_date, 0, :backward)).to eq '2014-03-07'.to_date
     end
 
     specify 'the following business day of a monday is tuesday' do
-      subject.following_business_day('2014-03-10'.to_date).should == '2014-03-11'.to_date
+      expect(subject.following_business_day('2014-03-10'.to_date)).to eq '2014-03-11'.to_date
     end
 
     specify 'the preceding business day of a monday is friday' do
-      subject.preceding_business_day('2014-03-10'.to_date).should == '2014-03-07'.to_date
+      expect(subject.preceding_business_day('2014-03-10'.to_date)).to eq '2014-03-07'.to_date
     end
 
     specify 'a monday less three business days is the previous wednesday' do
-      subject.add_business_days('2014-03-10'.to_date, -3).should == '2014-03-05'.to_date
+      expect(subject.add_business_days('2014-03-10'.to_date, -3)).to eq '2014-03-05'.to_date
     end
 
     specify 'a saturday less one business day is the previous friday' do
-      subject.subtract_business_day('2014-03-08'.to_date).should == '2014-03-07'.to_date
+      expect(subject.subtract_business_day('2014-03-08'.to_date)).to eq '2014-03-07'.to_date
     end
   end
 
@@ -81,7 +81,7 @@ describe BusinessCalendar do
     it_behaves_like "standard business time"
 
     specify "American Independence Day is not a business day" do
-      subject.is_business_day?('2014-07-04'.to_date).should be_false
+      expect(subject.is_business_day?('2014-07-04'.to_date)).to be false
     end
   end
 
@@ -91,11 +91,11 @@ describe BusinessCalendar do
     it_behaves_like "standard business time"
 
     specify "American Independence Day is a business day" do
-      subject.is_business_day?('2014-07-04'.to_date).should be_true
+      expect(subject.is_business_day?('2014-07-04'.to_date)).to be true
     end
 
     specify 'Boxing Day is observed on a weekday' do
-      subject.is_business_day?('2015-12-28'.to_date).should be_false
+      expect(subject.is_business_day?('2015-12-28'.to_date)).to be false
     end
   end
 

metadata

@@ -1,83 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: business_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Robert Nubel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holidays
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Helper gem for dealing with business days and date adjustment in multiple
@@ -88,8 +131,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,26 +153,33 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -788360373610172520
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -788360373610172520
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Country-aware business-date logic and handling.
 test_files:
 - spec/acceptance_br_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d352073cba3980654ef7cbcd0acbbd1bc0e080b2
-  data.tar.gz: 6f7462eed85e8198eac0508cfafd96fa3c8e0289
-SHA512:
-  metadata.gz: 173699885a116dbffea3fb7556c7f64cc22b03146528b1cb9cbcbc18918e412f4a73e656f69408afa9524f42db664be61783ad1800be311343954a9e4adae3b8
-  data.tar.gz: f4eaef2695e82cc87fe6d4309bb4fef56d1bf3e3dbf8da9c7f0be2ae342b0e75d6bb6b308a8985fbe50abfac634f895bc0d7c4d50c1d7bd50b6832e4455c7cc6