spok 1.0.0 → 1.1.0

data/lib/spok/version.rb

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

data/lib/spok/workday.rb

@@ -9,7 +9,20 @@ class Spok
   # module.
   module Workday
     # Public: Array of available calendars.
-    CALENDARS = %i(brasil bovespa)
+
+    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|
@@ -18,6 +31,17 @@ class Spok
       [calendar, Set.new(holidays[calendar.to_s])]
     end.to_h
 
+    # Public: Hash containing all weekdays.
+    WEEKDAYS = {
+      sunday: 0,
+      monday: 1,
+      tuesday: 2,
+      wednesday: 3,
+      thrusday: 4,
+      friday: 5,
+      saturday: 6
+    }.freeze
+
     # Public: Checks if a given day is a restday.
     #
     # date     - The Date to be checked.
@@ -30,7 +54,7 @@ class Spok
     #   # => false
     #
     # Returns a boolean.
-    def self.restday?(date, calendar: :brasil)
+    def self.restday?(date, calendar: Spok.default_calendar)
       self.weekend?(date) || self.holiday?(date, calendar: calendar)
     end
 
@@ -46,7 +70,7 @@ class Spok
     #   # => true
     #
     # Returns a boolean.
-    def self.workday?(date, calendar: :brasil)
+    def self.workday?(date, calendar: Spok.default_calendar)
       !restday?(date, calendar: calendar)
     end
 
@@ -63,7 +87,7 @@ class Spok
     def self.weekend?(date)
       weekday = date.wday
 
-      weekday == 0 || weekday == 6
+      [WEEKDAYS[:saturday], WEEKDAYS[:sunday]].include? weekday
     end
 
     # Public: Checks if a given Date is on a holiday.
@@ -78,7 +102,7 @@ class Spok
     #   # => true
     #
     # Returns a boolean.
-    def self.holiday?(date, calendar: :brasil)
+    def self.holiday?(date, calendar: Spok.default_calendar)
       HOLIDAYS[calendar].include?(date.to_date)
     end
 
@@ -92,7 +116,7 @@ class Spok
     # Examples
     #   Spok::Workday.last_workday(Date.new(2012, 10, 21))
     #   # => #<Date: 2012-10-19 ((2456220j,0s,0n),+0s,2299161j)>
-    def self.last_workday(date, calendar: :brasil)
+    def self.last_workday(date, calendar: Spok.default_calendar)
       return date if workday?(date, calendar: calendar)
 
       last_workday((date - 1.day), calendar: calendar)
@@ -108,7 +132,7 @@ class Spok
     # Examples
     #   Spok::Workday.next_workday(Date.new(2012, 10, 21))
     #   # => #<Date: 2012-10-19 ((2456220j,0s,0n),+0s,2299161j)>
-    def self.next_workday(date, calendar: :brasil)
+    def self.next_workday(date, calendar: Spok.default_calendar)
       return date if workday?(date, calendar: calendar)
 
       next_workday((date + 1.day), calendar: calendar)

data/spec/lib/spok/calendars_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'spok/workday'
+
+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
+
+      expect(valid_calendar).to eq(true)
+    end
+  end
+end

data/spec/lib/spok/workday_spec.rb

@@ -38,6 +38,33 @@ describe Spok::Workday do
       end
     end
 
+    context 'days using spanish calendar' do
+      it 'is not a workday' do
+        ['2009-01-06', '2009-04-10', '2009-04-12'].each do |holiday|
+          expect(described_class.workday?(Date.parse(holiday), calendar: :spain)).to eq(false)
+        end
+      end
+
+      it 'is a workday' do
+        ['2009-01-07', '2019-01-14', '2020-04-22'].each do |workday|
+          expect(described_class.workday?(Date.parse(workday), calendar: :spain)).to eq(true)
+        end
+      end
+    end
+
+    context 'days using dutch calendar' do
+      it 'is not a workday' do
+        ['2019-06-10', '2019-12-25', '2019-12-26'].each do |holiday|
+          expect(described_class.workday?(Date.parse(holiday), calendar: :netherlands)).to eq(false)
+        end
+      end
+
+      it 'is a workday' do
+        ['2010-06-10', '2009-09-11', '2019-12-02'].each do |workday|
+          expect(described_class.workday?(Date.parse(workday), calendar: :netherlands)).to eq(true)
+        end
+      end
+    end
   end
 
   describe '#restday?' do

data/spec/lib/spok_spec.rb

@@ -206,4 +206,14 @@ describe Spok do
     subject { Spok.new(sunday, tuesday).to_range }
     it { is_expected.to eq((sunday..tuesday)) }
   end
+
+  describe '#default_calendar' do
+    it 'changes default_calendar' do
+      default_calendar_was = Spok.default_calendar
+      spok = double("spok", :default_calendar => :bovespa)
+
+      expect(default_calendar_was).not_to eq(spok.default_calendar)
+      expect(default_calendar_was).to eq(:brasil)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spok
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Magnetis Staff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,9 +84,19 @@ files:
 - lib/spok.rb
 - lib/spok/config/bovespa.yml
 - lib/spok/config/brasil.yml
+- lib/spok/config/canada.yml
+- lib/spok/config/costa_rica.yml
+- lib/spok/config/indonesia.yml
+- lib/spok/config/mexico.yml
+- lib/spok/config/netherlands.yml
+- lib/spok/config/poland.yml
+- lib/spok/config/portugal.yml
+- lib/spok/config/spain.yml
+- lib/spok/config/vietnam.yml
 - lib/spok/version.rb
 - lib/spok/workday.rb
 - pkg/spok-1.0.0.gem
+- spec/lib/spok/calendars_spec.rb
 - spec/lib/spok/workday_spec.rb
 - spec/lib/spok_spec.rb
 - spec/spec_helper.rb
@@ -116,6 +126,7 @@ signing_key:
 specification_version: 4
 summary: A gem to work with periods of dates
 test_files:
+- spec/lib/spok/calendars_spec.rb
 - spec/lib/spok/workday_spec.rb
 - spec/lib/spok_spec.rb
 - spec/spec_helper.rb