business-period 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8d77f79fbae52d0e98e2eb490f869dc939b6a0
-  data.tar.gz: 77584003f1eb7564bb403e0140adb011af1fff79
+  metadata.gz: 9a4a2e8d7ba8e5c08ec71d3ed28455df5278c5c6
+  data.tar.gz: 0dad9bb70a00e1d27c3048d07e04f1b44ce3bcb7
 SHA512:
-  metadata.gz: f42cb7a31c9c18bb6797609d8c8b3d49c3cbe484e8bf2758ec580812d09f2ce3353ad14e057ab530437fdef9915883f3b5c89f01f8f1448496313f4fc4708c4a
-  data.tar.gz: b78380a4f745c7ecf8353d59db0beca3bbf8c3660f569cb2f44a1588a86b6309534bf1edfe9d1171c31490bcb6d5ee79646c7c648581040ed5d8b19002d694f3
+  metadata.gz: 651756d9806ea5016008c463741024e0918022f10067918400410825b25209540c57fdad31efd9c1ec41e286ea3bd0491a6ca7b93f0ae5272f7c94a0488046b5
+  data.tar.gz: 5e15457ff1f28e3d59bcecf3052cc444b03cceb4a789e29060ee264cd43294e8c70f5c29c9fe2226d94e8cb9a8b9fd54d47cc5c76af91f18e935fb86d357e029

data/Gemfile.lock

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

data/lib/business_period/base.rb

@@ -2,6 +2,8 @@
 
 module BusinessPeriod
   class Base
+    SEPARATOR = '_'
+
     def config
       @config ||= Config
     end
@@ -15,11 +17,29 @@ module BusinessPeriod
     end
 
     def holidays
-      @holidays ||= YAML.load_file(File.join(holiday_config)).fetch('months')
+      @holidays ||= begin
+        holidays_config.each_with_object([]) do |row, container|
+          container << row.last.map do |days|
+            holiday_month_with_day(row.first, days['mday'])
+          end
+        end
+      end
+    end
+
+    def holiday_month_with_day(month, day)
+      [month, day].join(SEPARATOR)
+    end
+
+    def day_is_holiday?(day)
+      holidays.flatten.include? holiday_month_with_day(day.month, day.day)
     end
 
     private
 
+    def holidays_config
+      @holidays_config ||= YAML.load_file(File.join(holiday_config)).fetch('months')
+    end
+
     def holiday_config
       [File.dirname(__FILE__), "../../config/holidays/#{config.locale}.yml"]
     end

data/lib/business_period/days.rb

@@ -7,69 +7,41 @@ module BusinessPeriod
     end
 
     def perform(from_date, to_date, options)
-      @from_date = from_date
-      @to_date = to_date
-      @options = options
+      return [] unless valid_params(from_date, to_date, options)
 
-      return [] unless valid_params
-
-      period = calculate_period(@to_date, @options)
-      days = business_days(period)
-      result = extract_holidays(days).compact
+      period = calculate_period(to_date, options)
+      result = business_days(period)
 
       {
-        from_date: result[@from_date][:day],
-        to_date: result[@to_date][:day]
+        from_date: result[from_date],
+        to_date: result[to_date]
       }
     end
 
     private
 
-    def valid_params
-      valid_options &&
-        @from_date.is_a?(Integer) && @to_date.is_a?(Integer) &&
-        @from_date >= 0 && @to_date >= 0 &&
-        (@from_date <= @to_date)
-    end
-
-    def valid_options
-      @options ? primary_day_present? : true
+    def valid_params(from_date, to_date, options)
+      valid_options(options) &&
+        from_date.is_a?(Integer) && to_date.is_a?(Integer) &&
+        from_date >= 0 && to_date >= 0 &&
+        (from_date <= to_date)
     end
 
-    def primary_day_present?
-      return unless @options.is_a?(Hash)
-
-      @options[:primary_day] ? (@options[:primary_day].methods.include? :strftime) : true
+    def valid_options(options)
+      options ? primary_day_present?(options) : true
     end
 
-    def extract_holidays(days)
-      days.map.with_index do |day, idx|
-        next unless holidays[day[:day].month]
+    def primary_day_present?(options)
+      return unless options.is_a?(Hash)
 
-        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)
+      options[:primary_day] ? (options[:primary_day].methods.include? :strftime) : true
     end
 
     def business_days(period)
       period.each_with_object([]) do |day, container|
-        next unless config.work_days.include?(day.wday)
-
-        container <<
-          {
-            day: day,
-            month: day.to_time.month
-          }
+        if config.work_days.include?(day.wday)
+          container << day unless day_is_holiday?(day)
+        end
       end
     end
   end

data/lib/business_period/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business-period
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - matas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec