business-period 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4c8bd4b3bc40d590d96ae851d29030ff020b58
-  data.tar.gz: a561843686e1136e2608fab2df7bd2d3442f2a8c
+  metadata.gz: b90def6c2e0624d299b2a28109bbf013fe61f05f
+  data.tar.gz: bdce177f079801e02ad7767fe51c6be716ede2e3
 SHA512:
-  metadata.gz: a8cc4b9366d2d95dcaa659138d2a1c033b2ac72ef5529f4ad469a321ecb830e5156eb980463a57816ff942c4959097d43db36964502ccb4c680a55a72f6c7168
-  data.tar.gz: ce829b8356cab36ab3e3e0f5698be6032e47444295747de5e00fdf4b87e577f3f975f56cbeffb74831ed859daeb8ed7100ea987e3db59a0e716455cc93b3571b
+  metadata.gz: '099bede4e8653320424c59b246a02483179f19700c642a832917d2bfa2f04d983ae298dababd54487f56b2afa95c27fe607e99bc43ad174f323bf83ee7cd9086'
+  data.tar.gz: 6c539ee970451a3ca75cf37f8d8835b0d6cdc6882aad61c0a171ecb0bc579b5d26787daa1add86a4da4959b89c9d496acb388947cfe4089e8c47bcf723303e6b

data/Gemfile.lock

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

data/lib/business_period/base.rb

@@ -6,43 +6,19 @@ module BusinessPeriod
       @config ||= Config
     end
 
-    # Returns range of days
-    def calculate_period(from_date, to_date)
-      @calculate_period ||= begin
-        imaginable_last_day = calculate_days_to_add_to(from_date, to_date)
-
-        # converts days to seconds
-        days_to_add = days_to_seconds(imaginable_last_day)
-
-        # Adds expected last day to current day
-        finish = Time.now + days_to_add
-
-        # Builds an array from current time to imaginable end time
-        Time.now.to_date..finish.to_date
-      end
+    def calculate_period(to_date)
+      magic_number = 10 - 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
     end
 
-    # Sets holiday instance by given file location
     def holidays
       @holidays ||= YAML.load_file(File.join(holiday_config)).fetch('months')
     end
 
-    # Dynamically calculates how many days we have add to `to_date` end
-    def calculate_days_to_add_to(from_date, to_date)
-      # Calculates subjective number
-      sum = (7 - config.work_days.size)
-
-      # sum cannot be zero.
-      # Relevant when when work_days array == [1, 2, 3, 4, 5, 6, 7]
-      sum = 1 if sum.zero?
-
-      # Some magic
-      (from_date + to_date) * sum + 7
-    end
-
     private
 
-    # Gets path to config file by given locale
     def holiday_config
       [File.dirname(__FILE__), "../../config/holidays/#{config.locale}.yml"]
     end

data/lib/business_period/days.rb

@@ -7,48 +7,49 @@ module BusinessPeriod
     end
 
     def perform(from_date, to_date)
-      return {} if from_date.nil? || to_date.nil?
-      return {} if from_date > to_date
+      return {} unless valid_params(from_date, to_date)
 
-      @period = calculate_period(from_date, to_date)
-      @days = business_days
+      period = calculate_period(to_date)
+      days = business_days(period)
 
-      check_holidays
+      check_holidays(days)
 
-      # Selects business days from given from_date and to_date values.
-      # E.g from_date = 2, to_date = 4
-      # selects second and fourth elements
       {
-        from_date: @days[from_date][:day],
-        to_date: @days[to_date][:day]
+        from_date: days[from_date][:day],
+        to_date: days[to_date][:day]
       }
     end
 
     private
 
-    # Maps business days to array by given calculated period
-    def business_days
-      @business_days ||= @period.map do |day|
-        # checks if day is business day
-        if config.work_days.include?(day.wday)
-          { day: day, month: day.to_time.month }
-        end
-      end.compact
+    def valid_params(from_date, to_date)
+      from_date.is_a?(Integer) && to_date.is_a?(Integer) &&
+        from_date < to_date
     end
 
-    # Removes business days which are on holidays
-    def check_holidays
-      @days.each_with_index do |day, index|
-        # Skips if no holiday in the current month
+    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
+          }
+      end
+    end
+
+    def check_holidays(business_days)
+      business_days.each_with_index do |day, index|
         next unless holidays[day[:month]]
 
-        extract_holidays(day, index)
+        extract_holidays(business_days, day, index)
       end
     end
 
-    def extract_holidays(day, index)
+    def extract_holidays(business_days, day, index)
       holidays[day[:month]].each do |holiday|
-        @days.delete_at(index) if holiday['mday'] == day[:day].mday
+        business_days.delete_at(index) if holiday['mday'] == day[:day].mday
       end
     end
   end

data/lib/business_period/version.rb

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

metadata

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