calc_working_hours 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cc0ee5afe67a6a508eff529ad9a9e071615bcb
-  data.tar.gz: cdbd651e216f10f240e9f8cd825950a51fa2ba65
+  metadata.gz: 513398a1273bd3112f1f9e2cd535e6d8576c1235
+  data.tar.gz: 9ebe87beb7d07e0398d82bd6cacfcb9857291081
 SHA512:
-  metadata.gz: 03624aeda9e6add2527dea1c7fc5e67a1c34dc65e732554d336f89b5b9260edcd033ff377030277106c1dc408c6ad64aac4ba6f70218e322116042d6930b2dbe
-  data.tar.gz: 62e99a66890a65f1e30b635dcde7857f51f85f531ff2a83da95b1ecfc605d61da3f003ac5b75b8db425928c8cc2eee44d11a41834654cd442dd47cd147914908
+  metadata.gz: 1aea94eb1024253b31419fa46e8b812908613efbba29c46df87d3789fbd489fbe95150346a5e3d92c0095e8c24ddc8e96f8f2d83af53eea2db57020cdcdfb9af
+  data.tar.gz: cce115e0e5609292517155b8033517b138ef9ed0570a294b3873aef857cfb83307f9781f9a0ae04bc2ef6c5bfb529e5a4d529cb934a195e89b283742bd3b6474

data/lib/calc_working_hours/time_card.rb

@@ -24,6 +24,14 @@ module CalcWorkingHours
       return WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
     end
 
+    def total_over_time
+      array_of_over_time = []
+      @time_card_rows.each do |row|
+        array_of_over_time << row.over_time.time_string
+      end
+      return WorkingHours.new("0:00").add_array_time(array_of_over_time).time_string      
+    end
+
     def total_working_hours_in_range(start_range, end_range)
       array_of_working_hours_in_range = []
       if start_range == true && end_range == true

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, :overtime, :id
+    attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string, :time_point, :working_hours_in_range, :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"
@@ -56,9 +56,9 @@ module CalcWorkingHours
       time = WorkingHours.new(time)
       working_hours = WorkingHours.new(@working_hours.time_string)
       if working_hours.minute < time.minute
-        @overtime = working_hours.minus_time(working_hours.time_string)
+        @over_time = working_hours.minus_time(working_hours.time_string)
       else
-        @overtime = working_hours.minus_time(time.time_string)
+        @over_time = working_hours.minus_time(time.time_string)
       end
       self
     end

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -38,11 +38,11 @@ describe TimeCardRow do
     end
 
     it "所定労働時間を7:20とすると、残業時間は0:40となる" do 
-      @time_card_row.set_fixed_working_hours("7:20").overtime.time_string.should == "0:40"
+      @time_card_row.set_fixed_working_hours("7:20").over_time.time_string.should == "0:40"
     end
 
     it "所定労働時間を8:20とすると、残業時間は0:00となる" do 
-      @time_card_row.set_fixed_working_hours("8:20").overtime.time_string.should == "0:00"
+      @time_card_row.set_fixed_working_hours("8:20").over_time.time_string.should == "0:00"
     end
 
   end
@@ -53,7 +53,7 @@ describe TimeCardRow do
     end
 
     it "所定労働時間を8:00とすると、残業時間は2:28となる" do 
-      @time_card_row.set_fixed_working_hours("8:00").overtime.time_string.should == "2:28"
+      @time_card_row.set_fixed_working_hours("8:00").over_time.time_string.should == "2:28"
     end
   end
 

data/spec/calc_working_hours/time_card_spec.rb

@@ -4,10 +4,15 @@ require 'spec_helper'
 include CalcWorkingHours
 
 describe TimeCard do
-  context "次の通りTimeCardRowが与えられている場合" do
+  context "始業9:00、終業19:00、休憩11:00〜12:00、15:00〜16:00が2日間のとき" do
     before do
-      @time_card = TimeCard.new
-#      puts "hogefuga"
+      @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"))
+    end
+
+    it "残業時間のトータルは2:00となる" do
+      @time_card.total_over_time.should == "2:00"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Takashi_U
@@ -14,54 +14,54 @@ dependencies:
   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のような表記の時間を計算するライブラリです"
+description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -92,20 +92,20 @@ 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.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: "時間計算"
+summary: 時間計算
 test_files:
 - spec/calc_working_hours/data_sample.csv
 - spec/calc_working_hours/invalid_data_sample.csv