calc_working_hours 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b2fa0cfd4ca5f6a4d76708ec33d08c66fcfc2f
-  data.tar.gz: 28b1ce51ffe176c2da96ae854cec39ecb05a057e
+  metadata.gz: ea21e50f8b5b8af5843d898a5019f54bd5e4c4d0
+  data.tar.gz: 5eb6efc9ff0decf4ca6348c62007ddad425d82cb
 SHA512:
-  metadata.gz: 741b6c8c747df2d3732f5e387df7daab5d22668d10034f5ea37cc75117d6f6f7ba24038d0e5f21ab5394705e366b518bd84c2d7a3571c750f03749b583d63633
-  data.tar.gz: 76d9ec1e42ac1e42acf2e50074a0e4ebc2f06086f2c347d14c6c7f6f2d195243b64e94ac6f945fff874335f7c3576cb78fc0f51ca572373b2a48bc54fc102681
+  metadata.gz: 16e476bd0df661b86ecf69877ca07adbf3e12ef4f14cee526d120247f3dff77b30a0e771542b8d596211333378d06a204f4543a652fd787933ecc546fdf099a6
+  data.tar.gz: 2c9b9ca198e8b52abffe72ce7718ddc022163947fe30cd43ce912926a47058c41954459c1a9a78b45bc37f2d7ff917fb349675fde7bdade764f6b3da1e309a07

data/lib/calc_working_hours/time_card.rb

@@ -45,5 +45,9 @@ module CalcWorkingHours
       return WorkingHours.new("0:00").add_array_time(array_of_working_hours_in_range).time_string
     end
 
+    def total_night_time 
+      self.total_working_hours_in_range("22:00", "29:00")
+    end
+
   end
 end

data/lib/calc_working_hours/time_card_row.rb

@@ -5,7 +5,7 @@ require "date"
 module CalcWorkingHours
 
   class TimeCardRow
-    attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string, :time_point, :working_hours_in_range, :over_time, :id
+    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)
       unless date_string.class == String
         raise "failure set_date (date should string class)! TimeCardRow class"
@@ -84,7 +84,12 @@ module CalcWorkingHours
           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
+      return WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
     end
+
+    def between_10pm_and_5am
+      self.working_hours_in_range("22:00", "29:00")
+    end
+
   end
 end

data/lib/calc_working_hours/version.rb

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

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -44,7 +44,6 @@ describe TimeCardRow do
     it "所定労働時間を8:20とすると、残業時間は0:00となる" do 
       @time_card_row.set_fixed_working_hours("8:20").over_time.time_string.should == "0:00"
     end
-
   end
 
   context "始業11:30、終業23:34、休憩15:38〜17:14のとき" do
@@ -103,7 +102,18 @@ describe TimeCardRow do
     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
     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"
+    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"
+    end
   end
 
 end

data/spec/calc_working_hours/time_card_spec.rb

@@ -14,6 +14,18 @@ describe TimeCard do
     it "残業時間のトータルは2:00となる" do
       @time_card.total_over_time.should == "2:00"
     end
+  end
 
+  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"))
+    end
+
+    it "深夜時間のトータルは8:00となる" do
+      @time_card.total_night_time.should == "8:00"
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takashi_U
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler