work_day 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21d50aa093439ef7e32a14eb8c858b3f6a6e9d16
-  data.tar.gz: a41a3f371aa76ebfbf6eea560fd8a8e39ca92f54
+SHA256:
+  metadata.gz: 0a81fa0ae71aa762151e9db42a0b906570f8c5c7ac1f13b3249b93beeb4f1543
+  data.tar.gz: b98c1bd13614ae192c4b9ed408e8a43823cba82d5d677815856db3c283b170bb
 SHA512:
-  metadata.gz: 58ebd92aee207b27534b5239427fb2c8afde29e51c0392f2c486637a4a930972856020a7ac650e804f2fd6020740d0a325d4e52b02cdb01e7170601875d04227
-  data.tar.gz: 6b97c360f0859aecb989fb745af5e31a67918c309c5e7897bcc8b87e665d02686652ba67dad100c3d84074f3b209e968b2407f234cb88b5a38f5d65faa669750
+  metadata.gz: d7f141ae6807c1fedbb7f64470209c3daa4a1a1df8266c76a12a59cf75544f7e3f1cf2dd3b5c9210ed10434eeac01a3b2b1dda60acf8b1750fe1a05455274e8d
+  data.tar.gz: 3f7f8b1550afe7229657185295652e303e9b8e26ed704a5c21ad0a2c35b2bb4b636c06bf566e2b2a94dc066e5813216fa5cf65c97c379be1f0b8f518223f8fde

data/CHANGELOG.md

@@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.0.0] - 2021-01-20
+### Changed
+- Dropping support for ruby < 2.4. Preferred version is > 2.5
+- Updated sinacor calendar, with holidays going as far as 2022
+- Updated gems dependencies
+
+## [1.3.0] - 2019-02-05
+### Added
+- Added new sinacor calendar, with São Paulo's municipal holidays and Brazil's national holidays.
+
+## [1.2.0] - 2018-09-10
+### Added
+- Feature to use the same calendar with different names
+
+## [1.1.0] - 2018-08-29
+### Added
+- Feature to use diferent calendars in a block
+- Thread safety
 
 ## [1.0.0] - 2018-03-27
 ### Added

data/README.md

@@ -108,15 +108,32 @@ Thu, 10 Jan 2013]
 
 ### Escolhendo calendários
 
-Pode ser utilizado mais de um calendário ao mesmo tempo
-Calendários disponíveis london, new_york e brazil
+Pode ser utilizado mais de um calendário ao mesmo tempo, através de qualquer um dos nomes disponíveis:
+
+ - `london`: `london`, `londres`
+ - `new_york`: `new_york`, `nova_iorque`
+ - `brazil`: `brazil`, `brasil`, `anbima`
+ - `sinacor`: `sinacor`, `b3`, `sao_paulo`
+
+###### Configurando os calendários default
 
 ```ruby
-> wd = WorkDay.new(['london', 'new_york'])
-> wd.work_day?("2018-05-28")
+> WorkDay.calendars(['london', 'new_york'])
+> WorkDay.work_day?("2018-05-28")
 => false
 ```
 
+###### Usando calendários apenas em um bloco específico (ex.: por request)
+
+```ruby
+> WorkDay.calendars(['new_york'])
+> WorkDay.work_day?("2018-07-04")
+=> false
+> WorkDay.use_calendars('london') { WorkDay.work_day?("2018-07-04") }
+=> true
+```
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bitbucket-pipelines.yml

@@ -1,10 +1,10 @@
-image: ruby:2.2.5
+image: ruby:2.4
 
 pipelines:
   default:
     - step:
         script:
-          - git archive --remote=git@bitbucket.org:guideinvestimentos/rails_defaults.git HEAD .rubocop.yml | tar -x
+          - wget -O .rubocop.yml $RUBOCOP_CONFIG_URL
           - bundle install
           - gem install rubocop
           - rspec -fdoc
@@ -15,6 +15,7 @@ pipelines:
       - step:
           script:
             - gem build work_day.gemspec
+            - mkdir -p ~/.gem && > ~/.gem/credentials
             - curl -u $RUBYGEMS_USERNAME:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
             - chmod 0600 ~/.gem/credentials
             - gem push $(ls *.gem)

data/data/calendars.json

@@ -0,0 +1,20 @@
+{
+  "brazil_holidays.json": [
+    "brasil",
+    "brazil",
+    "anbima"
+  ],
+  "london_holidays.json": [
+    "london",
+    "londres"
+  ],
+  "new_york_holidays.json": [
+    "new_york",
+    "nova_iorque"
+  ],
+  "sinacor_holidays.json": [
+    "sinacor",
+    "b3",
+    "sao_paulo"
+  ]
+}

data/data/sinacor_holidays.json

@@ -0,0 +1 @@
+["1996-11-15","1996-12-24","1996-12-25","1996-12-31","1997-01-01","1997-02-10","1997-02-11","1997-03-27","1997-03-28","1997-04-21","1997-05-01","1997-05-29","1997-12-24","1997-12-25","1997-12-31","1998-01-01","1998-02-23","1998-02-24","1998-04-09","1998-04-10","1998-04-21","1998-05-01","1998-06-11","1998-09-07","1998-10-12","1998-11-02","1998-12-24","1998-12-25","1998-12-31","1999-01-01","1999-02-15","1999-02-16","1999-04-01","1999-04-02","1999-04-21","1999-06-03","1999-09-07","1999-10-12","1999-11-02","1999-11-15","1999-12-24","1999-12-31","2000-01-01","2000-03-06","2000-03-07","2000-04-21","2000-05-01","2000-06-22","2000-09-07","2000-10-12","2000-11-02","2000-11-15","2000-12-25","2000-12-29","2001-01-01","2001-01-25","2001-02-26","2001-02-27","2001-04-13","2001-05-01","2001-06-14","2001-07-09","2001-09-07","2001-10-12","2001-11-02","2001-11-15","2001-12-24","2001-12-25","2001-12-31","2002-01-01","2002-01-25","2002-02-11","2002-02-12","2002-03-29","2002-05-01","2002-05-30","2002-07-09","2002-11-15","2002-12-24","2002-12-25","2002-12-31","2003-01-01","2003-03-03","2003-03-04","2003-04-18","2003-04-21","2003-05-01","2003-06-19","2003-07-09","2003-12-24","2003-12-25","2003-12-31","2004-01-01","2004-02-23","2004-02-24","2004-04-09","2004-04-21","2004-06-10","2004-07-09","2004-09-07","2004-10-12","2004-11-02","2004-11-15","2004-12-24","2004-12-31","2005-01-25","2005-02-07","2005-02-08","2005-03-25","2005-04-21","2005-05-26","2005-09-07","2005-10-12","2005-11-02","2005-11-15","2005-12-30","2006-01-25","2006-01-28","2006-02-27","2006-02-28","2006-04-14","2006-04-21","2006-05-01","2006-06-15","2006-09-07","2006-10-12","2006-11-02","2006-11-15","2006-11-20","2006-12-25","2006-12-29","2007-01-01","2007-01-25","2007-02-19","2007-02-20","2007-04-06","2007-05-01","2007-06-07","2007-07-09","2007-09-07","2007-10-12","2007-11-02","2007-11-15","2007-11-20","2007-12-24","2007-12-25","2007-12-31","2008-01-01","2008-01-25","2008-02-04","2008-02-05","2008-03-21","2008-04-21","2008-05-01","2008-05-22","2008-07-09","2008-11-20","2008-12-24","2008-12-25","2008-12-31","2009-01-01","2009-02-23","2009-02-24","2009-04-10","2009-04-21","2009-05-01","2009-06-11","2009-07-09","2009-09-07","2009-10-12","2009-11-02","2009-11-20","2009-12-24","2009-12-25","2009-12-31","2010-01-01","2010-01-25","2010-02-15","2010-02-16","2010-04-02","2010-04-21","2010-06-03","2010-07-09","2010-09-07","2010-10-12","2010-11-02","2010-11-15","2010-12-24","2010-12-31","2011-01-25","2011-03-07","2011-03-08","2011-04-21","2011-04-22","2011-06-23","2011-09-07","2011-10-12","2011-11-02","2011-11-15","2011-12-30","2012-01-25","2012-02-20","2012-02-21","2012-04-06","2012-05-01","2012-06-07","2012-07-09","2012-09-07","2012-10-12","2012-11-02","2012-11-15","2012-11-20","2012-12-24","2012-12-25","2012-12-31","2013-01-01","2013-01-25","2013-02-11","2013-02-12","2013-03-29","2013-05-01","2013-05-30","2013-07-09","2013-11-15","2013-11-20","2013-12-24","2013-12-25","2013-12-31","2014-01-01","2014-03-03","2014-03-04","2014-04-18","2014-04-21","2014-05-01","2014-06-12","2014-06-19","2014-07-09","2014-11-20","2014-12-24","2014-12-25","2014-12-31","2015-01-01","2015-02-16","2015-02-17","2015-04-03","2015-04-21","2015-05-01","2015-06-04","2015-07-09","2015-09-07","2015-10-12","2015-11-02","2015-11-20","2015-12-24","2015-12-25","2015-12-31","2016-01-01","2016-01-25","2016-02-08","2016-02-09","2016-03-25","2016-04-21","2016-05-26","2016-09-07","2016-10-12","2016-11-02","2016-11-15","2016-12-30","2017-01-25","2017-02-27","2017-02-28","2017-04-14","2017-04-21","2017-05-01","2017-06-15","2017-09-07","2017-10-12","2017-11-02","2017-11-15","2017-11-20","2017-12-25","2017-12-29","2018-01-01","2018-01-25","2018-02-12","2018-02-13","2018-03-30","2018-05-01","2018-05-31","2018-07-09","2018-09-07","2018-10-12","2018-11-02","2018-11-15","2018-11-20","2018-12-24","2018-12-25","2018-12-31","2019-01-01","2019-01-25","2019-03-04","2019-03-05","2019-04-19","2019-05-01","2019-06-20","2019-07-09","2019-11-15","2019-11-20","2019-12-24","2019-12-25","2019-12-31","2020-01-01","2020-02-24","2020-02-25","2020-04-10","2020-04-21","2020-05-01","2020-06-11","2020-07-09","2020-09-07","2020-10-12","2020-11-02","2020-11-20","2020-12-24","2020-12-25","2020-12-31","2021-01-01","2021-01-25","2021-02-15","2021-02-16","2021-04-02","2021-04-21","2021-06-03","2021-07-09","2021-09-07","2021-10-12","2021-11-02","2021-11-15","2021-12-24","2021-12-31","2022-02-28","2022-03-01","2022-04-15","2022-04-21","2022-06-16","2022-09-07","2022-10-12","2022-11-02","2022-11-15","2022-12-30"]

data/lib/holiday.rb

@@ -4,38 +4,61 @@ require 'json'
 require 'singleton'
 
 class Holiday
-  attr_reader :holidays, :calendars
+  attr_reader :calendars
+
+  CALENDARS_FILENAME = File.expand_path(
+    "#{File.dirname(__FILE__)}/../data/calendars.json"
+  )
 
   def initialize(calendars)
     @calendars = calendars
   end
 
+  def in(year)
+    holidays[year]
+  end
+
   def load_data
-    @holidays = {}
+    # TODO: remove this in a major version
+    holidays
+    calendars
+  end
+
+  private
 
-    calendars.each do |calendar|
-      file = File.expand_path(
-        File.dirname(__FILE__) + "/../data/#{calendar}_holidays.json"
-      )
-      raw_data = File.read(file)
-      parsed = JSON.parse(raw_data)
-      update_holidays(parsed)
-    end
+  def holidays
+    @holidays ||= calendars.flat_map(&method(:to_holidays)).uniq.
+                  reduce({}, &method(:by_year))
   end
 
-  def in(year)
-    load_data if holidays.nil?
-    holidays[year]
+  def by_year(holidays_by_year, date)
+    holidays_by_year ||= {}
+    holidays_by_year[date.year] ||= []
+    holidays_by_year[date.year] << date
+    holidays_by_year
   end
 
-  private
+  def to_holidays(calendar)
+    holiday_file(calendar).map(&:to_date)
+  end
+
+  def holiday_file(calendar)
+    filename = holiday_filename(calendar)
+
+    return if filename.nil?
+
+    path = File.dirname(__FILE__) + "/../data/#{filename}"
+    JSON.parse(File.read(File.expand_path(path)))
+  end
+
+  def holiday_filename(calendar)
+    holiday_files.select do |_filename, calendar_names|
+      calendar_names.include?(calendar)
+    end.keys.first
+  end
 
-  def update_holidays(parsed)
-    parsed.map do |str|
-      str.split('-')
-      date = Date.parse(str)
-      @holidays[date.year] ||= []
-      @holidays[date.year] << date
-    end
+  def holiday_files
+    @holiday_files ||= JSON.parse(File.read(CALENDARS_FILENAME))
+    @holiday_files
   end
 end

data/lib/work_day.rb

@@ -6,21 +6,26 @@ require 'active_support/core_ext'
 
 class WorkDay
   include Singleton
-  attr_accessor :calendars
 
-  def self.calendars(calendars)
-    instance.calendars = calendars
+  def calendars
+    Thread.current[:work_day_calendars]
+  end
+
+  def calendars=(new_calendars)
+    Thread.current[:work_day_calendars] = new_calendars
   end
 
   def work_day?(date)
     date = date.try(:to_date)
     return unless date
+
     ![0, 6].include?(date.wday) && !holidays_in(date.year).include?(date)
   end
 
   def last_until(date, days = 0)
     date = date.try(:to_date)
     return unless date
+
     date -= 1 until work_day?(date)
     days -= 1
     days == -1 ? date : last_until(1.day.ago(date), days)
@@ -37,29 +42,31 @@ class WorkDay
   end
 
   def between(start_date, end_date)
-    (start_date.to_date..end_date.to_date).select { |date| work_day?(date) }
+    (start_date.to_date..end_date.to_date).select(&method(:work_day?))
   end
 
-  def self.work_day?(date)
-    WorkDay.instance.work_day?(date)
+  def use_calendars(*new_calendars)
+    old_calendars = calendars
+    self.calendars = new_calendars
+    yield
+  ensure
+    self.calendars = old_calendars
   end
 
-  def self.last_until(date, days = 0)
-    WorkDay.instance.last_until(date, days)
-  end
-
-  def self.next_after(date, days = 1)
-    WorkDay.instance.next_after(date, days)
-  end
+  class << self
+    delegate :work_day?, :last_until, :next_after, :between,
+             :calendars=, :use_calendars, to: :instance
 
-  def self.between(start_date, end_date)
-    WorkDay.instance.between(start_date, end_date)
+    # TODO: remove in favor of #calendars=. Requires major version upgrade.
+    def calendars(new_calendars)
+      self.calendars = new_calendars
+    end
   end
 
   private
 
   def holidays_in(year)
-    @calendars ||= ['brazil']
+    self.calendars ||= ['brazil']
     @holidays ||= {}
     @holidays[calendars] ||= {}
     @holidays[calendars][year] ||= Holiday.new(calendars).in(year)

data/lib/work_day/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class WorkDay
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/work_day.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.required_ruby_version = '>= 2.4.0'
+
+  spec.add_development_dependency 'rspec', '> 3.0'
   spec.add_runtime_dependency 'activesupport', '>= 4.0'
 end

metadata

@@ -1,41 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: work_day
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -61,17 +47,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - bitbucket-pipelines.yml
 - data/brazil_holidays.json
+- data/calendars.json
 - data/london_holidays.json
 - data/new_york_holidays.json
+- data/sinacor_holidays.json
 - lib/holiday.rb
 - lib/work_day.rb
 - lib/work_day/version.rb
@@ -88,15 +73,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: work days

data/.ruby-gemset

@@ -1 +0,0 @@
-bigbang_services

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.5

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2.5
-before_install: gem install bundler -v 1.13.7