time_log_robot 0.1.2.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71827460802d842afc432e63f81e43dc67430b73
-  data.tar.gz: e298a0e013600b8ceecbb17c96f450b1f92eed4e
+  metadata.gz: 0437011ed9ab0e3431a24088f3c80d3335afb95b
+  data.tar.gz: 4af3210d01a89d4edd79e9a702f321b34446cb47
 SHA512:
-  metadata.gz: cf45dbe4c59830766700c4b413ff40fd69deb342807ddf7cc6be3b662315b6f37f33fc9a4dcc1476c6c9c1da5962698ec89afa97910ab9d3633e00c33468310a
-  data.tar.gz: 3b7f530b071a53e1741167165adcc55d78fdb99a923dc63487b04397c1bc9660299734f79c7205f8bb3ab90f4b912894321c1ea37e7393461e9e1807e4c130d8
+  metadata.gz: 3bd0f6e19e8bd804d5f9d369785bf2f55a9b8eb1a905deaaae0f7b628fdf54f7a186d60e270f0da826c519523662501ccea9925e454b5a798579321fba4a41ed
+  data.tar.gz: ab8b0d0de4d4332abbe2e15ef5360fdcf18881d15d66ab8a5b8568d32bffdee2c7b8760d8bc8cf4c78866ec08a32cfe25e88b507294129af683f1914cb002cea

data/.gitignore

@@ -1 +1,2 @@
 pkg/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    time_log_robot (0.1.2)
+    time_log_robot (0.1.3)
       activesupport (~> 4.2, >= 4.2.6)
       commander (~> 4.1, >= 4.1.6)
       httparty (~> 0.13, >= 0.13.0)
@@ -18,7 +18,6 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     builder (3.2.2)
-    coderay (1.1.1)
     commander (4.1.6)
       highline (~> 1.6.11)
     highline (1.6.21)
@@ -26,27 +25,16 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    interception (0.5)
     json (1.8.3)
-    method_source (0.8.2)
     minitest (5.8.4)
-    minitest-emoji (2.0.0)
     minitest-reporters (1.1.9)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_xml (0.5.5)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-rescue (1.4.4)
-      interception (>= 0.5)
-      pry
     rake (10.5.0)
     ruby-progressbar (1.8.1)
-    slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -56,10 +44,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
-  minitest
-  minitest-emoji
-  minitest-reporters
-  pry-rescue
+  minitest (~> 5.8)
+  minitest-reporters (~> 1.1)
   rake (~> 10.5)
   time_log_robot!
 

data/Rakefile

@@ -5,13 +5,15 @@ desc 'Run in IRB for debugging'
 task :console do
   require 'irb'
   require 'irb/completion'
-  require 'time_log_robot'
+  require 'pp'
+  require 'yaml'
+  require 'active_support'
+  require 'httparty'
+  Dir[File.expand_path "lib/**/*.rb"].each{|file| require_relative file }
   ARGV.clear
   IRB.start
 end
 
-# @TODO Uncomment when it works! - `rake test`
-
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']

data/lib/time_log_robot/toggl/report.rb

@@ -7,12 +7,14 @@ module TimeLogRobot
 
       base_uri 'https://toggl.com/reports/api/v2'
 
+      # TODO Refactor to avoid having to pass around `since` so much
       class << self
         def fetch(since: nil)
           since ||= Date.today.beginning_of_week(:saturday).to_time
           response = get('/details', basic_auth: auth, query: query(since))
           if response.success?
-            response['data']
+            pages = number_of_pages(response['total_count'])
+            aggregate_entries(response['data'], pages, since)
           else
             raise FetchError, response['error']
           end
@@ -21,6 +23,26 @@ module TimeLogRobot
 
         private
 
+        def aggregate_entries(entries, pages, since)
+          2.upto(pages) do |page|
+            entries += get_entries_from_next_page(since, page)
+          end
+          entries
+        end
+
+        def get_entries_from_next_page(since, page)
+          built_query = query(since).merge(page: page)
+          response = get('/details', basic_auth: auth, query: built_query)
+          response['data']
+        end
+
+        def number_of_pages(count)
+          remaining_entries = count % 50
+          pages = count / 50
+          pages += 1 if remaining_entries > 0
+          return pages
+        end
+
         def auth
           {
             username: token,

data/lib/time_log_robot/version.rb

@@ -1,3 +1,3 @@
 module TimeLogRobot
-  VERSION = '0.1.2.1'
+  VERSION = '0.1.3'
 end

data/test/test_helper.rb

@@ -4,7 +4,6 @@ require 'minitest/emoji'
 require 'minitest/reporters'
 require 'yaml'
 require 'active_support'
-# require 'pry-rescue/minitest'
 require 'httparty'
 
 Dir[File.expand_path "lib/**/*.rb"].each{|file| require_relative file }

data/time_log_robot.gemspec

@@ -21,10 +21,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.5'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-emoji'
-  spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'pry-rescue'
+  spec.add_development_dependency 'minitest', '~> 5.8'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.1'
 
   spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.6'
   spec.add_runtime_dependency 'commander', '~> 4.1', '>= 4.1.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_log_robot
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Mark J. Lehman
@@ -42,58 +42,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-emoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rescue
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement