business-days 1.0.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97396fdf08a72c4fa9a96cf86f22db60c6227e33
-  data.tar.gz: a248e695049fa8ada91e377761fedab47f99ffb5
+SHA256:
+  metadata.gz: 1d65a0be7582b342cb6bd352d97d5bdfa2c381b28a8d965bc2c8a7310e327a5d
+  data.tar.gz: 6c4895bf46e75de6658bfe874b5642702961ef957d24672985ad75c2059ca149
 SHA512:
-  metadata.gz: 7b5abfefe93901caa1f17a3a285a7245b9307581965df21d70d5388a91d835b1ef96abfaa18c7d8db57fd7577681e7cb6f80e6e498cfaa87ea83cc63add5d1da
-  data.tar.gz: e7d89dc1b78dd073d499f3186721b13b75463c94ec2793babba9f0b5b532078698e81f85ef5bb951c32d475b26644fc02db9764ef5948b8039a88f24bc0ea87c
+  metadata.gz: f59925ea7d0bcfe194e385a2648acbf69f77719d90ec5cac59c9bb9934eabe47044fa7c004189a382837c2afa4f7a2195e41566ba6a798f853aefc5d1b2b3735
+  data.tar.gz: f7e2f7f5b34f709c1a742853feae4cac45d82083fc359d62b3b1de972640c3dcfff77cff4375865b6bd0127f9bf14fba0e71500e72ffb9458bf6ac8d895585b1

data/lib/business-days.rb

@@ -25,7 +25,7 @@ class BusinessDaysSingleton
 
     # 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))
+      @holidays.push(latest_non_bank_business_day(year))
     end
   end
 
@@ -33,16 +33,10 @@ class BusinessDaysSingleton
   #
   # @param days [Integer] how many business days to add to given time.
   # @param time [Time] the start time in UTC from which the business days will be added.
-  # @param reference [Time] the reference time in UTC from which we will compute daylight saving.
   # @return [Time] the computed business day in UTC time (at midnight in Brasilia time)
-  def business_days_from_utc_time(days, time, reference=nil)
-    # Set reference to given time if no reference is passed
-    if reference.nil?
-      reference = time
-    end
-
+  def business_days_from_utc_time(days, time)
     # Get offset from reference data (based on Brasilia timezone)
-    offset = reference.in_time_zone('Brasilia').formatted_offset()
+    offset = time.in_time_zone('Brasilia').formatted_offset()
 
     # Get date from time in reference offset
     date = (time + offset.to_i.hours).to_date
@@ -50,7 +44,10 @@ class BusinessDaysSingleton
     # Add days until we reach the specified business days
     count = 0
     while count < days
-      date += 1.days
+      time += 24*60*60
+
+      offset = time.in_time_zone('Brasilia').formatted_offset()
+      date = (time + offset.to_i.hours).to_date
       if business_day?(date)
         count +=1
       end
@@ -79,6 +76,24 @@ class BusinessDaysSingleton
     @holidays.push(date)
   end
 
+  # Remove given date from holidays list for all commands after this.
+  #
+  # @param date [Date] the non-holiday date to be add.
+  def remove_holiday(date)
+    raise ArgumentError.new('Not a date') unless date.kind_of?(Date)
+
+    @holidays.delete(date)
+  end
+
+  # Remove latest holiday for each year
+  def remove_latest_non_bank_business_days
+    years = Set.new(@holidays.map { |d| d.year })
+    years.each do |year|
+      max_date = @holidays.select { |d| d.year == year }.max
+      self.remove_holiday(max_date)
+    end
+  end
+
   # Returns the first business day after the given date.
   #
   # @param date [Date] the reference date.
@@ -108,9 +123,10 @@ class BusinessDaysSingleton
 
     date
   end
+
   private
 
-  def latest_non_bank_businness_day(year)
+  def latest_non_bank_business_day(year)
     d = Date.civil(year, 12, 31)
     while !self.business_day?(d)
       d = d - 1.day

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business-days
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Allan Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: holidays
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: '7.1'
 description: Methods to check if a given date is a business days and to perform computations
   based on Business days.
 email: allan@cloudwalk.io
@@ -96,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Business Days