business_time 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9aa7a308caa41ed4307f45ef8b798759b10a0c
-  data.tar.gz: 1430aa8263c16efb585414432230db3861472f55
+  metadata.gz: 5fe356eb4f4e620e3f3db2aa9242df1c63213500
+  data.tar.gz: d1f662a4f576662e3f6d140970d5b2191016fda8
 SHA512:
-  metadata.gz: 366fbc15803d7fab5a13ea85c485a62ad71c037de68322e3b662f9530ea1e261aecab5df46761391dcef13a3c408063b42633049f0aa70dc18832b5b4dab644b
-  data.tar.gz: 2c60d5bef66eaa83b38a70a8603c0b62f1a6ea1bb6ad562acfdb3714c8db6074c3c3248790bf26c86dd56b6f3729fe469bfb64b1bcc945f22d58eee1e117d7e3
+  metadata.gz: 86434d31fbf26aa3372510db883266643431a449fa2980cee43e9d34198c140a560d0606d41911aa0a47e030b373eeba0442f38dad07c36a5b5113a811c97213
+  data.tar.gz: 5c1ae7866418a21538030ba2129698eaafb2016b5d715cd2c13e31e1739b8732ff625af6f87e48e98bbe697ea06005d74c35bfab7c8610b306f7ba7c9d0121b5

data/lib/business_time/business_days.rb

@@ -17,14 +17,14 @@ module BusinessTime
     end
 
     def after(time = Time.current)
-      positive_days? ? calculate_after(time, @days) : calculate_before(time, -@days)
+      non_negative_days? ? calculate_after(time, @days) : calculate_before(time, -@days)
     end
 
     alias_method :from_now, :after
     alias_method :since, :after
 
     def before(time = Time.current)
-      positive_days? ? calculate_before(time, @days) : calculate_after(time, -@days)
+      non_negative_days? ? calculate_before(time, @days) : calculate_after(time, -@days)
     end
 
     alias_method :ago, :before
@@ -32,8 +32,8 @@ module BusinessTime
 
     private
 
-    def positive_days?
-      @days > 0
+    def non_negative_days?
+      @days >= 0
     end
 
     def calculate_after(time, days)

data/lib/business_time/business_hours.rb

@@ -24,18 +24,18 @@ module BusinessTime
     end
 
     def after(time)
-      positive_hours? ? calculate_after(time, @hours) : calculate_before(time, -@hours)
+      non_negative_hours? ? calculate_after(time, @hours) : calculate_before(time, -@hours)
     end
     alias_method :since, :after
 
     def before(time)
-      positive_hours? ? calculate_before(time, @hours) : calculate_after(time, -@hours)
+      non_negative_hours? ? calculate_before(time, @hours) : calculate_after(time, -@hours)
     end
 
     private
 
-    def positive_hours?
-      @hours > 0
+    def non_negative_hours?
+      @hours >= 0
     end
 
     def calculate_after(time, hours)

data/lib/business_time/config.rb

@@ -47,15 +47,19 @@ module BusinessTime
       end
 
       def local_config
-        Thread.current[:business_time_local_config]
+        local_config_stack.last
       end
 
       def local_config=(config)
-        Thread.current[:business_time_local_config] = config
+        local_config_stack.last.replace(config)
+      end
+
+      def local_config_stack
+        Thread.current[:business_time_local_config] ||= []
       end
 
       def local_config?
-        !local_config.nil?
+        !local_config_stack.empty?
       end
 
       def threadsafe_cattr_accessor(name)
@@ -173,11 +177,11 @@ module BusinessTime
       end
 
       def with(config)
-        self.local_config = config().dup
+        local_config_stack.push(config().dup)
         config.each { |k,v| send("#{k}=", v) } # calculations are done on setting
         yield
       ensure
-        self.local_config = nil
+        local_config_stack.pop
       end
 
       def default_config
@@ -196,8 +200,8 @@ module BusinessTime
       end
 
       def reset
-        self.config       = default_config
-        self.local_config = nil
+        local_config_stack.clear
+        self.config = default_config
       end
 
       def deep_dup(object)

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Support for doing time math in business hours and days