calc_working_hours 0.1.4 → 0.1.5

data/lib/calc_working_hours/calc_helper.rb

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+module CalcWorkingHours
+
+  class CalcHelper
+    class << self
+      def valid_working_hours_format?(str)
+        flag = false
+        if str.class == String
+          if /\d+:(\d+)/ =~ str
+            if $1.to_i < 60 && $1.to_i >= 0
+              flag = true
+            end
+          end
+        end
+        return flag
+      end
+
+      def valid_time_format?(time)
+        flag = false
+        if time.class == String
+          if /(\d+):(\d+)/ =~ time
+            if ($1.to_i <= 48 && $1.to_i >= 0) && ($2.to_i < 60 && $2.to_i >= 0)
+              flag = true
+            end
+          end
+        end
+        return flag
+      end
+
+      def valid_time_order?(first, second)
+        false
+        true if change_to_minute(first) <= change_to_minute(second)
+      end
+
+      def valid_range?(first, second)
+        false
+        true if change_to_minute(first) <= change_to_minute(second)
+      end
+
+      def valid_break_time?(break_time, starting_time, ending_time)
+        flag = false
+        break_time.each do |time|
+          if time.length == 2 && time.class == Array
+            if valid_time_format?(time[0]) && valid_time_format?(time[1])
+              time.each do |t|
+                if change_to_minute(starting_time) >= change_to_minute(t) || change_to_minute(ending_time) <= change_to_minute(t)
+                  return flag = false 
+                end
+              end
+              flag = true
+            end
+          else
+            return flag = false
+          end
+        end
+        return flag
+      end
+
+      def total_break_time(break_time)
+        total = WorkingHours.new("0:00")
+        break_time.each do |time|
+          total.add_time(time[1]).minus_time(time[0])
+        end
+        return total
+      end
+  
+      def change_to_minute(str)
+        /(\d+):(\d+)/ =~ str
+        return $1.to_i * 60 + $2.to_i
+      end
+  
+      def change_to_time_string(minute)
+        hour = minute.div(60).to_s
+        minute = (minute % 60).to_s
+        if minute.length == 1
+          minute = "0" + minute
+        end
+        return hour + ":" + minute
+      end
+    end
+
+  end
+end

data/lib/calc_working_hours/time_card.rb

@@ -3,6 +3,7 @@
 module CalcWorkingHours
   attr_reader :time_card_rows, :card_id, :id
   class TimeCard
+
     def initialize(card_id, id)
       @time_card_rows = []
       @card_id = card_id
@@ -26,7 +27,7 @@ module CalcWorkingHours
     def total_working_hours_in_range(start_range, end_range)
       array_of_working_hours_in_range = []
       if start_range == true && end_range == true
-        unless valid_time_format?(start_range) || valid_time_format?(end_range)
+        unless CalcHelper.valid_time_format?(start_range) || CalcHelper.valid_time_format?(end_range)
           raise "invalid time format (TimeCard total_working_hours)"
         end
       end
@@ -36,29 +37,5 @@ module CalcWorkingHours
       return WorkingHours.new("0:00").add_array_time(array_of_working_hours_in_range).time_string
     end
 
-    private
-
-    def valid_range?(first, second)
-      false
-      true if change_to_minute(first) < change_to_minute(second)
-    end
-
-    def valid_time_format?(time)
-      flag = false
-      if time.class == String
-        if /(\d+):(\d+)/ =~ time
-          if ($1.to_i <= 48 && $1.to_i >= 0) && ($2.to_i < 60 && $2.to_i >= 0)
-            flag = true
-          end
-        end
-      end
-      return flag
-    end
-
-    def change_to_minute(str)
-      /(\d+):(\d+)/ =~ str
-      return $1.to_i * 60 + $2.to_i
-    end
-
   end
 end

data/lib/calc_working_hours/time_card_row.rb

@@ -7,29 +7,29 @@ module CalcWorkingHours
   class TimeCardRow
     attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string, :time_point, :working_hours_in_range, :overtime, :id
     def initialize(starting_time, ending_time, *break_time)
-      unless valid_time_format?(starting_time) && valid_time_format?(ending_time)
+      unless CalcHelper.valid_time_format?(starting_time) && CalcHelper.valid_time_format?(ending_time)
         raise "failure initialize (invalid time format! TimeCardRow class)"
       end
 
-      unless valid_time_order?(starting_time, ending_time)
+      unless CalcHelper.valid_time_order?(starting_time, ending_time)
         raise "failure initialize (invalid time order! TimeCardRow class)"
       end
 
       unless break_time.empty?
-        unless valid_break_time?(break_time, starting_time, ending_time)
+        unless CalcHelper.valid_break_time?(break_time, starting_time, ending_time)
           raise "failure initialize (invalid break time! TimeCardRow class)"
         end
       end
       
       break_time.each do |time|
-        unless valid_time_order?(time[0], time[1])
+        unless CalcHelper.valid_time_order?(time[0], time[1])
           raise "failure initialize (invalid time order(break time)! TimeCardRow class)"
         end
       end
 
       total_break_time_string = "0:00"
       unless break_time.empty?
-        total_break_time_string = total_break_time(break_time)
+        total_break_time_string = CalcHelper.total_break_time(break_time).time_string
       end
 
       @starting_time = starting_time
@@ -76,86 +76,18 @@ module CalcWorkingHours
         starting_time = @time_point[counter]
         ending_time = @time_point[counter + 1]
 
-        if valid_range?(end_range, starting_time) || valid_range?(ending_time, start_range)
-        elsif valid_range?(start_range, starting_time) && valid_range?(end_range, ending_time)
+        if CalcHelper.valid_range?(end_range, starting_time) || CalcHelper.valid_range?(ending_time, start_range)
+        elsif CalcHelper.valid_range?(start_range, starting_time) && CalcHelper.valid_range?(end_range, ending_time)
           array_of_working_hours << WorkingHours.new(end_range).minus_time(starting_time).time_string
-        elsif valid_range?(starting_time, start_range) && valid_range?(end_range, ending_time)
+        elsif CalcHelper.valid_range?(starting_time, start_range) && CalcHelper.valid_range?(end_range, ending_time)
           array_of_working_hours << WorkingHours.new(end_range).minus_time(start_range).time_string
-        elsif valid_range?(starting_time, start_range) && valid_range?(ending_time, end_range)
+        elsif CalcHelper.valid_range?(starting_time, start_range) && CalcHelper.valid_range?(ending_time, end_range)
           array_of_working_hours << WorkingHours.new(ending_time).minus_time(start_range).time_string
-        elsif valid_range?(start_range, starting_time) && valid_range?(ending_time, end_range)
+        elsif CalcHelper.valid_range?(start_range, starting_time) && CalcHelper.valid_range?(ending_time, end_range)
           array_of_working_hours << WorkingHours.new(ending_time).minus_time(starting_time).time_string
         end
       end
       return @working_hours_in_range = WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
     end
-
-    private
-
-    def valid_range?(first, second)
-      false
-      true if change_to_minute(first) <= change_to_minute(second)
-    end
-
-    def total_break_time(break_time)
-      total = WorkingHours.new("0:00")
-      break_time.each do |time|
-        total.add_time(time[1]).minus_time(time[0])
-      end
-      return total.time_string
-    end
-
-    def valid_time_card_row_format?(starting_time, ending_time)
-      # break_timeについてはvalid_break_timeでチェック
-      flag = false
-      if valid_time_format?(starting_time) && valid_time_format?(ending_time)
-        flag = true
-      end
-      return flag
-    end
-
-    def valid_time_format?(time)
-      flag = false
-      if time.class == String
-        if /(\d+):(\d+)/ =~ time
-          if ($1.to_i <= 48 && $1.to_i >= 0) && ($2.to_i < 60 && $2.to_i >= 0)
-            flag = true
-          end
-        end
-      end
-      return flag
-    end
-
-    def valid_time_order?(first, second)
-      false
-      true if change_to_minute(first) < change_to_minute(second)
-    end
-
-    def valid_break_time?(break_time, starting_time, ending_time)
-      flag = false
-      break_time.each do |time|
-        if time.length == 2 && time.class == Array
-          if valid_time_format?(time[0]) && valid_time_format?(time[1])
-            time.each do |t|
-              if change_to_minute(starting_time) >= change_to_minute(t) || change_to_minute(ending_time) <= change_to_minute(t)
-                return flag = false 
-              end
-            end
-            flag = true
-          end
-        else
-          return flag = false
-        end
-      end
-     
-      return flag
-    end
-
-    def change_to_minute(str)
-      /(\d+):(\d+)/ =~ str
-      return $1.to_i * 60 + $2.to_i
-    end
-
   end
-
 end

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/calc_working_hours/working_hours.rb

@@ -5,7 +5,7 @@ module CalcWorkingHours
   class WorkingHours
     attr_reader :time_string, :minute
     def initialize(str)
-      if valid_time_format?(str)
+      if CalcHelper.valid_working_hours_format?(str)
         @time_string = str
         self.to_minute
         self
@@ -15,13 +15,13 @@ module CalcWorkingHours
     end
 
     def to_minute
-      @minute = change_to_minute(@time_string)
+      @minute = CalcHelper.change_to_minute(@time_string)
     end
 
     def add_time(str)
-      if valid_time_format?(str)
-        @minute = @minute + change_to_minute(str)
-        @time_string = change_to_time_string(@minute)
+      if CalcHelper.valid_working_hours_format?(str)
+        @minute = @minute + CalcHelper.change_to_minute(str)
+        @time_string = CalcHelper.change_to_time_string(@minute)
         self
       else
         raise "failure add_time (invalid time format!)"
@@ -36,11 +36,11 @@ module CalcWorkingHours
     end
 
     def minus_time(str)
-      if valid_time_format?(str)
-        minute = @minute - change_to_minute(str)
+      if CalcHelper.valid_working_hours_format?(str)
+        minute = @minute - CalcHelper.change_to_minute(str)
         if minute >= 0
           @minute = minute
-          @time_string = change_to_time_string(@minute)
+          @time_string = CalcHelper.change_to_time_string(@minute)
           self
         else 
           raise "failure add_time (invalid time format!)"
@@ -48,32 +48,5 @@ module CalcWorkingHours
       end
     end
 
-    private
-    def valid_time_format?(str)
-      flag = false
-      if str.class == String
-        if /\d+:(\d+)/ =~ str
-          if $1.to_i < 60 && $1.to_i >= 0
-            flag = true
-          end
-        end
-      end
-      return flag
-    end
-
-    def change_to_minute(str)
-      /(\d+):(\d+)/ =~ str
-      return $1.to_i * 60 + $2.to_i
-    end
-
-    def change_to_time_string(minute)
-      hour = minute.div(60).to_s
-      minute = (minute % 60).to_s
-      if minute.length == 1
-        minute = "0" + minute
-      end
-      return hour + ":" + minute
-    end
-
   end
 end

data/lib/calc_working_hours.rb

@@ -1,3 +1,4 @@
+require "calc_working_hours/calc_helper"
 require "calc_working_hours/time_card"
 require "calc_working_hours/time_card_row"
 require "calc_working_hours/time_recorder"

metadata

@@ -1,57 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Takashi_U
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70285409908500 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70285409908500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70285409907800 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70285409907800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70285409907060 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70285409907060
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
@@ -68,6 +60,7 @@ files:
 - Rakefile
 - calc_working_hours.gemspec
 - lib/calc_working_hours.rb
+- lib/calc_working_hours/calc_helper.rb
 - lib/calc_working_hours/time_card.rb
 - lib/calc_working_hours/time_card_row.rb
 - lib/calc_working_hours/time_recorder.rb
@@ -84,26 +77,33 @@ files:
 homepage: https://github.com/Takashi-U/calc_working_hours
 licenses:
 - MIT
-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'
+      segments:
+      - 0
+      hash: -1838675914513887134
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1838675914513887134
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.10
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: 時間計算
 test_files:
 - spec/calc_working_hours/data_sample.csv

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: de4eaa0b8467abb4b621e819e25038b342c33936
-  data.tar.gz: dee2875a0559607c565770adf163a786da2ba6dd
-SHA512:
-  metadata.gz: 7cd7effd40cc868f38230f3ca02fc17fe6fee931fe23147dfb75fa48b90b24ea16411f27d2e0d03cf58043bd239bca3edab93ea296796e50b303014f01001895
-  data.tar.gz: 451121820aea6dc580c5d603f94c8e9819c7d48e7097dd1ae14d09ef925cc70cb27dbb3c9be412d7c0970476be2962d4428a9c7e8d0b057f9cc19a90ec405e8a