calc_working_hours 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 43b442d4e77191f65533344781ba9659132c8cdc
+  data.tar.gz: 9b3d97cbb7750cf22d6770a0153edc21d62801a1
+SHA512:
+  metadata.gz: c107a7196c471a54f3f420b37a5841bb1dc19693835e0d44a3145d9160855fbbc1226183b4c601f9c09c87678b9cfc315ce3281856407d3807b24af0e16653c7
+  data.tar.gz: d7c0b1d7100223528da6841dcb157edb9e36b4ded084a13923a0ccd71073d799cff1c10a4fd7dcf0fdbe1061d8f135e6811ef864c1885ddb1eb32d0ba038ff43

data/lib/calc_working_hours/time_card_row.rb

@@ -49,7 +49,7 @@ module CalcWorkingHours
     end
 
     def set_fixed_working_hours(time)
-      if @working_hours.time_string < time
+      if @working_hours.minute < WorkingHours.new(time).minute
         @overtime = @working_hours.minus_time(@working_hours.time_string)
       else
         @overtime = @working_hours.minus_time(time)

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -21,10 +21,14 @@ describe TimeCardRow do
       @time_card_row.working_hours.time_string.should == "8:00"
     end
 
-    it "set_dateにDateクラスのオブジェクトを渡すことで日付を設定できる" do
+    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
@@ -49,9 +53,19 @@ describe TimeCardRow do
       @time_card_row.set_fixed_working_hours("8:20").overtime.time_string.should == "0:00"
     end
 
+  end
+
+  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"])
+    end
 
+    it "所定労働時間を8:00とすると、残業時間は2:28となる" do 
+      @time_card_row.set_fixed_working_hours("8:00").overtime.time_string.should == "2:28"
+    end
   end
 
+
   context "適正な時間設定と、不適な設定時間を設定したとき" do
     it "始業22:00、終業28:00は適正な始業・終業時間設定（0:00〜48:00）なので、エラーは発生しないこと" do
       proc{ TimeCardRow.new("22:00", "28:00") }.should_not raise_error

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Takashi_U
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70179713519400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70179713519400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70179713518660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179713518660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70179713517960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179713517960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
@@ -76,33 +84,26 @@ 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: -646011693737778433
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -646011693737778433
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: 時間計算
 test_files:
 - spec/calc_working_hours/data_sample.csv