work_day 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d50aa093439ef7e32a14eb8c858b3f6a6e9d16
-  data.tar.gz: a41a3f371aa76ebfbf6eea560fd8a8e39ca92f54
+  metadata.gz: 5ad2e90243c135cdf7a6f7435370a29813ff9f49
+  data.tar.gz: b3f3cfb88d70229f837ccffc1d08b21bcd3e7b8f
 SHA512:
-  metadata.gz: 58ebd92aee207b27534b5239427fb2c8afde29e51c0392f2c486637a4a930972856020a7ac650e804f2fd6020740d0a325d4e52b02cdb01e7170601875d04227
-  data.tar.gz: 6b97c360f0859aecb989fb745af5e31a67918c309c5e7897bcc8b87e665d02686652ba67dad100c3d84074f3b209e968b2407f234cb88b5a38f5d65faa669750
+  metadata.gz: 66865b24e8e13099f91d1d3044ceba82bcdc4a7d091bdcecfdf4edb28decb852db802ee05e0347b9be29f76f60867feb7f3f1bca53e8b5a0e88d5f726942c5df
+  data.tar.gz: 721b82d582cfd2f9f71197ba4422658805cd9a3c700a6e2bc8ec0830959bea603fcd3d1bc4e9ad82bbbf2d622a135eeffb0312459fa13a27b65283186d35c5c4

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.1.0] - 2018-08-29
+### Added
+- Feature to use diferent calendars in a block
+- Thread safety
+
 ## [1.0.0] - 2018-03-27
 ### Added
 - Feature for foreign calendars

data/README.md

@@ -111,12 +111,25 @@ Thu, 10 Jan 2013]
 Pode ser utilizado mais de um calendário ao mesmo tempo
 Calendários disponíveis london, new_york e brazil
 
+###### Configurando os calendários default
+
+```ruby
+> 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
-> wd = WorkDay.new(['london', 'new_york'])
-> wd.work_day?("2018-05-28")
+> 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/lib/work_day/version.rb

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

data/lib/work_day.rb

@@ -6,10 +6,13 @@ 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)
@@ -37,29 +40,31 @@ class WorkDay
   end
 
   def between(start_date, end_date)
-    (start_date.to_date..end_date.to_date).select { |date| work_day?(date) }
-  end
-
-  def self.work_day?(date)
-    WorkDay.instance.work_day?(date)
+    (start_date.to_date..end_date.to_date).select(&method(:work_day?))
   end
 
-  def self.last_until(date, days = 0)
-    WorkDay.instance.last_until(date, days)
+  def use_calendars(*new_calendars)
+    old_calendars = calendars
+    self.calendars = new_calendars
+    yield
+  ensure
+    self.calendars = old_calendars
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_day
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: work days