workpattern 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWVlYjQ0YTY1NzVhMzRjN2QzZWZkNzZjZTBmOTM4ODAyNjFmZDFiYw==
+  data.tar.gz: !binary |-
+    NjBhMzUyNWZkYWYzMzk3ZmIyN2ZlNTM1ZjcwMGQ5YjZjM2QwYzFlNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NDllNzljYmEyMzBiMjY3ZDIwYWNhMWE0YWQwNWUxNTMxZGQ3ZDQzNTdmNGU2
+    YWI1OGYwNDZiOTU2NWViZWZmYjRkZmQzY2I5NDg1ODhmNjhjOGUyYjUwMDFh
+    MzllYTIwNGQ3ODY4NTMxNWNmZTk1MDEwNjU2ZTlmNjliNjU2M2Y=
+  data.tar.gz: !binary |-
+    ZjgwZmM2ZTU1YjE0MzhkYTVkYzU2MTU0YmRhOWZkYzIyZDdhNzZmNmY0MWI3
+    OWNkN2MwNmMzOWIxYjg1ODE5MDM3MzFhYWIzMTJjOTMwMjMwMzlkMWViZWU0
+    MTMzYWFmMzRiZWEzMzA1NmE3YTllMTBhMmJlMzA3ZmJkYWQ0YTg=

data/.gitignore

@@ -1,3 +1,4 @@
 doc
 pkg
 .yardoc
+./Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,9 @@
+## Workpattern v0.3.2 (Mar 14, 2013)  ##
+
+* Changed methods on Hour module so as to not clash with Rails (#10) * Barrie Callender * 
+* Applied DRY principle to workpattern method in Workpattern class * Barrie Callender *
+* Removed file from emacs backup * Barrie Callender *
+
 ## Workpattern v0.3.1 (Oct 14, 2012)  ##
 
 * RDOC documentation not right on rubydoc.info (#5) * Barrie Callender *

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    workpattern (0.3.0.beta)
+    workpattern (0.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.9.2.2)
+    rake (0.9.6)
 
 PLATFORMS
   ruby

data/lib/workpattern/day.rb

@@ -74,17 +74,17 @@ module Workpattern
     def workpattern(start_time,finish_time,type)
     
       if start_time.hour==finish_time.hour
-        @values[start_time.hour]=@values[start_time.hour].workpattern(start_time.min,finish_time.min,type)
+        @values[start_time.hour]=@values[start_time.hour].wp_workpattern(start_time.min,finish_time.min,type)
       else
         test_hour=start_time.hour
-        @values[test_hour]=@values[test_hour].workpattern(start_time.min,59,type)
+        @values[test_hour]=@values[test_hour].wp_workpattern(start_time.min,59,type)
         
         while ((test_hour+1)<finish_time.hour)
           test_hour+=1
-          @values[test_hour]=@values[test_hour].workpattern(0,59,type)     
+          @values[test_hour]=@values[test_hour].wp_workpattern(0,59,type)     
         end
         
-        @values[finish_time.hour]=@values[finish_time.hour].workpattern(0,finish_time.min,type)
+        @values[finish_time.hour]=@values[finish_time.hour].wp_workpattern(0,finish_time.min,type)
       end
       set_attributes
     end
@@ -166,15 +166,15 @@ module Workpattern
       end
       
       if (start_hour==finish_hour)     
-        retval=@values[start_hour].minutes(start_min,finish_min)
+        retval=@values[start_hour].wp_minutes(start_min,finish_min)
       else
     
-        retval=@values[start_hour].minutes(start_min,59)
+        retval=@values[start_hour].wp_minutes(start_min,59)
         while (start_hour+1<finish_hour)        
-          retval+=@values[start_hour+1].total     
+          retval+=@values[start_hour+1].wp_total     
           start_hour+=1
         end
-        retval+=@values[finish_hour].minutes(0,finish_min)
+        retval+=@values[finish_hour].wp_minutes(0,finish_min)
       end
         
       return retval
@@ -191,11 +191,11 @@ module Workpattern
       @last_min=nil
       @total=0
       0.upto(@hours-1) {|index|
-        @first_hour=index if ((@first_hour.nil?) && (@values[index].total!=0))
-        @first_min=@values[index].first if ((@first_min.nil?) && (!@values[index].first.nil?))        
-        @last_hour=index if (@values[index].total!=0)
-        @last_min=@values[index].last if (@values[index].total!=0)
-        @total+=@values[index].total
+        @first_hour=index if ((@first_hour.nil?) && (@values[index].wp_total!=0))
+        @first_min=@values[index].wp_first if ((@first_min.nil?) && (!@values[index].wp_first.nil?))        
+        @last_hour=index if (@values[index].wp_total!=0)
+        @last_min=@values[index].wp_last if (@values[index].wp_total!=0)
+        @total+=@values[index].wp_total
       }
     end
     
@@ -247,17 +247,17 @@ module Workpattern
         duration=0
         time=first_working_minute(time)  
       else
-        minutes_this_hour=@values[time.hour].minutes(0,time.min-1)
+        minutes_this_hour=@values[time.hour].wp_minutes(0,time.min-1)
         this_hour=time.hour
         until (duration==0)
           if (minutes_this_hour<duration.abs)     
             duration+=minutes_this_hour
             time = time - (MINUTE*time.min) - HOUR
             this_hour-=1
-            minutes_this_hour=@values[this_hour].total
+            minutes_this_hour=@values[this_hour].wp_total
           else
             next_hour=(time.min==0)
-            time,duration=@values[this_hour].calc(time,duration, next_hour)
+            time,duration=@values[this_hour].wp_calc(time,duration, next_hour)
           end
         end
       end  
@@ -279,9 +279,9 @@ module Workpattern
         result_date= time.next_day - (HOUR*time.hour) - (MINUTE*time.min)
         duration = duration - available_minutes      
       else
-        total=@values[time.hour].minutes(time.min,59)
+        total=@values[time.hour].wp_minutes(time.min,59)
         if (total==duration) # this hour satisfies              
-          result_date=time - (MINUTE*time.min) + (MINUTE*@values[time.hour].last) + MINUTE                   
+          result_date=time - (MINUTE*time.min) + (MINUTE*@values[time.hour].wp_last) + MINUTE                   
           duration = 0
         else  
           result_date = time
@@ -290,9 +290,9 @@ module Workpattern
               duration-=total
               result_date=result_date + HOUR - (MINUTE*result_date.min)
             else
-              result_date,duration=@values[result_date.hour].calc(result_date,duration)     
+              result_date,duration=@values[result_date.hour].wp_calc(result_date,duration)     
             end
-            total=@values[result_date.hour].total
+            total=@values[result_date.hour].wp_total
           end
         end
       end    
@@ -317,7 +317,7 @@ module Workpattern
     # @return [Integer] number of remaining working minutes
     #
     def minutes_left_in_hour(start)
-      return @values[start.hour].diff(start.min,60)
+      return @values[start.hour].wp_diff(start.min,60)
     end
     
   end

data/lib/workpattern/hour.rb

@@ -10,8 +10,8 @@ module Workpattern
     #
     # @return [Integer] working minutes in the hour 
     #
-    def total
-      return minutes(0,59)
+    def wp_total
+      return wp_minutes(0,59)
     end  
     
     # Sets the minutes to either working (type=1) or resting (type=0)
@@ -20,17 +20,17 @@ module Workpattern
     # @param [Integer] finish minute at end of range
     # @param [Integer] type defines whether working (1) or resting (0)
     #
-    def workpattern(start,finish,type)
-      return working(start,finish) if type==1
-      return resting(start,finish) if type==0
+    def wp_workpattern(start,finish,type)
+      return wp_working(start,finish) if type==1
+      return wp_resting(start,finish) if type==0
     end
     
     # Returns the first working minute in the hour or 60 if there are no working minutes
     #
     # @return [Integer] first working minute or 60 if none found
     #
-    def first
-      0.upto(59) {|minute| return minute if self.minutes(minute,minute)==1}
+    def wp_first
+      0.upto(59) {|minute| return minute if self.wp_minutes(minute,minute)==1}
       return nil
     end
     
@@ -38,8 +38,8 @@ module Workpattern
     #
     # @return [Integer] last working minute or nil if none found
     #
-    def last
-      59.downto(0) {|minute| return minute if self.minutes(minute,minute)==1}
+    def wp_last
+      59.downto(0) {|minute| return minute if self.wp_minutes(minute,minute)==1}
       return nil
     end
     
@@ -48,8 +48,8 @@ module Workpattern
     # @param [Integer] start is the minute being tested
     # @return [Boolean] true if minute is working, otherwise false
     #
-    def working?(start)
-      return true if minutes(start,start)==1
+    def wp_working?(start)
+      return true if wp_minutes(start,start)==1
       return false
     end
     
@@ -59,9 +59,9 @@ module Workpattern
     # @param [Integer] finish last minute in range
     # @return [Integer] number of minutes from <tt>start</tt> to <tt>finish</tt> inclusive
     #
-    def minutes(start,finish)
+    def wp_minutes(start,finish)
       start,finish=finish,start if start > finish
-      return (self & mask(start,finish)).to_s(2).count('1')
+      return (self & wp_mask(start,finish)).to_s(2).count('1')
     end
     
     # Returns the DateTime and remainding minutes when adding a duration to a minute in the hour. 
@@ -72,12 +72,12 @@ module Workpattern
     # @param [Boolean] next_hour used in subtraction to specify the starting point as midnight (00:00 the next day)
     # @return [DateTime,Integer,Boolean] The <tt>DateTime</tt> calculated along with remaining minutes and a flag indicating if starting point is next hour
     #
-    def calc(time,duration,next_hour=false)
+    def wp_calc(time,duration,next_hour=false)
     
       if (duration<0)
-        return subtract(time,duration, next_hour)  
+        return wp_subtract(time,duration, next_hour)  
       elsif (duration>0)
-        return add(time,duration)                
+        return wp_add(time,duration)                
       else
         return time,duration
       end 
@@ -88,10 +88,10 @@ module Workpattern
     # @param [Integer] finish last minute in range
     # @return [Integer] number of working minutes in the range
     #
-    def diff(start,finish)
+    def wp_diff(start,finish)
       start,finish=finish,start if start > finish
       return 0 if start==finish
-      return (self & mask(start,finish-1)).to_s(2).count('1')
+      return (self & wp_mask(start,finish-1)).to_s(2).count('1')
     end
     
     private
@@ -101,8 +101,8 @@ module Workpattern
     # @param [Integer] start is first minute in the range
     # @param [Integer] finish is last minute in the range
     #
-    def working(start,finish)
-      return self | mask(start,finish)
+    def wp_working(start,finish)
+      return self | wp_mask(start,finish)
     end
     
     # sets a resting pattern
@@ -110,8 +110,8 @@ module Workpattern
     # @param [Integer] start is first minute in the range
     # @param [Integer] finish is last minute in the range
     #
-    def resting(start,finish)
-      return self & ((2**60-1)-mask(start,finish))
+    def wp_resting(start,finish)
+      return self & ((2**60-1)-wp_mask(start,finish))
     end
     
     # Creates a bit mask of 1's over the specified range
@@ -119,7 +119,7 @@ module Workpattern
     # @param [Integer] start is first minute in the range
     # @param [Integer] finish is the last minute in the range
     #
-    def mask(start,finish)
+    def wp_mask(start,finish)
       return ((2**(finish+1)-1)-(2**start-1))
     end
     
@@ -129,9 +129,9 @@ module Workpattern
     # @param [Integer] duration is the number of minutes to add and can be negative (subtraction)
     # @return [DateTime, Integer] The resulting DateTime and any remaining minutes
     #
-    def add(time,duration)
+    def wp_add(time,duration)
       start = time.min
-      available_minutes=minutes(start,59)
+      available_minutes=wp_minutes(start,59)
 
       if ((duration-available_minutes)>=0)
         result_date = time + HOUR - (MINUTE*start)
@@ -139,15 +139,15 @@ module Workpattern
       elsif ((duration-available_minutes)==0)
         result_date = time - (MINUTE*start) + last + 1 
         result_remainder = 0
-      elsif (minutes(start,start+duration-1)==duration)
+      elsif (wp_minutes(start,start+duration-1)==duration)
         result_date = time + (MINUTE*duration)
         result_remainder = 0
       else
         step = start + duration
-        duration-=minutes(start,step)
+        duration-=wp_minutes(start,step)
         until (duration==0)
           step+=1
-          duration-=minutes(step,step)
+          duration-=wp_minutes(step,step)
         end
         step+=1
         result_date = time + (MINUTE*step)
@@ -162,31 +162,31 @@ module Workpattern
     # @param [Boolean] next_hour indicates if the 59th second is the first one to be included
     # @return [DateTime, Integer] The resulting DateTime and any remaining minutes
     #
-    def subtract(time,duration,next_hour)
+    def wp_subtract(time,duration,next_hour)
       if next_hour
-        if working?(59)
+        if wp_working?(59)
           duration+=1
           time=time+(MINUTE*59)
-          return calc(time,duration)
+          return wp_calc(time,duration)
         end  
       else  
         start=time.min  
         available_minutes=0
-        available_minutes = minutes(0,start-1) if start > 0
+        available_minutes = wp_minutes(0,start-1) if start > 0
       end
       
       if ((duration + available_minutes)<=0)
         result_date = time - (MINUTE*start)
         result_remainder = duration+available_minutes
-      elsif (minutes(start+duration,start-1)==duration.abs)
+      elsif (wp_minutes(start+duration,start-1)==duration.abs)
         result_date = time + (MINUTE*duration)
         result_remainder = 0
       else     
         step = start + duration
-        duration+=minutes(step,start-1)
+        duration+=wp_minutes(step,start-1)
         until (duration==0)
           step-=1
-          duration+=minutes(step,step)
+          duration+=wp_minutes(step,step)
         end
         result_date = time - (MINUTE * (start-step))
         result_remainder = 0

data/lib/workpattern/version.rb

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

data/lib/workpattern/workpattern.rb

@@ -29,6 +29,16 @@ module Workpattern
     #
     attr_reader :name, :base, :span, :from, :to, :weeks
     
+    # Class for handling persistence in user's own way
+    #
+    def self.persistence_class=(klass)
+      @@persistence = klass
+    end
+
+    def self.persistence?
+      @@persistence ||= nil
+    end
+
     # The new <tt>Workpattern</tt> object is created with all working minutes.
     #
     # @param [String] name Every workpattern has a unique name
@@ -119,6 +129,8 @@ module Workpattern
           :work_type => WORK}   
           
       args.merge! opts
+ 
+      @@persistence.store( name: @name, workpattern: args) if self.class.persistence?
 
       args[:start] = dmy_date(args[:start])
       args[:finish] = dmy_date(args[:finish])
@@ -132,9 +144,7 @@ module Workpattern
         current_wp=find_weekpattern(upd_start)
         if (current_wp.start == upd_start)
           if (current_wp.finish > upd_finish)
-            clone_wp=current_wp.duplicate
-            current_wp.adjust(upd_finish+1,current_wp.finish)
-            clone_wp.adjust(upd_start,upd_finish)
+            clone_wp=clone_and_adjust_current_wp(current_wp, upd_finish+1,current_wp.finish,upd_start,upd_finish)
             clone_wp.workpattern(args[:days],from_time,to_time,args[:work_type])
             @weeks<< clone_wp
             upd_start=upd_finish+1
@@ -143,18 +153,14 @@ module Workpattern
             upd_start=current_wp.finish + 1 
           end
         else
-          clone_wp=current_wp.duplicate
-          current_wp.adjust(current_wp.start,upd_start-1)
-          clone_wp.adjust(upd_start,clone_wp.finish)          
+          clone_wp=clone_and_adjust_current_wp(current_wp, current_wp.start,upd_start-1,upd_start)
           if (clone_wp.finish <= upd_finish)
             clone_wp.workpattern(args[:days],from_time,to_time,args[:work_type])
             @weeks<< clone_wp
             upd_start=clone_wp.finish+1
           else
-            after_wp=clone_wp.duplicate
-            after_wp.adjust(upd_finish+1,after_wp.finish)
+            after_wp=clone_and_adjust_current_wp(clone_wp, upd_start,upd_finish,upd_finish+1)
             @weeks<< after_wp
-            clone_wp.adjust(upd_start,upd_finish)
             clone_wp.workpattern(args[:days],from_time,to_time,args[:work_type])
             @weeks<< clone_wp
             upd_start=clone_wp.finish+1
@@ -278,6 +284,20 @@ module Workpattern
       return Clock.new(date.hour,date.min)
     end
     
+    private
+    
+    # Handles cloning of Week Pattern including date adjustments
+    # 
+    def clone_and_adjust_current_wp(current_wp, current_start,current_finish,clone_start,clone_finish=nil)
+      clone_wp=current_wp.duplicate
+      current_wp.adjust(current_start,current_finish)
+      if (clone_finish.nil?)
+        clone_wp.adjust(clone_start,clone_wp.finish)
+      else
+        clone_wp.adjust(clone_start,clone_finish)
+      end
+      return clone_wp
+    end
   end
 end
     

data/test/test_hour.rb

@@ -9,24 +9,24 @@ class TestHour < Test::Unit::TestCase #:nodoc:
   
   must "ceate a working hour" do
     working_hour = Workpattern::WORKING_HOUR
-    assert_equal 60, working_hour.total,"working total minutes"
+    assert_equal 60, working_hour.wp_total,"working total minutes"
   end
     
   must "ceate a resting hour" do
     resting_hour = Workpattern::RESTING_HOUR
-    assert_equal 0, resting_hour.total,"resting total minutes"
+    assert_equal 0, resting_hour.wp_total,"resting total minutes"
   end
   
   must "set patterns correctly" do
     working_hour = Workpattern::WORKING_HOUR
-    working_hour = working_hour.workpattern(0,0,0)
-    working_hour = working_hour.workpattern(59,59,0)
-    working_hour = working_hour.workpattern(11,30,0)
-    assert_equal 38,working_hour.total, "total working minutes"
-    assert_equal 1, working_hour.first, "first minute of the day"
-    assert_equal 58, working_hour.last, "last minute of the day"
-    assert !working_hour.working?(0)
-    assert working_hour.working?(1)
+    working_hour = working_hour.wp_workpattern(0,0,0)
+    working_hour = working_hour.wp_workpattern(59,59,0)
+    working_hour = working_hour.wp_workpattern(11,30,0)
+    assert_equal 38,working_hour.wp_total, "total working minutes"
+    assert_equal 1, working_hour.wp_first, "first minute of the day"
+    assert_equal 58, working_hour.wp_last, "last minute of the day"
+    assert !working_hour.wp_working?(0)
+    assert working_hour.wp_working?(1)
   end
   
   must 'add minutes in a working hour' do
@@ -43,7 +43,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2000,12,31,23,59,1,2001,1,1,0,0,0]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = working_hour.calc(start,add)
+      result,remainder = working_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -63,7 +63,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2000,12,31,23,59,1,2001,1,1,0,0,1]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = resting_hour.calc(start,add)
+      result,remainder = resting_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -73,8 +73,8 @@ class TestHour < Test::Unit::TestCase #:nodoc:
   must 'add minutes in a patterned hour' do
 
     pattern_hour = Workpattern::WORKING_HOUR
-    pattern_hour = pattern_hour.workpattern(1,10,0)
-    pattern_hour = pattern_hour.workpattern(55,59,0)
+    pattern_hour = pattern_hour.wp_workpattern(1,10,0)
+    pattern_hour = pattern_hour.wp_workpattern(55,59,0)
     [
      [2000,1,1,0,0,3,2000,1,1,0,13,0],
      [2000,1,1,0,0,0,2000,1,1,0,0,0],
@@ -86,7 +86,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2000,12,31,23,59,1,2001,1,1,0,0,1]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = pattern_hour.calc(start,add)
+      result,remainder = pattern_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -106,7 +106,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2001,1,1,0,0,-1,2001,1,1,0,0,-1]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = working_hour.calc(start,add)
+      result,remainder = working_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -126,7 +126,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2001,1,1,0,0,-1,2001,1,1,0,0,-1]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = resting_hour.calc(start,add)
+      result,remainder = resting_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -136,8 +136,8 @@ class TestHour < Test::Unit::TestCase #:nodoc:
   must 'subtract minutes in a patterned hour' do
   
     pattern_hour = Workpattern::WORKING_HOUR
-    pattern_hour = pattern_hour.workpattern(1,10,0)
-    pattern_hour = pattern_hour.workpattern(55,59,0)
+    pattern_hour = pattern_hour.wp_workpattern(1,10,0)
+    pattern_hour = pattern_hour.wp_workpattern(55,59,0)
     [
      [2000,1,1,0,0,-3,2000,1,1,0,0,-3],
      [2000,1,1,0,0,0,2000,1,1,0,0,0],
@@ -149,7 +149,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [2001,1,1,23,59,-1,2001,1,1,23,54,0]
     ].each{|y,m,d,h,n,add,yr,mr,dr,hr,nr,rem|
       start=DateTime.new(y,m,d,h,n)
-      result,remainder = pattern_hour.calc(start,add)
+      result,remainder = pattern_hour.wp_calc(start,add)
       assert_equal DateTime.new(yr,mr,dr,hr,nr), result, "result calc(#{start},#{add})"
       assert_equal rem, remainder, "remainder calc(#{start},#{add})"  
     }
@@ -170,16 +170,16 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [0,0,1,1,0,0],
      [59,59,1,2,0,59]
     ].each{|start,finish,type,total,first,last|
-      working_hour = working_hour.workpattern(start,finish,type)
-      assert_equal total,working_hour.total, "total working minutes #{j}"
-      assert_equal first, working_hour.first, "first minute of the day #{j}"
-      assert_equal last, working_hour.last, "last minute of the day #{j}"  
+      working_hour = working_hour.wp_workpattern(start,finish,type)
+      assert_equal total,working_hour.wp_total, "total working minutes #{j}"
+      assert_equal first, working_hour.wp_first, "first minute of the day #{j}"
+      assert_equal last, working_hour.wp_last, "last minute of the day #{j}"  
       start.upto(finish) {|i| control[i]=type}
       0.upto(59) {|i|
         if (control[i]==0)
-          assert !working_hour.working?(i)    
+          assert !working_hour.wp_working?(i)    
         else
-          assert working_hour.working?(i)
+          assert working_hour.wp_working?(i)
         end
       }
       j+=1
@@ -201,7 +201,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [59,0,59],
      [60,0,60]
     ].each {|start,finish,result|
-      assert_equal result, working_hour.diff(start,finish),"diff(#{start},#{finish})"
+      assert_equal result, working_hour.wp_diff(start,finish),"diff(#{start},#{finish})"
     }
     
   end
@@ -220,7 +220,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [59,0,0],
      [60,0,0]
     ].each {|start,finish,result|
-      assert_equal result, resting_hour.diff(start,finish),"diff(#{start},#{finish})"
+      assert_equal result, resting_hour.wp_diff(start,finish),"diff(#{start},#{finish})"
     }
     
   end
@@ -228,9 +228,9 @@ class TestHour < Test::Unit::TestCase #:nodoc:
   must "calculate difference between minutes in pattern hour" do
 
     pattern_hour = Workpattern::WORKING_HOUR
-    pattern_hour = pattern_hour.workpattern(1,10,0)
-    pattern_hour = pattern_hour.workpattern(55,59,0)
-    pattern_hour = pattern_hour.workpattern(59,59,1)
+    pattern_hour = pattern_hour.wp_workpattern(1,10,0)
+    pattern_hour = pattern_hour.wp_workpattern(55,59,0)
+    pattern_hour = pattern_hour.wp_workpattern(59,59,1)
     
     [[0,0,0],
      [0,1,1],
@@ -244,7 +244,7 @@ class TestHour < Test::Unit::TestCase #:nodoc:
      [59,0,45],
      [60,0,46]
     ].each {|start,finish,result|
-      assert_equal result, pattern_hour.diff(start,finish),"diff(#{start},#{finish})"
+      assert_equal result, pattern_hour.wp_diff(start,finish),"diff(#{start},#{finish})"
     }  
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: workpattern
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Barrie Callender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,27 +62,25 @@ files:
 - workpattern.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: workpattern
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: temporal calculations
 test_files: []
-has_rdoc: