work_day 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad2e90243c135cdf7a6f7435370a29813ff9f49
-  data.tar.gz: b3f3cfb88d70229f837ccffc1d08b21bcd3e7b8f
+  metadata.gz: 4f0bfdf5aafc3c2e22fb7f29ee4cf93bb2d98a94
+  data.tar.gz: 147439eed93a41cf7829b12041a3858c02822612
 SHA512:
-  metadata.gz: 66865b24e8e13099f91d1d3044ceba82bcdc4a7d091bdcecfdf4edb28decb852db802ee05e0347b9be29f76f60867feb7f3f1bca53e8b5a0e88d5f726942c5df
-  data.tar.gz: 721b82d582cfd2f9f71197ba4422658805cd9a3c700a6e2bc8ec0830959bea603fcd3d1bc4e9ad82bbbf2d622a135eeffb0312459fa13a27b65283186d35c5c4
+  metadata.gz: 1ff93b66391aa8f3e3980bab03bb4c7be1723e28da1d38934d5073e61b1d8564f08f5522b2d6126e0d4f51fae1c3497c4b1f8ff12c019ecbfbef0ed6e85af0eb
+  data.tar.gz: cbb9ac72f46f0100df91c9ddb09b4d6a7308d3a018aaa3aac86dd6c09b5a3097741a101b02c624a569bbd71797d1c5f9a8b4d8db1b981049918038e3954e6305

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [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

data/README.md

@@ -108,8 +108,11 @@ 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`
 
 ###### Configurando os calendários default
 

data/data/calendars.json

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

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/version.rb

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

data/lib/work_day.rb

@@ -18,12 +18,14 @@ class WorkDay
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_day
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - README.md
 - bitbucket-pipelines.yml
 - data/brazil_holidays.json
+- data/calendars.json
 - data/london_holidays.json
 - data/new_york_holidays.json
 - lib/holiday.rb