business-period 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b20b17a7d1f22b7fb7d67ad3c7ddd5097dfb057
-  data.tar.gz: f6d2e2bcfc457df2b7baa7186c4e73aa3384c2d4
+  metadata.gz: 0cc52e3e82cb1ac554f12bed26fd66fe4d8e7b9d
+  data.tar.gz: e9fe9d837ccf0d0fa83cb793ab401e35f42d5d86
 SHA512:
-  metadata.gz: '02597830fa7f05d03c55b4549ea54f696e182f35c7239cba6322ba442e405f803870529c08a76421ce9e601156c37eb6443899d8aa0c2470d38746a5c82ded0e'
-  data.tar.gz: e1283ffe9ef0f311e535f54b6d9794a5e8aa9125263b9d6eb2ab5c09f60283090a094f5b7838f857bd7f2de487214f7a4d95b2edadae8229a0d72a204e726923
+  metadata.gz: 21682102dc8ea3fb1b42b6e283b6c124eb63939d5d673c27000a55369fe5e6774fdb8a0002b629345f26b610bd23168fdc7a466c9b6c36c23a414f455952396a
+  data.tar.gz: b0a9d0ab3b195e01e313293aa62c4defe9d79bcd111d4a8680be59f96f2509e8e247ea25801b1c234a52a06c1f26d992f0cb12de095bf38dc574a9b3fff1e9b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    business-period (0.1.0)
+    business-period (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/config/holidays/et.yml

@@ -0,0 +1,30 @@
+months:
+  1:
+  - mday: 1
+    name: New Year's Day
+  2:
+  - mday: 24
+    name: Independence Day
+  4:
+  - mday: 19
+    name: Good Friday
+  - mday: 21
+    name: Easter Sunday
+  5:
+  - mday: 1
+    name: Spring Day
+  6:
+  - mday: 23
+    name: Victory Day
+  - mday: 24
+    name: St. John's Day
+  8:
+  - mday: 20
+    name: Independence Restoration Day
+  12:
+  - mday: 24
+    name: Christmas Eve
+  - mday: 25
+    name: Christmas Day
+  - mday: 26
+    name: Boxing Day

data/config/holidays/lv.yml

@@ -0,0 +1,31 @@
+months:
+  1:
+  - mday: 1
+    name: New Year's Day
+  4:
+  - mday: 19
+    name: Good Friday
+  - mday: 22
+    name: Easter Monday
+  5:
+  - mday: 1
+    name: Labour Day
+  - mday: 6
+    name: Declaration of Independence Day
+  6:
+  - mday: 23
+    name: Midsummer Eve
+  - mday: 24
+    name: St. John's Day
+  11:
+  - mday: 18
+    name: Latvian National Day
+  12:
+  - mday: 24
+    name: Christmas Eve
+  - mday: 25
+    name: Christmas Day
+  - mday: 26
+    name: Second day of Christmas
+  - mday: 31
+    name: New Year's Eve

data/lib/business_period/base.rb

@@ -7,7 +7,7 @@ module BusinessPeriod
     end
 
     def calculate_period(to_date)
-      magic_number = 10 - config.work_days.size
+      magic_number = 15 - config.work_days.size
       days_to_add = days_to_seconds(to_date * magic_number)
       finish = Time.now + days_to_add
       Time.now.to_date..finish.to_date

data/lib/business_period/days.rb

@@ -7,24 +7,45 @@ module BusinessPeriod
     end
 
     def perform(from_date, to_date)
-      return {} unless valid_params(from_date, to_date)
+      @from_date = from_date
+      @to_date = to_date
 
-      period = calculate_period(to_date)
-      days = business_days(period)
+      return {} unless valid_params
 
-      check_holidays(days)
+      period = calculate_period(@to_date)
+      days = business_days(period)
+      result = extract_holidays(days).compact
 
       {
-        from_date: days[from_date][:day],
-        to_date: days[to_date][:day]
+        from_date: result[@from_date][:day],
+        to_date: result[@to_date][:day]
       }
     end
 
     private
 
-    def valid_params(from_date, to_date)
-      from_date.is_a?(Integer) && to_date.is_a?(Integer) &&
-        from_date >= 0 && to_date >= 0
+    def valid_params
+      @from_date.is_a?(Integer) && @to_date.is_a?(Integer) &&
+        @from_date >= 0 && @to_date >= 0
+    end
+
+    def extract_holidays(days)
+      days.map.with_index do |day, idx|
+        next unless holidays[day[:day].month]
+
+        day unless first_day_is_holiday?(idx, day)
+      end
+    end
+
+    def first_day_is_holiday?(idx, day)
+      include_day = holidays[day[:day].month].map { |d| d['mday'] }
+
+      if idx.zero? && (include_day.include? day[:day].day)
+        @from_date -= 1
+        @to_date -= 1
+      end
+
+      (include_day.include? day[:day].day)
     end
 
     def business_days(period)
@@ -38,19 +59,5 @@ module BusinessPeriod
           }
       end
     end
-
-    def check_holidays(business_days)
-      business_days.each_with_index do |day, index|
-        next unless holidays[day[:month]]
-
-        extract_holidays(business_days, day, index)
-      end
-    end
-
-    def extract_holidays(business_days, day, index)
-      holidays[day[:month]].each do |holiday|
-        business_days.delete_at(index) if holiday['mday'] == day[:day].mday
-      end
-    end
   end
 end

data/lib/business_period/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BusinessPeriod
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business-period
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - matas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,7 +42,9 @@ files:
 - README.md
 - Rakefile
 - business-period.gemspec
+- config/holidays/et.yml
 - config/holidays/lt.yml
+- config/holidays/lv.yml
 - lib/business-period.rb
 - lib/business_period/base.rb
 - lib/business_period/config.rb