spok 1.1.0 → 2.0.0

data/lib/spok/version.rb

@@ -1,3 +1,3 @@
 class Spok
-  VERSION = '1.1.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/spok/workday.rb

@@ -1,36 +1,11 @@
 require 'active_support'
 require 'active_support/core_ext'
-require 'set'
-require 'yaml'
 
 class Spok
   # Public: Various methods useful for checking for restdays and workdays.
   # All methods are module methods and should be called on the Spok::Workday
   # module.
   module Workday
-    # Public: Array of available calendars.
-
-    CALENDARS = %i(
-      brasil
-      bovespa
-      canada
-      costa_rica
-      indonesia
-      mexico
-      netherlands
-      poland
-      portugal
-      spain
-      vietnam
-    )
-
-    # Public: Hash containing all holidays for each available calendar.
-    HOLIDAYS = CALENDARS.map do |calendar|
-      holidays_file = File.open(File.join(File.dirname(__FILE__), "config/#{calendar}.yml"))
-      holidays = YAML.safe_load(holidays_file.read, [Date])
-      [calendar, Set.new(holidays[calendar.to_s])]
-    end.to_h
-
     # Public: Hash containing all weekdays.
     WEEKDAYS = {
       sunday: 0,
@@ -46,7 +21,7 @@ class Spok
     #
     # date     - The Date to be checked.
     # calendar - Symbol informing in which calendar the date will be checked
-    #            (default: :brasil).
+    #            (default: :brazil).
     #
     # Examples
     #
@@ -62,7 +37,7 @@ class Spok
     #
     # date     - The Date to be checked.
     # calendar - Symbol informing in which calendar the date will be checked
-    #            (default: :brasil).
+    #            (default: :brazil).
     #
     # Examples
     #
@@ -94,7 +69,7 @@ class Spok
     #
     # date     - The Date to be checked.
     # calendar - Symbol informing in which calendar the date will be checked
-    #            (default: :brasil).
+    #            (default: :brazil).
     #
     # Examples
     #
@@ -103,7 +78,8 @@ class Spok
     #
     # Returns a boolean.
     def self.holiday?(date, calendar: Spok.default_calendar)
-      HOLIDAYS[calendar].include?(date.to_date)
+      dates = Spok::Calendars.get(calendar)
+      dates.include?(date.to_date)
     end
 
     # Public: Returns the last workday until the informed date.
@@ -111,7 +87,7 @@ class Spok
     #
     # date     - End Date to check for workdays.
     # calendar - Symbol informing in which calendar to check for workdays
-    #            (default: :brasil).
+    #            (default: :brazil).
     #
     # Examples
     #   Spok::Workday.last_workday(Date.new(2012, 10, 21))
@@ -127,7 +103,7 @@ class Spok
     #
     # date     - Start Date to check for workdays.
     # calendar - Symbol informing in which calendar to check for workdays
-    #            (default: :brasil).
+    #            (default: :brazil).
     #
     # Examples
     #   Spok::Workday.next_workday(Date.new(2012, 10, 21))

data/spec/fixtures/custom-calendar.yml

@@ -0,0 +1,3 @@
+---
+custom_calendar:
+- 2019-01-25

data/spec/lib/spok/calendars_spec.rb

@@ -1,14 +1,11 @@
 require 'spec_helper'
-require 'spok/workday'
+require 'spok'
 
-describe 'Spok Calendars' do
-  Spok::Workday::CALENDARS.each do |calendar|
-    it "has valid dates for #{calendar}" do
-      file = File.new(File.join(File.dirname(__FILE__), "../../../lib/spok/config/#{calendar}.yml"))
-      last_day = Date.strptime(file.readlines[-1], '- %Y-%m-%d')
-      valid_calendar = last_day - 365 > Date.today
+describe Spok::Calendars do
+  it 'loads a new calendar' do
+    Spok::Calendars.add(:custom_calendar, File.expand_path('../../fixtures/custom-calendar.yml', __dir__))
 
-      expect(valid_calendar).to eq(true)
-    end
+    expect(Spok::Workday.restday?(Date.new(2019, 01, 25), calendar: :custom_calendar)).to eq(true)
+    expect(Spok::Workday.workday?(Date.new(2019, 01, 25), calendar: :custom_calendar)).to eq(false)
   end
 end

data/spec/lib/spok/workday_spec.rb

@@ -21,7 +21,7 @@ describe Spok::Workday do
       end
     end
 
-    context 'holidays using brasil calendar' do
+    context 'holidays using brazil calendar' do
       it 'is not a workday' do
         ['2012-06-07', '2012-09-07', '2012-10-12',
          '2012-11-02', '2012-11-15', '2012-12-25'].each do |holiday|
@@ -65,6 +65,20 @@ describe Spok::Workday do
         end
       end
     end
+
+    context 'holidays using guatemala calendar' do
+      it 'is not a workday' do
+        ['2018-01-01', '2018-06-30', '2018-09-15', '2018-10-20'].each do |holiday|
+          expect(described_class.workday?(Date.parse(holiday), calendar: :guatemala)).to eq(false)
+        end
+      end
+
+      it 'is a workday' do
+        ['2018-01-22', '2018-07-27', '2018-12-20'].each do |holiday|
+          expect(described_class.workday?(Date.parse(holiday), calendar: :guatemala)).to eq(true)
+        end
+      end
+    end
   end
 
   describe '#restday?' do
@@ -158,12 +172,12 @@ describe Spok::Workday do
 
   describe '#holiday?' do
     it 'returns false when date is not a holiday on the given calendar' do
-      expect(described_class.holiday?(Date.new(2018, 05, 02), calendar: :brasil)).to eq(false)
+      expect(described_class.holiday?(Date.new(2018, 05, 02), calendar: :brazil)).to eq(false)
       expect(described_class.holiday?(Date.new(2018, 12, 15), calendar: :bovespa)).to eq(false)
     end
 
     it 'returns true when date is a holiday on the given calendar' do
-      expect(described_class.holiday?(Date.new(2018, 05, 01), calendar: :brasil)).to eq(true)
+      expect(described_class.holiday?(Date.new(2018, 05, 01), calendar: :brazil)).to eq(true)
       expect(described_class.holiday?(Date.new(2018, 12, 25), calendar: :bovespa)).to eq(true)
     end
   end

data/spec/lib/spok_spec.rb

@@ -110,12 +110,12 @@ describe Spok do
       end
     end
 
-    context 'when brasil is the calendar' do
-      subject { described_class.new(sunday, tuesday).to_calendar(:brasil) }
+    context 'when brazil is the calendar' do
+      subject { described_class.new(sunday, tuesday).to_calendar(:brazil) }
 
       context 'and the start date is holiday' do
         let(:start_date) { Date.new(2013, 9, 6) }
-        let(:sunday)      { Date.new(2013, 9, 7) } # brasil holiday
+        let(:sunday)      { Date.new(2013, 9, 7) } # brazil holiday
         let(:tuesday)      { Date.new(2013, 9, 10) }
         it 'returns the last workday as the start date' do
           expect(subject.start_date).to eq(start_date)
@@ -124,7 +124,7 @@ describe Spok do
 
       context 'end date on a bovespa holiday' do
         let(:sunday)    { Date.new(2013, 9, 5) }
-        let(:tuesday)    { Date.new(2013, 9, 7) } # brasil holiday
+        let(:tuesday)    { Date.new(2013, 9, 7) } # brazil holiday
         let(:end_date) { Date.new(2013, 9, 6) }
         it 'returns the last bovespa workday as the end date' do
           expect(subject.end_date).to eq(end_date)
@@ -213,7 +213,7 @@ describe Spok do
       spok = double("spok", :default_calendar => :bovespa)
 
       expect(default_calendar_was).not_to eq(spok.default_calendar)
-      expect(default_calendar_was).to eq(:brasil)
+      expect(default_calendar_was).to eq(:brazil)
     end
   end
 end

data/spok.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '~> 5.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spok
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Magnetis Staff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,24 +78,40 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/spok.rb
+- lib/spok/calendars.rb
+- lib/spok/config/australia.yml
+- lib/spok/config/austria.yml
+- lib/spok/config/belgium.yml
 - lib/spok/config/bovespa.yml
-- lib/spok/config/brasil.yml
+- lib/spok/config/brazil.yml
 - lib/spok/config/canada.yml
+- lib/spok/config/colombia.yml
 - lib/spok/config/costa_rica.yml
+- lib/spok/config/france.yml
+- lib/spok/config/germany.yml
+- lib/spok/config/guatemala.yml
+- lib/spok/config/india.yml
 - lib/spok/config/indonesia.yml
+- lib/spok/config/liechtenstein.yml
 - lib/spok/config/mexico.yml
 - lib/spok/config/netherlands.yml
 - lib/spok/config/poland.yml
 - lib/spok/config/portugal.yml
+- lib/spok/config/singapore.yml
 - lib/spok/config/spain.yml
+- lib/spok/config/switzerland.yml
+- lib/spok/config/ukraine.yml
+- lib/spok/config/united_states.yml
 - lib/spok/config/vietnam.yml
 - lib/spok/version.rb
 - lib/spok/workday.rb
-- pkg/spok-1.0.0.gem
+- pkg/spok-2.0.0.gem
+- spec/fixtures/custom-calendar.yml
 - spec/lib/spok/calendars_spec.rb
 - spec/lib/spok/workday_spec.rb
 - spec/lib/spok_spec.rb
@@ -120,12 +136,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A gem to work with periods of dates
 test_files:
+- spec/fixtures/custom-calendar.yml
 - spec/lib/spok/calendars_spec.rb
 - spec/lib/spok/workday_spec.rb
 - spec/lib/spok_spec.rb