business-days 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc274075629002d70301e7e805291871778dd331
-  data.tar.gz: 84911ef3242a3d587ba7451ed4623bb26a376d1c
+  metadata.gz: 6841203b5c2dca045e7ccf02ecfebf59cde26b9f
+  data.tar.gz: 5da6e7a559f109e2bba79077b3fe78c0958131be
 SHA512:
-  metadata.gz: '0689b65d2b4476bf66ce12ad3986c72711f8b4d70341895a734d7bef6277009405282f802f113a53b3acaac1163d5e1c11eb6c32516763a93c982a741777a0a9'
-  data.tar.gz: 0a2ba51641c4219655e1d2b09394995b48b666b79cdd7b878762c415b1bfa9d8ef3c4a6cd378e951f485f99ba3dd3e6777d5d6a7ffe25e2ac7a9a66cdd78e126
+  metadata.gz: 946f2d3816308da6a8f8695e7d8ca4b4f52ef77eb6e32455fefa05534b93c65beefdcc659921f04cd68fc491a14b8c5b86e16a958f6c7909eceaf68fdeb6dcd2
+  data.tar.gz: a4a0688c717256ae7caef6dc60b71d740a03c66fc0c84c4a99a9ed3c10161f23352bf522bd18924e4bdbe31ab8c14ee2b9b5d71c05f011757284846368181e11

data/lib/business-days.rb

@@ -1,41 +1,75 @@
 require 'active_support/all'
 require 'holidays'
+require 'singleton'
 
-class BusinessDays
-  class << self
-    # Get holidays dates until next year
-    @@holidays = []
-    Holidays.between(Date.civil(Time.current.year,1,1), Date.civil(Time.current.year + 1, 12, 31), :br, :br).each do |holiday|
-      @@holidays.push(holiday[:date])
-    end
+class BusinessDaysSingleton
+  include Singleton
+
+  def initialize
+    @holidays = []
+
+    # Setup holidays in an interval of 3 years
+    from = Time.current.year
+    to = Time.current.year + 2
 
-    def business_days_from_utc_time(days, time)
-      # We count days based on Brasilia timezone
-      date = time.in_time_zone('Brasilia').to_date
-
-      # Add days until we reach the specified business days
-      count = 0
-      while count < days
-        date += 1.days
-        if business_day?(date)
-          count +=1
-        end
+    # 1. Get all holidays in given years interval from Holidays gem
+    Holidays.between(Date.civil(from, 1, 1), Date.civil(to, 12, 31), :br, :informal).each do |holiday|
+      # Include holiday
+      @holidays.push(holiday[:date])
+
+      # 2. If Carnaval, include the day before and after it (they are bank holidays)
+      if holiday[:name] == "Carnaval"
+        @holidays.push(holiday[:date] - 1.day)
+        @holidays.push(holiday[:date] + 1.day)
       end
+    end
 
-      date
+    # 3. Add the latest business day in each year (it's a bank holiday)
+    (from..to).each do |year|
+      @holidays.push(latest_non_bank_businness_day(year))
     end
+  end
 
-    def business_day?(date)
-      raise ArgumentError.new('Not a date') unless date.kind_of?(Date)
+  def business_days_from_utc_time(days, time)
+    # We count days based on Brasilia timezone
+    date = time.in_time_zone('Brasilia').to_date
 
-      weekend = [6, 7].include?(date.cwday)
-      !(weekend || @@holidays.include?(date))
+    # Add days until we reach the specified business days
+    count = 0
+    while count < days
+      date += 1.days
+      if business_day?(date)
+        count +=1
+      end
     end
 
-    def add_holiday(date)
-      raise ArgumentError.new('Not a date') unless date.kind_of?(Date)
+    date
+  end
+
+  def business_day?(date)
+    raise ArgumentError.new('Not a date') unless date.kind_of?(Date)
 
-      @@holidays.push(date)
+    weekend = [6, 7].include?(date.cwday)
+    !(weekend || @holidays.include?(date))
+  end
+
+  def add_holiday(date)
+    raise ArgumentError.new('Not a date') unless date.kind_of?(Date)
+
+    @holidays.push(date)
+  end
+
+  private
+
+  def latest_non_bank_businness_day(year)
+    d = Date.civil(year, 12, 31)
+    while !self.business_day?(d)
+      d = d - 1.day
     end
+
+    d
   end
 end
+
+# Avoid calling the instance method on every call
+BusinessDays = BusinessDaysSingleton.instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business-days
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Allan Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport