workpattern 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf0371cc0f47c34f3ab9e7e740975077e3edbf6
-  data.tar.gz: bbd957d3fb41cedd503146cc8bb870e34c023994
+  metadata.gz: 369fff3d813c83a9202c4593c93222f0683a3bc5
+  data.tar.gz: e8c724250a725fecffbea9232e14e70422339e39
 SHA512:
-  metadata.gz: fc1f35fbb2e5a1cf1f0cdb357da3348343041f47b034d139f470590949116fb78e889c80798241f627f05a90259f6c99ea3c390969e6806d68756888faa992b8
-  data.tar.gz: 5f7cea5e6f7869a0da1a6cd9cdb92d9836867567514709b0a1792b6438976705d0c500c5584c9f21714475b1ef6082a9aed8ae95a8c3da4ae07b9f60188b499c
+  metadata.gz: ecf42d51cce8b9f68f29c0ba7009f88450fb510f028b7e246f5fa144c72cb1369e79e7502f021e2a09a49de2bfd637d8cf42aa4a10902427de808186f3079c8b
+  data.tar.gz: bad7c4fdfe5e04b9804742197ebdc91147130ce687b3b3558056c6736ddf70631ffdcb1d1a7e70fe7c36e670002f5883985f5290d87fef5392680fc423efe183

data/CHANGELOG

@@ -1,12 +1,13 @@
-## Workpattern v0.3.4 (Sep 23, 2013)  ##
+## Workpattern v0.3.4 (Sep 27, 2013)  ##
+
+* diff doesn't calculate properly from working to resting day (#15) * Barrie Callender *
+
+	
+## Workpattern v0.3.3 (Sep 23, 2013)  ##
 
 * Failed to subtract 1 minute from end of resting hour (#12) * Barrie Callender *
 * Failed to add minutes starting from a resting period in a patterned hour (#13) * Barrie Callender *
 * Failed to subtract the exact amount of minutes from a patterned hour (#14) * Barrie Callender *
-
-
-## Workpattern v0.3.3 (Aug 21, 2013)  ##
-
 * The two tests no longer fail with Ruby 2.0 (#11) * Barrie Callender *
 
 

data/lib/workpattern/version.rb

@@ -1,5 +1,5 @@
 module Workpattern
   # Version Number for Workpattern gem
   # @since 0.0.1
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end  

data/lib/workpattern/week.rb

@@ -337,6 +337,7 @@ module Workpattern
     #
     def diff_detail(start,finish,finish_on)
       duration, start=@values[start.wday].diff(start,finish)
+      return duration,start if start > finish_on
       #rest of week to finish day
       while (start.wday<finish.wday) do
         duration+=@values[start.wday].total

data/test/test_week.rb

@@ -5,6 +5,26 @@ class TestWeek < MiniTest::Unit::TestCase #:nodoc:
   def setup
     
   end
+
+  def test_must_diff_from_last_day_of_patterned_week
+    #issue 15
+    start=DateTime.new(2013,9,23,0,0)
+    finish=DateTime.new(2013,9,26,23,59)
+    working_week=week(start,finish,1)
+    working_week.workpattern :all, Workpattern.clock(0,0),Workpattern.clock(8,59),0
+    working_week.workpattern :all, Workpattern.clock(12,0),Workpattern.clock(12,59),0
+    working_week.workpattern :all, Workpattern.clock(18,0),Workpattern.clock(23,59),0
+
+    duration, start =working_week.diff(DateTime.civil(2013,9,26,17,0),DateTime.civil(2013,9,27,10,0))
+
+    assert_equal 60, duration
+    assert_equal DateTime.civil(2013,9,27,0,0), start
+  end
+
+
+######################################################
+######################################################
+######################################################
   
   def test_must_create_a_working_week
     start=DateTime.new(2000,1,1,11,3)

data/test/test_workpattern.rb

@@ -5,7 +5,23 @@ class TestWorkpattern < MiniTest::Unit::TestCase #:nodoc:
   def setup
     Workpattern.clear()    
   end
-  
+
+  def test_can_diff_between_working_period_and_resting_day
+    # This is the test for issue 15
+    mywp=Workpattern.new('My Workpattern',2013,3)
+    mywp.resting(:days => :weekend)
+    mywp.resting(:days =>:weekday, :from_time=>Workpattern.clock(0,0),:to_time=>Workpattern.clock(8,59))
+    mywp.resting(:days =>:weekday, :from_time=>Workpattern.clock(12,0),:to_time=>Workpattern.clock(12,59))
+    mywp.resting(:days =>:weekday, :from_time=>Workpattern.clock(18,0),:to_time=>Workpattern.clock(23,59))
+
+    mydate1=DateTime.civil(2013,9,27,0,0,0)
+    mydate2=DateTime.civil(2013,9,27,23,59,59)
+
+    mywp.resting(:start=>mydate1,:finish=>mydate2, :days =>:all, :from_time=>Workpattern.clock(0,0), :to_time=>Workpattern.clock(23,59))
+
+    assert_equal 60, mywp.diff(DateTime.civil(2013,9,26,17,0),DateTime.civil(2013,9,27,10,0))
+  end  
+
   def test_must_create_a_working_workpattern
     name='mywp'
     base=2001
@@ -238,7 +254,7 @@ class TestWorkpattern < MiniTest::Unit::TestCase #:nodoc:
     assert !wp.working?(DateTime.new(2012,1,1,8,59))    
   end
   
-  
+   
   private
   
   def get_week(ss)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: workpattern
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Barrie Callender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Workpattern performs date calculations that take into account working
@@ -32,8 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -69,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: workpattern
-rubygems_version: 2.0.4
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: temporal calculations