calc_working_hours 0.1.5 → 0.1.6

data/lib/calc_working_hours/time_card_row.rb

@@ -6,7 +6,11 @@ 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)
+    def initialize(date_string, starting_time, ending_time, *break_time)
+      unless date_string.class == String
+        raise "failure set_date (date should string class)! TimeCardRow class"
+      end
+
       unless CalcHelper.valid_time_format?(starting_time) && CalcHelper.valid_time_format?(ending_time)
         raise "failure initialize (invalid time format! TimeCardRow class)"
       end
@@ -31,7 +35,7 @@ module CalcWorkingHours
       unless break_time.empty?
         total_break_time_string = CalcHelper.total_break_time(break_time).time_string
       end
-
+      @date_string = date_string
       @starting_time = starting_time
       @ending_time = ending_time
       @break_time = break_time
@@ -59,14 +63,6 @@ module CalcWorkingHours
       self
     end
 
-    def set_date(date)
-      unless date.class == String
-        raise "failure set_date (date should string class)! TimeCardRow class"
-      end
-      @date_string = date
-      self
-    end
-
     def working_hours_in_range(start_range, end_range)
       i = @time_point.size / 2
       starting_time, ending_time = ""

data/lib/calc_working_hours/time_recorder.rb

@@ -5,7 +5,7 @@ module CalcWorkingHours
 
   class TimeRecorder
     attr_reader :time_cards
-    def initialize(path_to_csv, set_encode, id_row, card_id_row, starting_time_row, ending_time_row, date_row, *break_time_rows)
+    def initialize(path_to_csv, set_encode, id_row, card_id_row, date_row, starting_time_row, ending_time_row, *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
@@ -27,10 +27,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[starting_time_row], row[ending_time_row], *break_times).set_date(row[date_row]))
+            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], *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[starting_time_row], row[ending_time_row], *break_times).set_date(row[date_row]))
+            time_cards[row[card_id_row]].add_row(TimeCardRow.new(row[date_row], row[starting_time_row], row[ending_time_row], *break_times))
           end
         end
       end

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 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("9:00", "19:00", ["11:00", "12:00"], ["15:00", "16:00"])
+      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "19:00", ["11:00", "12:00"], ["15:00", "16:00"])
     end
 
     it "始業時間は9:00となっている" do 
@@ -21,14 +21,6 @@ describe TimeCardRow do
       @time_card_row.working_hours.time_string.should == "8:00"
     end
 
-    it "set_dateに日付（任意の文字列）を設定できる" do
-      @time_card_row.set_date("2013/8/1").date_string.class.should == String
-    end
-
-    it "set_dateにString以外を設定すると例外が発生する" do
-      proc { @time_card_row.set_date(Date.new(2013,8,1)) }.should raise_error
-    end
-
     it "time_pointは9:00,11:00,12:00,15:00,16:00,19:00" do 
       @time_card_row.time_point.should == ["9:00", "11:00", "12:00", "15:00", "16:00", "19:00"]
     end
@@ -57,7 +49,7 @@ describe TimeCardRow do
 
   context "始業11:30、終業23:34、休憩15:38〜17:14のとき" do
     before do
-      @time_card_row = TimeCardRow.new("11:30", "23:34", ["15:38", "17:14"])
+      @time_card_row = TimeCardRow.new("2013/5/12", "11:30", "23:34", ["15:38", "17:14"])
     end
 
     it "所定労働時間を8:00とすると、残業時間は2:28となる" do 
@@ -67,36 +59,40 @@ 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
+    end
+
     it "始業22:00、終業28:00は適正な始業・終業時間設定（0:00〜48:00）なので、エラーは発生しないこと" do
-      proc{ TimeCardRow.new("22:00", "28:00") }.should_not raise_error
+      proc{ TimeCardRow.new("2013/5/12", "22:00", "28:00") }.should_not raise_error
     end
 
     it "始業44:00、終業50:00は不適正な始業・終業時間設定なので、エラーが発生すること" do
-      proc{ TimeCardRow.new("44:00", "50:00") }.should raise_error
+      proc{ TimeCardRow.new("2013/5/12", "44:00", "50:00") }.should raise_error
     end
 
     it "始業四:00、終業5:00は不適正な時間フォーマットなので、エラーが発生すること" do
-      proc{ TimeCardRow.new("四:00", "5:00") }.should raise_error
+      proc{ TimeCardRow.new("2013/5/12", "四:00", "5:00") }.should raise_error
     end
 
     it "始業9:00、終業19:00の時系列に誤りが無いので、エラーは発生しないこと" do 
-      proc { TimeCardRow.new("9:00", "19:00") }.should_not raise_error
+      proc { TimeCardRow.new("2013/5/12", "9:00", "19:00") }.should_not raise_error
     end
 
     it "始業18:00、終業8:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("18:00", "9:00") }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "18:00", "9:00") }.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩12:00〜11:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("8:00", "19:00", ["12:00", "10:00"]) }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", ["12:00", "10:00"]) }.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩12:00は休憩時間設定が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("8:00", "19:00", "12:00") }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", "12:00") }.should raise_error
     end
 
     it "始業8:00、終業19:00、休憩7:00〜11:00は時系列が誤っているので、エラーが発生すること" do
-      proc { TimeCardRow.new("8:00", "19:00", ["7:00", "10:00"]) }.should raise_error
+      proc { TimeCardRow.new("2013/5/12", "8:00", "19:00", ["7:00", "10:00"]) }.should raise_error
     end
 
   end

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", "従業員番号", "カード番号", "年/月/日", "出勤打刻", "退勤打刻", ["外出打刻", "戻打刻"])
     end
 
     it "タイムカードのデータが5件あること" do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70285409908500 !ruby/object:Gem::Requirement
+  requirement: &70203738463680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70285409908500
+  version_requirements: *70203738463680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285409907800 !ruby/object:Gem::Requirement
+  requirement: &70203738462920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285409907800
+  version_requirements: *70203738462920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285409907060 !ruby/object:Gem::Requirement
+  requirement: &70203738462180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285409907060
+  version_requirements: *70203738462180
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1838675914513887134
+      hash: 2883912784685005867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1838675914513887134
+      hash: 2883912784685005867
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10