calc_working_hours 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea21e50f8b5b8af5843d898a5019f54bd5e4c4d0
-  data.tar.gz: 5eb6efc9ff0decf4ca6348c62007ddad425d82cb
+  metadata.gz: 16b8b8c6774066be91cce24c079db2df12b65c81
+  data.tar.gz: ab99ed5e2a1c3a5df82d2560b8a4a4336485e4a2
 SHA512:
-  metadata.gz: 16e476bd0df661b86ecf69877ca07adbf3e12ef4f14cee526d120247f3dff77b30a0e771542b8d596211333378d06a204f4543a652fd787933ecc546fdf099a6
-  data.tar.gz: 2c9b9ca198e8b52abffe72ce7718ddc022163947fe30cd43ce912926a47058c41954459c1a9a78b45bc37f2d7ff917fb349675fde7bdade764f6b3da1e309a07
+  metadata.gz: c3fb572921a516701f0b4b954bccc2ec750efeba9dcbd3ebe7d688fbaa88667c7c458625089b52a28eebe5010b133d739eb04b0e73a6755c30f980ba2f366d94
+  data.tar.gz: 2467a654f306c79deefc8388253fd93129c6d5abadbe5953e6daf7a0140deb6e0c86926a444dc094d9cf185531c14009ca553aec9f54d0651afb375636317c1a

data/lib/calc_working_hours/time_card_row.rb

@@ -6,7 +6,15 @@ module CalcWorkingHours
 
   class TimeCardRow
     attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string, :time_point, :over_time, :id
-    def initialize(date_string, starting_time, ending_time, *break_time)
+    def initialize(date_string, starting_time, ending_time, auto_correction, *break_time)
+
+      if auto_correction
+        unless CalcHelper.valid_time_order?(starting_time, ending_time)
+          et = WorkingHours.new(ending_time)
+          ending_time = et.add_time("24:00")
+        end
+      end
+
       unless date_string.class == String
         raise "failure set_date (date should string class)! TimeCardRow class"
       end
@@ -24,7 +32,7 @@ module CalcWorkingHours
           raise "failure initialize (invalid break time! TimeCardRow class)"
         end
       end
-      
+
       break_time.each do |time|
         unless CalcHelper.valid_time_order?(time[0], time[1])
           raise "failure initialize (invalid time order(break time)! TimeCardRow class)"

data/lib/calc_working_hours/time_recorder.rb

@@ -5,8 +5,7 @@ module CalcWorkingHours
 
   class TimeRecorder
     attr_reader :time_cards
-    def initialize(path_to_csv, set_encode, id_row, card_id_row, date_row, starting_time_row, ending_time_row, *break_time_rows)
-
+    def initialize(path_to_csv, set_encode ,id_row, card_id_row, date_row, starting_time_row, ending_time_row, auto_correction, *break_time_rows)
       csv_data = File.read(path_to_csv) if set_encode == nil || set_encode == false
       csv_data = File.read(path_to_csv, :encoding => set_encode + ":UTF-8") if set_encode
       time_cards = {}
@@ -27,10 +26,10 @@ module CalcWorkingHours
 
           if time_cards.has_key?(row[card_id_row])
             raise "id mismatching! (TimeRecorder class)" unless time_cards[row[card_id_row]].id == row[id_row]
-            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], *break_times))
+            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], auto_correction ,*break_times))
           else
             time_cards[row[card_id_row]] = TimeCard.new(row[card_id_row], row[id_row])
-            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], *break_times))
+            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], auto_correction , *break_times))
           end
         end
       end

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -6,7 +6,7 @@ include CalcWorkingHours
 describe TimeCardRow do
   context "始業9:00、終業19:00、休憩11:00〜12:00、15:00〜16:00のとき" do
     before do
-      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "19:00", ["11:00", "12:00"], ["15:00", "16:00"])
+      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "19:00", false, ["11:00", "12:00"], ["15:00", "16:00"])
     end
 
     it "始業時間は9:00となっている" do 
@@ -48,7 +48,7 @@ describe TimeCardRow do
 
   context "始業11:30、終業23:34、休憩15:38〜17:14のとき" do
     before do
-      @time_card_row = TimeCardRow.new("2013/5/12", "11:30", "23:34", ["15:38", "17:14"])
+      @time_card_row = TimeCardRow.new("2013/5/12", "11:30", "23:34", false, ["15:38", "17:14"])
     end
 
     it "所定労働時間を8:00とすると、残業時間は2:28となる" do 
@@ -58,7 +58,7 @@ describe TimeCardRow do
 
   context "始業9:00、終業18:00、休憩9:00〜18:00のとき" do
     before do
-      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "18:00", ["9:00", "18:00"])
+      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "18:00", false, ["9:00", "18:00"])
     end
 
     it "労働時間は0:00となる" do 
@@ -68,51 +68,51 @@ describe TimeCardRow do
 
   context "適正な時間設定と、不適な設定時間を設定したとき" do
     it "set_dateにString以外を設定すると例外が発生する" do
-      proc { TimeCardRow.new(Date.new(2013, 5, 12), "22:00", "28:00") }.should raise_error
+      proc { TimeCardRow.new(Date.new(2013, 5, 12), "22:00", "28:00", false) }.should raise_error
     end
 
     it "始業22:00、終業28:00は適正な始業・終業時間設定（0:00〜48:00）なので、エラーは発生しないこと" do
-      proc{ TimeCardRow.new("2013/5/12", "22:00", "28:00") }.should_not raise_error
+      proc{ TimeCardRow.new("2013/5/12", "22:00", "28:00", false) }.should_not raise_error
     end
 
     it "始業44:00、終業50:00は不適正な始業・終業時間設定なので、エラーが発生すること" do
-      proc{ TimeCardRow.new("2013/5/12", "44:00", "50:00") }.should raise_error
+      proc{ TimeCardRow.new("2013/5/12", "44:00", "50:00", false) }.should raise_error
     end
 
     it "始業四:00、終業5:00は不適正な時間フォーマットなので、エラーが発生すること" do
-      proc{ TimeCardRow.new("2013/5/12", "四:00", "5:00") }.should raise_error
+      proc{ TimeCardRow.new("2013/5/12", "四:00", "5:00" ,false)}.should raise_error
     end
 
     it "始業9:00、終業19:00の時系列に誤りが無いので、エラーは発生しないこと" do 
-      proc { TimeCardRow.new("2013/5/12", "9:00", "19:00") }.should_not raise_error
+      proc { TimeCardRow.new("2013/5/12", "9:00", "19:00" ,false)}.should_not raise_error
     end
 
     it "始業18:00、終業8:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("2013/5/12", "18:00", "9:00") }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "18:00", "9:00" ,false)}.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩12:00〜11:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", ["12:00", "10:00"]) }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00",false,["12:00", "10:00"]) }.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩12:00は休憩時間設定が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", "12:00") }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", "12:00",false) }.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩7:00〜11:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", ["7:00", "10:00"]) }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00",false, ["7:00", "10:00"]) }.should raise_error
     end
   end
 
   context "始業20:00、終業25:00のとき" do
     it "深夜勤務時間は3:00となる" do
-      TimeCardRow.new("2013/5/12", "20:00", "25:00").between_10pm_and_5am.should == "3:00"
+      TimeCardRow.new("2013/5/12", "20:00", "25:00", false).between_10pm_and_5am.should == "3:00"
     end
   end
 
   context "始業20:00、終業25:00、休憩23:00〜24:00のとき" do
     it "深夜勤務時間は4:00となる" do
-      TimeCardRow.new("2013/5/12", "20:00", "25:00", ["23:00", "24:00"]).between_10pm_and_5am.should == "2:00"
+      TimeCardRow.new("2013/5/12", "20:00", "25:00", false,["23:00", "24:00"]).between_10pm_and_5am.should == "2:00"
     end
   end
 

data/spec/calc_working_hours/time_card_spec.rb

@@ -7,8 +7,8 @@ describe TimeCard do
   context "始業9:00、終業19:00、休憩11:00〜12:00、15:00〜16:00が2日間のとき" do
     before do
       @time_card = TimeCard.new(1,1)
-      @time_card.add_row(TimeCardRow.new("2013/5/12", "9:00", "19:00", ["11:00", "12:00"], ["15:00", "16:00"]).set_fixed_working_hours("7:00"))
-      @time_card.add_row(TimeCardRow.new("2013/5/13", "9:00", "19:00", ["11:00", "12:00"], ["15:00", "16:00"]).set_fixed_working_hours("7:00"))
+      @time_card.add_row(TimeCardRow.new("2013/5/12", "9:00", "19:00", false, ["11:00", "12:00"], ["15:00", "16:00"]).set_fixed_working_hours("7:00"))
+      @time_card.add_row(TimeCardRow.new("2013/5/13", "9:00", "19:00", false, ["11:00", "12:00"], ["15:00", "16:00"]).set_fixed_working_hours("7:00"))
     end
 
     it "残業時間のトータルは2:00となる" do
@@ -19,8 +19,8 @@ describe TimeCard do
   context "始業24:00、終業30:00、休憩25:00〜26:00が2日間のとき" do
     before do
       @time_card = TimeCard.new(1,1)
-      @time_card.add_row(TimeCardRow.new("2013/5/12", "24:00", "30:00",["25:00", "26:00"]).set_fixed_working_hours("7:00"))
-      @time_card.add_row(TimeCardRow.new("2013/5/13", "24:00", "30:00",["25:00", "26:00"]).set_fixed_working_hours("7:00"))
+      @time_card.add_row(TimeCardRow.new("2013/5/12", "24:00", "30:00", false,["25:00", "26:00"]).set_fixed_working_hours("7:00"))
+      @time_card.add_row(TimeCardRow.new("2013/5/13", "24:00", "30:00", false,["25:00", "26:00"]).set_fixed_working_hours("7:00"))
     end
 
     it "深夜時間のトータルは8:00となる" do

data/spec/calc_working_hours/time_recorder_spec.rb

@@ -7,7 +7,7 @@ describe TimeRecorder do
   context "data_sample.csv(Shift_JIS)の通りTimeRecorderが与えられている場合" do
     before do
       path_to_csv = File.expand_path(File.dirname(__FILE__)) + "/data_sample.csv"
-      @time_recorder = TimeRecorder.new(path_to_csv, "Shift_JIS", "従業員番号", "カード番号", "年/月/日", "出勤打刻", "退勤打刻", ["外出打刻", "戻打刻"])
+      @time_recorder = TimeRecorder.new(path_to_csv, "Shift_JIS", "従業員番号", "カード番号", "年/月/日", "出勤打刻", "退勤打刻", false,["外出打刻", "戻打刻"])
     end
 
     it "タイムカードのデータが5件あること" do 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Takashi_U
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 例えば、173:08のような表記の時間を計算するライブラリです
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -92,17 +92,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: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 時間計算