biz 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5d31807277182067ade3e60412dbf0be0e56ac
-  data.tar.gz: ab55eb5a7aedc372212f52b8a73922ce0b953b9d
+  metadata.gz: 27809869df3ee991371e2258e892863d22b5ad2e
+  data.tar.gz: 184a044cb47ccdb0437c5227da62bcbde65534aa
 SHA512:
-  metadata.gz: 3a3875e89f7ac619d8543b90c60aa4373ff1d8ee9144dc4fbb5edc2ce99c3018f80cd8aa5976cad5e3edc882aa37a4b3ebee9a216226ebf829cf50331590c6fe
-  data.tar.gz: bae74d39ff90cc519412a36f340b98d86330517d455464cb8b28755ebc2ff4a9222e9e3fc32269291d2b243469774925dd3666a2c0f1e115ff188ca6216597af
+  metadata.gz: 5f9fef46fd079453c482963e9e89b8ef9368451275f4626567b923119bf97c68af7cda4d44f73dcae27cf7f458aeabb980a9d6130dcd5c093beade3c32b48df4
+  data.tar.gz: f2f7dace5f2eb6b7baff6f6dc275afc7edb606e349ac7cddd7b32273ca3498434e137a1cb6b01ff3bc6d11a2b906baed602a81ac6eb003d1b2b3168b2da86c52

data/lib/biz.rb

@@ -31,7 +31,8 @@ module Biz
     private
 
     def schedule
-      Thread.current[:biz_schedule] or fail 'Biz has not been configured.'
+      Thread.current[:biz_schedule] or
+        fail Error::Configuration, "#{name} not configured"
     end
 
   end

data/lib/biz/calculation/for_duration.rb

@@ -11,11 +11,9 @@ module Biz
       end
 
       def self.with_unit(schedule, scalar, unit)
-        unless UNITS.include?(unit)
-          fail ArgumentError, 'The unit is not supported.'
-        end
+        fail ArgumentError, 'unsupported unit' unless UNITS.include?(unit)
 
-        send(unit, schedule, scalar)
+        public_send(unit, schedule, scalar)
       end
 
       def self.unit
@@ -24,7 +22,9 @@ module Biz
 
       def initialize(schedule, scalar)
         @schedule = schedule
-        @scalar   = scalar
+        @scalar   = Integer(scalar)
+
+        fail ArgumentError, 'negative scalar' if @scalar < 0
       end
 
       protected
@@ -38,28 +38,40 @@ module Biz
         self.class.unit
       end
 
+      def moment_before(time)
+        schedule.periods.before(time).first.end_time
+      end
+
+      def moment_after(time)
+        schedule.periods.after(time).first.start_time
+      end
+
       [
         *%i[second seconds minute minutes hour hours].map { |unit|
           const_set(
             unit.to_s.capitalize,
             Class.new(self) do
               def before(time)
-                timeline(:before, time).last.start_time
+                return moment_before(time) if scalar.zero?
+
+                advanced_periods(:before, time).last.start_time
               end
 
               def after(time)
-                timeline(:after, time).last.end_time
+                return moment_after(time) if scalar.zero?
+
+                advanced_periods(:after, time).last.end_time
               end
 
               private
 
-              def timeline(direction, time)
-                schedule.periods.send(direction, time).timeline
-                  .for(duration).to_a
-              end
-
-              def duration
-                Duration.send(unit, scalar)
+              def advanced_periods(direction, time)
+                schedule
+                  .periods
+                  .public_send(direction, time)
+                  .timeline
+                  .for(Duration.public_send(unit, scalar))
+                  .to_a
               end
             end
           )
@@ -69,33 +81,32 @@ module Biz
             unit.to_s.capitalize,
             Class.new(self) do
               def before(time)
+                return moment_before(time) if scalar.zero?
+
                 periods(:before, time).first.end_time
               end
 
               def after(time)
+                return moment_after(time) if scalar.zero?
+
                 periods(:after, time).first.start_time
               end
 
               private
 
               def periods(direction, time)
-                schedule.periods.send(direction, advanced_date(direction, time))
+                schedule.periods.public_send(
+                  direction,
+                  advanced_time(direction, schedule.in_zone.local(time))
+                )
               end
 
-              def advanced_date(direction, time)
+              def advanced_time(direction, time)
                 schedule.in_zone.on_date(
-                  schedule.dates.days(scalar).send(direction, local(time)),
-                  day_time(time)
+                  schedule.dates.days(scalar).public_send(direction, time),
+                  DayTime.from_time(time)
                 )
               end
-
-              def day_time(time)
-                DayTime.from_time(local(time))
-              end
-
-              def local(time)
-                schedule.in_zone.local(time)
-              end
             end
           )
         }

data/lib/biz/day_time.rb

@@ -52,7 +52,7 @@ module Biz
       @day_second = Integer(day_second)
 
       unless VALID_SECONDS.cover?(@day_second)
-        fail ArgumentError, 'Invalid number of seconds for a day.'
+        fail ArgumentError, 'second not within a day'
       end
     end
 

data/lib/biz/schedule.rb

@@ -48,17 +48,8 @@ module Biz
 
     def &(other)
       self.class.new do |config|
-        config.hours = Interval.to_hours(
-          intervals.flat_map { |interval|
-            other
-              .intervals
-              .map { |other_interval| interval & other_interval }
-              .reject(&:empty?)
-          }
-        )
-
-        config.holidays = [*holidays, *other.holidays].map(&:to_date)
-
+        config.hours     = Interval.to_hours(intersected_intervals(other))
+        config.holidays  = [*holidays, *other.holidays].map(&:to_date)
         config.time_zone = time_zone.name
       end
     end
@@ -67,5 +58,16 @@ module Biz
 
     attr_reader :configuration
 
+    private
+
+    def intersected_intervals(other)
+      intervals.flat_map { |interval|
+        other
+          .intervals
+          .map { |other_interval| interval & other_interval }
+          .reject(&:empty?)
+      }
+    end
+
   end
 end

data/lib/biz/validation.rb

@@ -38,10 +38,10 @@ module Biz
     end
 
     RULES = [
-      Rule.new('Hours must be hash-like.') { |raw|
+      Rule.new('hours not hash-like') { |raw|
         raw.hours.respond_to?(:to_h)
       },
-      Rule.new('Hours must be provided.') { |raw|
+      Rule.new('hours not provided') { |raw|
         raw.hours.to_h.any?
       }
     ].freeze

data/lib/biz/version.rb

@@ -1,3 +1,3 @@
 module Biz
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clavius