calc_working_hours 0.0.2 → 0.0.3

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/calc_working_hours/working_hours.rb

@@ -8,30 +8,47 @@ module CalcWorkingHours
       if valid_time_format?(str)
         @time_string = str
         self.to_minute
+        self
       else
         raise "failure initialize (invalid time format!)"
       end
     end
 
     def to_minute
-      /(\d+):(\d+)/ =~ @time_string
-      @minute = $1.to_i * 60 + $2.to_i
+      @minute = change_to_minute(@time_string)
     end
 
     def add_time(str)
       if valid_time_format?(str)
-        /(\d+):(\d+)/ =~ str
-        minute_for_adding = $1.to_i * 60 + $2.to_i
-        @minute = @minute + minute_for_adding
-        hour = @minute.div(60)
-        minute = @minute % 60
-        @time_string = hour.to_s + ":" + minute.to_s
+        @minute = @minute + change_to_minute(str)
+        @time_string = change_to_time_string(@minute)
         self
       else
         raise "failure add_time (invalid time format!)"
       end
     end
 
+    def add_array_time(array)
+      array.each do |str|
+        self.add_time(str)
+      end
+      self
+    end
+
+    def minus_time(str)
+      if valid_time_format?(str)
+        minute = @minute - change_to_minute(str)
+        if minute >= 0
+          @minute = minute
+          @time_string = change_to_time_string(@minute)
+          self
+        else 
+          raise "failure add_time (invalid time format!)"
+        end
+      end
+    end
+
+    private
     def valid_time_format?(str)
       flag = false
       if str.class == String
@@ -43,5 +60,17 @@ module CalcWorkingHours
       end
       return flag
     end
+
+    def change_to_minute(str)
+      /(\d+):(\d+)/ =~ str
+      return $1.to_i * 60 + $2.to_i
+    end
+
+    def change_to_time_string(minute)
+      hour = minute.div(60)
+      minute = minute % 60
+      return hour.to_s + ":" + minute.to_s
+    end
+
   end
 end

data/spec/calc_working_hours/working_hours_spec.rb

@@ -25,6 +25,24 @@ describe WorkingHours do
     it "2:25を加え、さらに3:00を加えると13:10になること（add_timeはチェインできること）" do
       @working_hours.add_time("2:25").add_time("3:00").time_string.should == "13:10"
     end
+
+    it "1:50を引くと、5:55になること" do
+      @working_hours.minus_time("1:50").time_string.should == "5:55"
+    end
+
+    it "8:50を引くと、マイナスになるため、例外が発生すること" do
+      proc{ @working_hours.minus_time("8:50").time_string }.should raise_error
+    end
+
+    it "2:25を引き、さらに3:00を引くと2:20になること（minus_timeはチェインできること）" do
+      @working_hours.minus_time("2:25").minus_time("3:00").time_string.should == "2:20"
+    end
+
+    it '["1:10", "2:20", "3:30", "4:40"]を足すと、19:35になること' do
+      @working_hours.add_array_time(["1:10", "2:20", "3:30", "4:40"]).time_string.should == "19:25"
+    end
+      
+
   end
 
   context "7:70（7時間70分）が労働時間だった場合" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000Z
+date: 2013-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70291272497220 !ruby/object:Gem::Requirement
+  requirement: &70166375149760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70291272497220
+  version_requirements: *70166375149760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70291272496380 !ruby/object:Gem::Requirement
+  requirement: &70166375149160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291272496380
+  version_requirements: *70166375149160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70291272494680 !ruby/object:Gem::Requirement
+  requirement: &70166375148340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291272494680
+  version_requirements: *70166375148340
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''