toggl-worktime 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f726845f28a920e1348ee0fd4fc2b136a6394b8f4007ea8498095b6eddc39e5a
-  data.tar.gz: e820f632627f8b8b137008cb48b4a9678ec14682aef3256750ccb8367a4a7d65
+  metadata.gz: cd9c63f2884fb32f927ce384477911a5a87984cc18a6ffa7d6cec577ed5eb9b6
+  data.tar.gz: 2ce8946cf15a0b258d18820cc5347656cc2c7b089ae21122571b158cd32c5f2e
 SHA512:
-  metadata.gz: 4352863b125a2315ded1ec35702f0a04976fd2a3957ad0fd16a487251a98869f653de2fa01931a81e77c8a05950fafc4e56fe2cde32745b3d673d0ae430f91ce
-  data.tar.gz: d890b93dc1664bf686c5a36cbc271b24a5f7b95fc66b02a4a9bfa40cfb35d301e01feb89eb46e4fd8d9462d91c4daf89a904a31e3ab8343ba21b3f6a8d290f8d
+  metadata.gz: 1fda7e45a8e887561adc06a3e24f98f0c50a225b8188756c8cfa6576ed9bc27274505069342e077c32de17f846013728be73813f2478715e530b5d759198358f
+  data.tar.gz: eae7f300a27c108b2db455c6459eaa1c05319de6f2ccad040b5ec0d490fc8aece985b75e784108f341130d5ee961323a68881439a93aa9a17fac3a8231d9e3d8

data/.rubocop.yml

@@ -8,3 +8,7 @@ Style/Documentation:
 
 Metrics/MethodLength:
   Max: 15
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/lib/toggl/worktime/merger.rb

@@ -8,7 +8,7 @@ module Toggl
     class Merger
       attr_reader :total_time
 
-      ONE_DAY_MINUTES = 24 * 60
+      ONE_MINUTE_SECONDS = 60
 
       def initialize(time_entries, config)
         @time_entries = time_entries
@@ -28,10 +28,12 @@ module Toggl
             next
           end
           work_time << [@current_start, @current_stop]
+          @total_time += @current_stop - @current_start
           @current_start = start
           @current_stop = stop
         end
         work_time << [@current_start, @last_stop]
+        @total_time += @current_stop - @current_start
         work_time
       end
 
@@ -45,8 +47,6 @@ module Toggl
           @current_stop = stop if @current_stop.nil?
           if start.nil? || stop.nil?
             warn 'start or stop time is nil: total time may be incomplete'
-          else
-            @total_time += stop - start
           end
           yield [start, stop]
         end
@@ -54,12 +54,14 @@ module Toggl
 
       def parse_date(date, zone_offset)
         return nil if date.nil?
+
         ::Time.parse(date).getlocal(zone_offset)
       end
 
       def continuing(start)
         return true if @current_stop.nil?
-        interval = (start - @current_stop) * ONE_DAY_MINUTES
+
+        interval = (start - @current_stop) / ONE_MINUTE_SECONDS
         @continuing = interval < @config.working_interval_min
       end
     end

data/lib/toggl/worktime/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Worktime
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-worktime
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tomoya KABE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print