working_hours 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2195f888fd66910d51526ea5b6a25af72ec6d1a2
-  data.tar.gz: 7177da2b9c2c3601a33246337890a43ce97587fa
+  metadata.gz: 44ded3c576ee838fd8e2a6160499e60f2c7e585e
+  data.tar.gz: 2f1bab0453dd93d3b3cd70d72a829ea8eac82ac4
 SHA512:
-  metadata.gz: 2cb8260c4fec9542faf69153ff77ad91c960dbba662a3ce86d97ca359db66c22b001254f2f17a22ef526f93d990c71f57fe4ef820d8ac2cc3954f20162307197
-  data.tar.gz: bbd6f896e77168371168e96a3f6c298f37011a67e1e348de274fe343c6a480a45a29f81d2170737e7eef05990e4a6b70889e907855b3e4f8a223e1bdb1a092ce
+  metadata.gz: c0b37d42c5460735f2b80e2e92e34d74b1fb0355ad87e0c2ff34d1149418d20e92572a3ec867f4513b2cb486bc0918d40fbf242ab2e398b6f8ef7ed5bcfcc6a3
+  data.tar.gz: 512fdd659f82340e7b1d5b88a564032e27a61f739cd2c5b70947947a78b0cab09201e5492c29455ef2bb7501a0fe04c9595003edc67955aeb3cccff18e9c0107

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Unreleased
 
-[Compare master with v1.0.2](https://github.com/intrepidd/working_hours/compare/v1.0.2...master)
+[Compare master with v1.0.3](https://github.com/intrepidd/working_hours/compare/v1.0.3...master)
+
+# v1.0.3
+
+* Relax configuration input formats - [#10](https://github.com/Intrepidd/working_hours/pull/10)
+* Small improvements to the Readme
+
+_08/11/2014_
 
 # v1.0.2
 

data/README.md

@@ -5,7 +5,7 @@
 A modern ruby gem allowing to do time calculation with working hours.
 
 Compatible and tested with:
-- Ruby `2.0`, `2.1`
+- Ruby `2.0`, `2.1`, JRuby `1.7`
 - ActiveSupport `3.2.x`, `4.0.x` and `4.1.x`
 
 ## Installation
@@ -36,6 +36,8 @@ Date.new(2014, 12, 31) + 8.working.days # => Mon, 12 Jan 2015
 Time.utc(2014, 8, 4, 8, 32) - 4.working.hours # => 2014-08-01 13:00:00
 
 # Compute working days between two dates
+friday = Date.new(2014, 10, 17)
+monday = Date.new(2014, 10, 20)
 friday.working_days_until(monday) # => 1
 # Time is considered at end of day, so:
 # - friday to saturday = 0 working days
@@ -51,6 +53,12 @@ Date.new(2014, 12, 28).working_day? # => false
 
 # Know if a time is worked
 Time.utc(2014, 8, 4, 7, 16).in_working_hours? # => false
+
+# Advance to next working time
+WorkingHours.advance_to_working_time(Time.utc(2014, 8, 4, 7, 16)) # => Mon, 04 Aug 2014 09:00:00 UTC +00:00
+
+# Return to previous working time
+WorkingHours.return_to_working_time(Time.utc(2014, 8, 4, 7, 16)) # => Fri, 01 Aug 2014 17:00:00 UTC +00:00
 ```
 
 ## Configuration
@@ -96,6 +104,8 @@ WorkingHours::Duration.new(8, :days).since(Date.new(2014, 12, 31)) # => Mon, 12
 WorkingHours::Duration.new(4, :hours).until(Time.utc(2014, 8, 4, 8, 32)) # => 2014-08-01 13:00:00
 
 # Compute working days between two dates
+friday = Date.new(2014, 10, 17)
+monday = Date.new(2014, 10, 20)
 WorkingHours.working_days_between(friday, monday) # => 1
 # Time is considered at end of day, so:
 # - friday to saturday = 0 working days
@@ -123,12 +133,12 @@ require 'working_hours/module'
 class Order
   include WorkingHours
 
-  def shipping_date_estimate
-    Duration.new(2, :days).since(paiement_received_at)
+  def shipping_date_estibmate
+    Duration.new(2, :days).since(payment_received_at)
   end
 
-  def paiement_delay
-    working_days_between(created_at, paiement_received_at)
+  def payment_delay
+    working_days_between(created_at, payment_received_at)
   end
 end
 ```

data/lib/working_hours/config.rb

@@ -106,7 +106,7 @@ module WorkingHours
             raise InvalidConfiguration.new "No working hours given for day `#{day}`"
           end
           last_time = nil
-          hours.each do |start, finish|
+          hours.sort.each do |start, finish|
             if not start =~ TIME_FORMAT
               raise InvalidConfiguration.new "Invalid time: #{start} - must be 'HH:MM'"
             elsif not finish =~ TIME_FORMAT
@@ -122,10 +122,10 @@ module WorkingHours
       end
 
       def validate_holidays! holidays
-        if not holidays.is_a? Array
-          raise InvalidConfiguration.new "Invalid type for holidays: #{holidays.class} - must be Array"
+        if not holidays.respond_to?(:to_a)
+          raise InvalidConfiguration.new "Invalid type for holidays: #{holidays.class} - must act like an array"
         end
-        holidays.each do |day|
+        holidays.to_a.each do |day|
           if not day.is_a? Date
             raise InvalidConfiguration.new "Invalid holiday: #{day} - must be Date"
           end

data/lib/working_hours/duration.rb

@@ -3,7 +3,6 @@ require 'working_hours/computation'
 
 module WorkingHours
   class Duration
-    include Computation
 
     attr_accessor :value, :kind
 
@@ -17,12 +16,12 @@ module WorkingHours
 
     # Computation methods
     def until(time = ::Time.current)
-      send("add_#{@kind}", time, -@value)
+      ::WorkingHours.send("add_#{@kind}", time, -@value)
     end
     alias :ago :until
 
     def since(time = ::Time.current)
-      send("add_#{@kind}", time, @value)
+      ::WorkingHours.send("add_#{@kind}", time, @value)
     end
     alias :from_now :since
 

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/working_hours/config_spec.rb

@@ -101,6 +101,12 @@ describe WorkingHours::Config do
           WorkingHours::Config.working_hours = {:mon => {'08:00' => '13:00', '12:00' => '18:00'}}
         }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid range: 12:00 => 18:00 - overlaps previous range")
       end
+
+      it 'does not reject out-of-order, non-overlapping ranges' do
+        expect {
+          WorkingHours::Config.working_hours = {:mon => {'10:00' => '11:00', '08:00' => '09:00'}}
+        }.not_to raise_error
+      end
     end
   end
 
@@ -123,10 +129,10 @@ describe WorkingHours::Config do
     end
 
     describe 'validation' do
-      it 'rejects other type than array' do
+      it 'rejects types that cannot be converted into an array' do
         expect {
-          WorkingHours::Config.holidays = {}
-        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid type for holidays: Hash - must be Array")
+          WorkingHours::Config.holidays = Object.new
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid type for holidays: Object - must act like an array")
       end
 
       it 'rejects invalid day' do

data/spec/working_hours/core_ext/date_and_time_spec.rb

@@ -6,31 +6,31 @@ describe WorkingHours::CoreExt::DateAndTime do
   describe 'operator +' do
     it 'works with Time objects' do
       time = Time.now
-      expect(duration).to receive(:add_days).with(time, 5)
+      expect(WorkingHours).to receive(:add_days).with(time, 5)
       time + duration
     end
 
     it 'works with Date objects' do
       date = Date.today
-      expect(duration).to receive(:add_days).with(date, 5)
+      expect(WorkingHours).to receive(:add_days).with(date, 5)
       date + duration
     end
 
     it 'works with DateTime objects' do
       date_time = DateTime.now
-      expect(duration).to receive(:add_days).with(date_time, 5)
+      expect(WorkingHours).to receive(:add_days).with(date_time, 5)
       date_time + duration
     end
 
     it 'works with ActiveSupport::TimeWithZone' do
       time = Time.now.in_time_zone('Tokyo')
-      expect(duration).to receive(:add_days).with(time, 5)
+      expect(WorkingHours).to receive(:add_days).with(time, 5)
       time + duration
     end
 
     it "doesn't break original operator" do
       time = Time.now
-      expect(duration).not_to receive(:add_days)
+      expect(WorkingHours).not_to receive(:add_days)
       expect(time + 3600).to eq(time + 1.hour)
     end
   end
@@ -38,31 +38,31 @@ describe WorkingHours::CoreExt::DateAndTime do
   describe 'operator -' do
     it 'works with Time objects' do
       time = Time.now
-      expect(duration).to receive(:add_days).with(time, -5)
+      expect(WorkingHours).to receive(:add_days).with(time, -5)
       time - duration
     end
 
     it 'works with Date objects' do
       date = Date.today
-      expect(duration).to receive(:add_days).with(date, -5)
+      expect(WorkingHours).to receive(:add_days).with(date, -5)
       date - duration
     end
 
     it 'works with DateTime objects' do
       date_time = DateTime.now
-      expect(duration).to receive(:add_days).with(date_time, -5)
+      expect(WorkingHours).to receive(:add_days).with(date_time, -5)
       date_time - duration
     end
 
     it 'works with ActiveSupport::TimeWithZone' do
       time = Time.now.in_time_zone('Tokyo')
-      expect(duration).to receive(:add_days).with(time, -5)
+      expect(WorkingHours).to receive(:add_days).with(time, -5)
       time - duration
     end
 
     it "doesn't break original operator" do
       time = Time.now
-      expect(duration).not_to receive(:add_days)
+      expect(WorkingHours).not_to receive(:add_days)
       expect(time - 3600).to eq(time - 1.hour)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport