calc_working_hours 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d5cc0ee5afe67a6a508eff529ad9a9e071615bcb
+  data.tar.gz: cdbd651e216f10f240e9f8cd825950a51fa2ba65
+SHA512:
+  metadata.gz: 03624aeda9e6add2527dea1c7fc5e67a1c34dc65e732554d336f89b5b9260edcd033ff377030277106c1dc408c6ad64aac4ba6f70218e322116042d6930b2dbe
+  data.tar.gz: 62e99a66890a65f1e30b635dcde7857f51f85f531ff2a83da95b1ecfc605d61da3f003ac5b75b8db425928c8cc2eee44d11a41834654cd442dd47cd147914908

data/lib/calc_working_hours/calc_helper.rb

@@ -44,7 +44,7 @@ module CalcWorkingHours
           if time.length == 2 && time.class == Array
             if valid_time_format?(time[0]) && valid_time_format?(time[1])
               time.each do |t|
-                if change_to_minute(starting_time) >= change_to_minute(t) || change_to_minute(ending_time) <= change_to_minute(t)
+                if change_to_minute(starting_time) > change_to_minute(t) || change_to_minute(ending_time) < change_to_minute(t)
                   return flag = false 
                 end
               end

data/lib/calc_working_hours/version.rb

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

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -57,6 +57,15 @@ describe TimeCardRow do
     end
   end
 
+  context "始業9:00、終業18:00、休憩9:00〜18:00のとき" do
+    before do
+      @time_card_row = TimeCardRow.new("2013/5/12", "9:00", "18:00", ["9:00", "18:00"])
+    end
+
+    it "労働時間は0:00となる" do 
+      @time_card_row.working_hours.time_string.should == "0:00"
+    end
+  end
 
   context "適正な時間設定と、不適な設定時間を設定したとき" do
     it "set_dateにString以外を設定すると例外が発生する" do

data/spec/calc_working_hours/working_hours_spec.rb

@@ -30,6 +30,10 @@ describe WorkingHours do
       @working_hours.minus_time("1:50").time_string.should == "5:55"
     end
 
+    it "7:45を引くと、0:00になること" do 
+      @working_hours.minus_time("7:45").time_string.should == "0:00"
+    end
+
     it "8:50を引くと、マイナスになるため、例外が発生すること" do
       proc{ @working_hours.minus_time("8:50").time_string }.should raise_error
     end

metadata

@@ -1,59 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Takashi_U
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70203738463680 !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: *70203738463680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70203738462920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203738462920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70203738462180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203738462180
-description: 例えば、173:08のような表記の時間を計算するライブラリです
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "例えば、173:08のような表記の時間を計算するライブラリです"
 email:
 - ''
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,34 +85,27 @@ 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: 2883912784685005867
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2883912784685005867
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
-summary: 時間計算
+specification_version: 4
+summary: "時間計算"
 test_files:
 - spec/calc_working_hours/data_sample.csv
 - spec/calc_working_hours/invalid_data_sample.csv