calc_working_hours 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: d5cc0ee5afe67a6a508eff529ad9a9e071615bcb
4
+ data.tar.gz: cdbd651e216f10f240e9f8cd825950a51fa2ba65
5
+ SHA512:
6
+ metadata.gz: 03624aeda9e6add2527dea1c7fc5e67a1c34dc65e732554d336f89b5b9260edcd033ff377030277106c1dc408c6ad64aac4ba6f70218e322116042d6930b2dbe
7
+ data.tar.gz: 62e99a66890a65f1e30b635dcde7857f51f85f531ff2a83da95b1ecfc605d61da3f003ac5b75b8db425928c8cc2eee44d11a41834654cd442dd47cd147914908
@@ -44,7 +44,7 @@ module CalcWorkingHours
44
44
  if time.length == 2 && time.class == Array
45
45
  if valid_time_format?(time[0]) && valid_time_format?(time[1])
46
46
  time.each do |t|
47
- if change_to_minute(starting_time) >= change_to_minute(t) || change_to_minute(ending_time) <= change_to_minute(t)
47
+ if change_to_minute(starting_time) > change_to_minute(t) || change_to_minute(ending_time) < change_to_minute(t)
48
48
  return flag = false
49
49
  end
50
50
  end
@@ -1,3 +1,3 @@
1
1
  module CalcWorkingHours
2
- VERSION = "0.1.6"
2
+ VERSION = "0.1.7"
3
3
  end
@@ -57,6 +57,15 @@ describe TimeCardRow do
57
57
  end
58
58
  end
59
59
 
60
+ context "始業9:00、終業18:00、休憩9:00〜18:00のとき" do
61
+ before do
62
+ @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "18:00", ["9:00", "18:00"])
63
+ end
64
+
65
+ it "労働時間は0:00となる" do
66
+ @time_card_row.working_hours.time_string.should == "0:00"
67
+ end
68
+ end
60
69
 
61
70
  context "適正な時間設定と、不適な設定時間を設定したとき" do
62
71
  it "set_dateにString以外を設定すると例外が発生する" do
@@ -30,6 +30,10 @@ describe WorkingHours do
30
30
  @working_hours.minus_time("1:50").time_string.should == "5:55"
31
31
  end
32
32
 
33
+ it "7:45を引くと、0:00になること" do
34
+ @working_hours.minus_time("7:45").time_string.should == "0:00"
35
+ end
36
+
33
37
  it "8:50を引くと、マイナスになるため、例外が発生すること" do
34
38
  proc{ @working_hours.minus_time("8:50").time_string }.should raise_error
35
39
  end
metadata CHANGED
@@ -1,59 +1,67 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: calc_working_hours
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
5
- prerelease:
4
+ version: 0.1.7
6
5
  platform: ruby
7
6
  authors:
8
7
  - Takashi_U
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-09-23 00:00:00.000000000Z
11
+ date: 2013-12-20 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: bundler
16
- requirement: &70203738463680 !ruby/object:Gem::Requirement
17
- none: false
15
+ requirement: !ruby/object:Gem::Requirement
18
16
  requirements:
19
- - - ~>
17
+ - - "~>"
20
18
  - !ruby/object:Gem::Version
21
19
  version: '1.3'
22
20
  type: :development
23
21
  prerelease: false
24
- version_requirements: *70203738463680
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '1.3'
25
27
  - !ruby/object:Gem::Dependency
26
28
  name: rake
27
- requirement: &70203738462920 !ruby/object:Gem::Requirement
28
- none: false
29
+ requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
- - - ! '>='
31
+ - - ">="
31
32
  - !ruby/object:Gem::Version
32
33
  version: '0'
33
34
  type: :development
34
35
  prerelease: false
35
- version_requirements: *70203738462920
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
36
41
  - !ruby/object:Gem::Dependency
37
42
  name: rspec
38
- requirement: &70203738462180 !ruby/object:Gem::Requirement
39
- none: false
43
+ requirement: !ruby/object:Gem::Requirement
40
44
  requirements:
41
- - - ! '>='
45
+ - - ">="
42
46
  - !ruby/object:Gem::Version
43
47
  version: '0'
44
48
  type: :development
45
49
  prerelease: false
46
- version_requirements: *70203738462180
47
- description: 例えば、173:08のような表記の時間を計算するライブラリです
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
55
+ description: "例えば、173:08のような表記の時間を計算するライブラリです"
48
56
  email:
49
57
  - ''
50
58
  executables: []
51
59
  extensions: []
52
60
  extra_rdoc_files: []
53
61
  files:
54
- - .gitignore
55
- - .rspec
56
- - .travis.yml
62
+ - ".gitignore"
63
+ - ".rspec"
64
+ - ".travis.yml"
57
65
  - Gemfile
58
66
  - LICENSE.txt
59
67
  - README.md
@@ -77,34 +85,27 @@ files:
77
85
  homepage: https://github.com/Takashi-U/calc_working_hours
78
86
  licenses:
79
87
  - MIT
88
+ metadata: {}
80
89
  post_install_message:
81
90
  rdoc_options: []
82
91
  require_paths:
83
92
  - lib
84
93
  required_ruby_version: !ruby/object:Gem::Requirement
85
- none: false
86
94
  requirements:
87
- - - ! '>='
95
+ - - ">="
88
96
  - !ruby/object:Gem::Version
89
97
  version: '0'
90
- segments:
91
- - 0
92
- hash: 2883912784685005867
93
98
  required_rubygems_version: !ruby/object:Gem::Requirement
94
- none: false
95
99
  requirements:
96
- - - ! '>='
100
+ - - ">="
97
101
  - !ruby/object:Gem::Version
98
102
  version: '0'
99
- segments:
100
- - 0
101
- hash: 2883912784685005867
102
103
  requirements: []
103
104
  rubyforge_project:
104
- rubygems_version: 1.8.10
105
+ rubygems_version: 2.1.10
105
106
  signing_key:
106
- specification_version: 3
107
- summary: 時間計算
107
+ specification_version: 4
108
+ summary: "時間計算"
108
109
  test_files:
109
110
  - spec/calc_working_hours/data_sample.csv
110
111
  - spec/calc_working_hours/invalid_data_sample.csv