toggl-worktime 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a66d96dab772480dc7aa6ae5e6a13db341d51723ecd37b3fd83aaa65e1425e
-  data.tar.gz: 720c1c233f2ae212143f2d4b9abf235253886e5aa1413e7896c42d70e97ba78a
+  metadata.gz: 0d7d312022057b262ea569daa0ff5a2d4fd81f515c6c0fbe32d4dbbac1d5f8bd
+  data.tar.gz: 2412b9d69c4a482400bde188a1a7523b215c63891f1d7159a7834b257cb673b8
 SHA512:
-  metadata.gz: 2f90838428fcd962bb595c185374d7becca5bbef37535ff5227a8d5df23575f08e84550623d1ee1f9adc57df65c7006490af9ba4230f9664269a0ce1e5396e73
-  data.tar.gz: 171f56fcee2e8c4d0a831f169100f26e5c79b7606bc94fd97ca2d54f06dbfc4e41f9e45edd75de2b4d529a21145d18b6c3e64bcef721754987d7723ceff3086d
+  metadata.gz: a643c84a3603192a66519cc95cf40523ff98bb626702608f958b9494b2ec8fd6c5551554c18cfac95ac71099a6936553361263e5471cecd7e0c1c2c4616cd79b
+  data.tar.gz: 6f1c575654a741742f3e4efcf438fa0ac89bed10b68b685e2aed44b2e4fe5bbbb292b67ff17dc10fa828acb1c2e133133ac3803cb07812b9f8ccde7d7b444b3c

data/exe/toggl-worktime

@@ -10,9 +10,8 @@ Version = Toggl::Worktime::VERSION
 MAX_WORKING_INTERVAL = 10
 DAY_BEGIN_HOUR = 6
 DEFAULT_TIMEZONE = 'Asia/Tokyo'
-ONE_DAY_MINUTES = 24 * 60
 
-driver = Toggl::Worktime::Driver.new
+driver = Toggl::Worktime::Driver.new(max_working_interval: MAX_WORKING_INTERVAL)
 
 month = ARGV[0].to_i
 day = ARGV[1].to_i

data/lib/toggl/worktime/driver.rb

@@ -7,8 +7,9 @@ module Toggl
       attr_reader :toggl
       attr_reader :work_time
 
-      def initialize
+      def initialize(max_working_interval: 10)
         @toggl = TogglV8::API.new
+        @max_working_interval = max_working_interval
         @merger = nil
         @work_time = nil
       end
@@ -27,7 +28,7 @@ module Toggl
 
       def merge!(month, day, hour, timezone)
         time_entries = time_entries(month, day, hour, timezone)
-        @merger = Toggl::Worktime::Merger.new(time_entries)
+        @merger = Toggl::Worktime::Merger.new(time_entries, timezone, @max_working_interval)
         @work_time = @merger.merge
       end
 

data/lib/toggl/worktime/merger.rb

@@ -6,8 +6,12 @@ module Toggl
     class Merger
       attr_reader :total_time
 
-      def initialize(time_entries)
+      ONE_DAY_MINUTES = 24 * 60
+
+      def initialize(time_entries, timezone, max_working_interval)
         @time_entries = time_entries
+        @timezone = timezone
+        @max_working_interval = max_working_interval
         @current_start = nil
         @current_stop = nil
         @continuing = true
@@ -31,14 +35,18 @@ module Toggl
       end
 
       def time_entries_each
-        zone_offset = Toggl::Worktime::Time.zone_offset(DEFAULT_TIMEZONE)
+        zone_offset = Toggl::Worktime::Time.zone_offset(@timezone)
         @time_entries.each do |te|
           start = parse_date(te['start'], zone_offset)
           stop = parse_date(te['stop'], zone_offset)
           @last_stop = stop
           @current_start = start if @current_start.nil?
           @current_stop = stop if @current_stop.nil?
-          @total_time += stop - start
+          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
       end
@@ -49,8 +57,9 @@ module Toggl
       end
 
       def continuing(start)
+        return true if @current_stop.nil?
         interval = (start - @current_stop) * ONE_DAY_MINUTES
-        @continuing = interval < MAX_WORKING_INTERVAL
+        @continuing = interval < @max_working_interval
       end
     end
   end

data/lib/toggl/worktime/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Worktime
-    VERSION = '0.1.8'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-worktime
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomoya KABE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: togglv8