business-period 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c8b9e6bd6acbc4269243b4f104fdfece8611679
-  data.tar.gz: 0ac9ddf3aa480b1113e37e7c0ebe6085758e4603
+  metadata.gz: 6098b1a6ef4926e03bce624585c037eaf04cbc67
+  data.tar.gz: 4e3844c7a1cfae8573cb5afe08fd6aa24f3fbc39
 SHA512:
-  metadata.gz: d14c9cdd5e7506d0abe73b7da1ba331089b04bd64fb5efb7b5623c2bcdb6f7113e9aecefabbfc3fd4b5090edace43b8176ced863e183d71612dba119ef14f80d
-  data.tar.gz: 2ffbacf3893af7cdf118bed8d487e1d5e49c0243b15e2e3e0556e36226cfeb070587561a53f5652bfa020de2d400411f024086e1797aa8bf58268780b35f7801
+  metadata.gz: 10251873c3359a732d0bf338a61ce91ab254ab0bd3c71985b849f1b9e97ce57b6adee8257cf850951065a7f24ea8957ca2a493d2215599d97b2d60fb68b5639c
+  data.tar.gz: 61c2faa61df87564ea89311937158cb7515f70f73a31d05d2138314946369996bc3727fd8d5cc0b4465bd6e3073763dc500631bc9de3cc52ab49988a0d50500b

data/Gemfile.lock

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

data/lib/business_period/base.rb

@@ -6,11 +6,12 @@ module BusinessPeriod
       @config ||= Config
     end
 
-    def calculate_period(to_date)
+    def calculate_period(to_date, options = nil)
       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
+      start_date = options[:primary_day] || Time.now
+      finish = start_date + days_to_add
+      start_date.to_date..finish.to_date
     end
 
     def holidays

data/lib/business_period/days.rb

@@ -2,17 +2,18 @@
 
 module BusinessPeriod
   class Days < Base
-    def self.call(from_date:, to_date:)
-      new.perform(from_date, to_date)
+    def self.call(from_date:, to_date:, options: {})
+      new.perform(from_date, to_date, options)
     end
 
-    def perform(from_date, to_date)
+    def perform(from_date, to_date, options)
       @from_date = from_date
       @to_date = to_date
+      @options = options
 
       return [] unless valid_params
 
-      period = calculate_period(@to_date)
+      period = calculate_period(@to_date, @options)
       days = business_days(period)
       result = extract_holidays(days).compact
 
@@ -25,11 +26,22 @@ module BusinessPeriod
     private
 
     def valid_params
-      @from_date.is_a?(Integer) && @to_date.is_a?(Integer) &&
+      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
+    end
+
+    def primary_day_present?
+      return unless @options.is_a?(Hash)
+
+      @options[:primary_day] ? (@options[:primary_day].methods.include? :strftime) : true
+    end
+
     def extract_holidays(days)
       days.map.with_index do |day, idx|
         next unless holidays[day[:day].month]

data/lib/business_period/version.rb

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

metadata

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