togglv8 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2c12ae09772a1296677907a4e684d3ad5cfde5
-  data.tar.gz: 5afd4390ec69c38f3a8795e55b9e38a14f96ada7
+  metadata.gz: f78f0515e742e278468d6265c6841df07f164230
+  data.tar.gz: f78a57c6e31c97ddc5b54679957228e7afac77ed
 SHA512:
-  metadata.gz: 96b68a6420a5751a764a8bb54400be952281958d1325b86581ff39d5faa176807cd235a94795e5eb3802228e7f35bdc12bdda2c0b94b89fd07afbbb4b8844e38
-  data.tar.gz: 2be636c2115bc9be8bb66ebcdedcf8f46be8897d40256deccf96e57af5c7078f5e83a975e58ea133f8ee599b2c263c49fb48cbc2b7ed321952af5c6470860a4c
+  metadata.gz: bd36c398494606943d6ba8793a3035864e155a1aae42bfc3844289a362f82e3cf58b9cb16bbc0b72539b3913e886dda59bc9fb7200b5d58dfd1e54935f08a570
+  data.tar.gz: fb47297ebb39ab70d08dd80b9e6380f6fdfd306a5aa9d746de1c37ed19f93ba3afb13fb7ac5a170056ccb04613c7694bb11dc77256ff1737268e615dfdbb58e2

data/README.md

@@ -36,16 +36,18 @@ toggl_api    = TogglV8::API.new(<API_TOKEN>)
 user         = toggl_api.me(all=true)
 workspaces   = toggl_api.my_workspaces(user)
 workspace_id = workspaces.first['id']
-toggl_api.create_time_entry({description: "Workspace time entry",
-        wid: workspace_id,
-        duration: 1200,
-        start: "2015-08-18T01:13:40.000Z",
-        created_with: "My awesome Ruby application"})
+toggl_api.create_time_entry({
+  'description' => "Workspace time entry",
+  'wid' => workspace_id,
+  'duration' => 1200,
+  'start' => "2015-08-18T01:13:40.000Z",
+  'created_with' => "My awesome Ruby application"
+})
 ```
 
 See specs for more examples.
 
-**Note:** Requests are rate-limited. See [Toggl API docs](https://github.com/toggl/toggl_api_docs#the-api-format):
+**Note:** Requests are rate-limited. The togglv8 gem will handle a 429 response by pausing for 1 second and trying again, for up to 3 attempts. See [Toggl API docs](https://github.com/toggl/toggl_api_docs#the-api-format):
 
 > For rate limiting we have implemented a Leaky bucket. When a limit has been hit the request will get a HTTP 429 response and it's the task of the client to sleep/wait until bucket is empty. Limits will and can change during time, but a safe window will be 1 request per second. Limiting is applied per api token per IP, meaning two users from the same IP will get their rate allocated separately.
 
@@ -59,7 +61,9 @@ Also available on [DocumentUp](https://documentup.com/kanet77/togglv8)
 
 Open `coverage/index.html` to see test coverage.
 
-As of 2015-08-21, coverage is "90.39% covered at 6.16 hits/line" according to [SimpleCov](https://rubygems.org/gems/simplecov).
+As of 2015-12-10, coverage is "98.04% covered at 9.5 hits/line" according to [SimpleCov](https://rubygems.org/gems/simplecov).
+
+**Note:** Coverage is 91.2% when Pro account features are not tested.
 
 ## Acknowledgements
 
@@ -68,12 +72,14 @@ As of 2015-08-21, coverage is "90.39% covered at 6.16 hits/line" according to [S
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/togglv8/fork )
+1. Fork it ( https://github.com/kanet77/togglv8/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
+Pull Requests that include tests are **much** more likely to be accepted and merged quickly.
+
 ## License
 
-Copyright (c) 2013-2015 Tom Kane. Released under the [MIT License](http://opensource.org/licenses/mit-license.php). See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2013-2015 Tom Kane. Released under the [MIT License](http://opensource.org/licenses/mit-license.php). See [LICENSE.txt](LICENSE.txt) for details.

data/lib/togglv8/clients.rb

@@ -14,7 +14,7 @@ module TogglV8
 
     def create_client(params)
       requireParams(params, ['name', 'wid'])
-      post "clients", {client: params}
+      post "clients", { 'client' => params }
     end
 
     def get_client(client_id)

data/lib/togglv8/projects.rb

@@ -98,13 +98,14 @@ module TogglV8
 
     # [Get project tasks](https://github.com/toggl/toggl_api_docs/blob/master/chapters/projects.md#get-project-tasks)
     def get_project_tasks(project_id)
-      get "projects/#{project_id}/project_tasks"
+      get "projects/#{project_id}/tasks"
     end
 
     # [Get workspace projects](https://github.com/toggl/toggl_api_docs/blob/master/chapters/projects.md#get-workspace-projects)
 
     # [Delete multiple projects](https://github.com/toggl/toggl_api_docs/blob/master/chapters/projects.md#delete-multiple-projects)
     def delete_projects(project_ids)
+      return if project_ids.nil?
       delete "projects/#{project_ids.join(',')}"
     end
   end

data/lib/togglv8/tasks.rb

@@ -20,7 +20,7 @@ module TogglV8
     # uname             : full name of the person to whom the task is assigned to
 
     def create_task(params)
-      requireParams(params, [:name, :pid])
+      requireParams(params, ['name', 'pid'])
       post "tasks", { 'task' => params }
     end
 
@@ -30,11 +30,11 @@ module TogglV8
 
     # ex: update_task(1894675, {active: true, estimated_seconds: 4500, fields: "done_seconds,uname"})
     def update_task(task_id, params)
-      put "tasks/#{task_id.join(',')}", { 'task' => params }
+      put "tasks/#{task_id}", { 'task' => params }
     end
 
     def delete_task(task_id)
-      delete "tasks/#{task_id.join(',')}"
+      delete "tasks/#{task_id}"
     end
 
     # ------------ #
@@ -42,10 +42,12 @@ module TogglV8
     # ------------ #
 
     def update_tasks(task_ids, params)
+      return if task_ids.nil?
       put "tasks/#{task_ids.join(',')}", { 'task' => params }
     end
 
     def delete_tasks(task_ids)
+      return if task_ids.nil?
       delete "tasks/#{task_ids.join(',')}"
     end
 

data/lib/togglv8/time_entries.rb

@@ -82,9 +82,11 @@ module TogglV8
       get "time_entries%s" % [params.empty? ? "" : "?#{params.join('&')}"]
     end
 
-    # Example params: {"tags":["billed","productive"], "tag_action": "add"}
+    # Example params: {'tags' =>['billed','productive'], 'tag_action' => 'add'}
     # tag_action can be 'add' or 'remove'
     def update_time_entries_tags(time_entry_ids, params)
+      return if time_entry_ids.nil?
+      requireParams(params, ['tags', 'tag_action'])
       put "time_entries/#{time_entry_ids.join(',')}", { 'time_entry' => params }
     end
   end

data/lib/togglv8/users.rb

@@ -21,8 +21,8 @@ module TogglV8
     # new_blog_post             : an object with toggl blog post title and link
 
     def me(all=nil)
-      # TODO: Reconcile this with get_client_projects
-      # NOTE: response['since'] is discarded
+      # NOTE: response['since'] is discarded because it is outside response['data']
+      #       (See TogglV8::API#get in lib/togglv8.rb)
       get "me%s" % [all.nil? ? "" : "?with_related_data=#{all}"]
     end
 
@@ -38,7 +38,6 @@ module TogglV8
       projects.delete_if { |p| p['server_deleted_at'] }
     end
 
-    # TODO: Test my_deleted_projects
     def my_deleted_projects(user=nil)
       user = me(all=true) if user.nil?
       return {} unless user['projects']
@@ -51,6 +50,11 @@ module TogglV8
       user['tags'] || {}
     end
 
+    def my_tasks(user=nil)
+      user = me(all=true) if user.nil?
+      user['tasks'] || {}
+    end
+
     def my_time_entries(user=nil)
       user = me(all=true) if user.nil?
       user['time_entries'] || {}

data/lib/togglv8/version.rb

@@ -1,4 +1,4 @@
 module TogglV8
   # :section:
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/togglv8.rb

@@ -85,13 +85,12 @@ module TogglV8
       loop do
         i += 1
         full_resp = procs[:api_call].call
-        @logger.ap(full_resp.env, :debug)
+        # @logger.ap(full_resp.env, :debug)
         break if full_resp.status != 429 || i >= MAX_RETRIES
         sleep(DELAY_SEC)
       end
 
-      raise "HTTP Status: #{full_resp.status}" unless full_resp.status.between?(200,299)
-      raise Oj.dump(full_resp.env) unless full_resp.success?
+      raise "HTTP Status: #{full_resp.status}" unless full_resp.success?
       return {} if full_resp.body.nil? || full_resp.body == 'null'
 
       full_resp
@@ -99,7 +98,7 @@ module TogglV8
 
     def get(resource)
       full_resp = _call_api(debug_output: lambda { "GET #{resource}" },
-                           api_call: lambda { self.conn.get(resource) } )
+                            api_call: lambda { self.conn.get(resource) } )
       return {} if full_resp == {}
       resp = Oj.load(full_resp.body)
       return resp['data'] if resp.respond_to?(:has_key?) && resp.has_key?('data')
@@ -108,7 +107,7 @@ module TogglV8
 
     def post(resource, data='')
       full_resp = _call_api(debug_output: lambda { "POST #{resource} / #{data}" },
-                           api_call: lambda { self.conn.post(resource, Oj.dump(data)) } )
+                            api_call: lambda { self.conn.post(resource, Oj.dump(data)) } )
       return {} if full_resp == {}
       resp = Oj.load(full_resp.body)
       resp['data']
@@ -116,7 +115,7 @@ module TogglV8
 
     def put(resource, data='')
       full_resp = _call_api(debug_output: lambda { "PUT #{resource} / #{data}" },
-                           api_call: lambda { self.conn.put(resource, Oj.dump(data)) } )
+                            api_call: lambda { self.conn.put(resource, Oj.dump(data)) } )
       return {} if full_resp == {}
       resp = Oj.load(full_resp.body)
       resp['data']
@@ -124,7 +123,7 @@ module TogglV8
 
     def delete(resource)
       full_resp = _call_api(debug_output: lambda { "DELETE #{resource}" },
-                           api_call: lambda { self.conn.delete(resource) } )
+                            api_call: lambda { self.conn.delete(resource) } )
       return {} if full_resp == {}
       full_resp.body
     end

data/spec/lib/togglv8/clients_spec.rb

@@ -127,12 +127,16 @@ describe 'Clients' do
       expect(client).to include(new_values)
     end
 
-    it 'updates Pro project data', :pro_account do
+    # It appears hourly rate is no longer tied to a client despite the docs:
+    # https://github.com/toggl/toggl_api_docs/blob/master/chapters/clients.md#clients
+    xit 'updates Pro client data', :pro_account do
       new_values = {
         'hrate' => '7.77',
         'cur' => 'USD',
       }
       client = @toggl.update_client(@client['id'], new_values)
+
+      client = @toggl.get_client(@client['id'])
       expect(client).to include(new_values)
     end
   end

data/spec/lib/togglv8/projects_spec.rb

@@ -64,15 +64,14 @@ describe 'Projects' do
         'active' => false,
         'auto_estimates' => true,
       }
-
       project = @toggl.update_project(@project['id'], new_values)
       expect(project).to include(new_values)
     end
 
     it 'updates Pro project data', :pro_account do
       new_values = {
-        'template' => 'true',
-        'billable' => 'true',
+        'template' => true,
+        'billable' => true,
       }
       project = @toggl.update_project(@project['id'], new_values)
       expect(project).to include(new_values)

data/spec/lib/togglv8/tasks_spec.rb

@@ -3,7 +3,7 @@ describe 'Tasks', :pro_account do
     @toggl = TogglV8::API.new(Testing::API_TOKEN)
     @workspaces = @toggl.workspaces
     @workspace_id = @workspaces.first['id']
-    @project = @toggl.create_project({ name: 'project with a task', wid: @workspace_id })
+    @project = @toggl.create_project({ 'name' => 'project with a task', 'wid' => @workspace_id })
   end
 
   after :all do
@@ -12,13 +12,13 @@ describe 'Tasks', :pro_account do
 
   context 'new task' do
     before :all do
-      @task = @toggl.create_task({ name: 'new task', pid: @project['id'] })
-      task_ids = @toggl.get_project_tasks(@project['id']).map { |t| t['id'] }
-      expect(task_ids).to eq [ @task['id'] ]
+      @task = @toggl.create_task({ 'name' => 'new task', 'pid' => @project['id'] })
+      @task_ids = @toggl.get_project_tasks(@project['id']).map { |t| t['id'] }
+      expect(@task_ids).to eq [ @task['id'] ]
     end
 
     after :all do
-      TogglV8SpecHelper.delete_all_tasks(@toggl)
+      @toggl.delete_tasks(@task_ids)
       tasks = @toggl.get_project_tasks(@project['id'])
       expect(tasks).to be_empty
     end
@@ -33,13 +33,15 @@ describe 'Tasks', :pro_account do
 
     it 'gets a task' do
       task = @toggl.get_task(@task['id'])
-      expect(task).to eq @task
+      expect(task).to include('at') # 'at' is last updated timestamp
+      task.delete('at')             # 'at' is not included in POST response
+      expect(task).to eq @task      # compare POST and GET responses
     end
   end
 
   context 'updated task' do
     before :each do
-      @task = @toggl.create_task({ name: 'task to update', pid: @project['id'] })
+      @task = @toggl.create_task({ 'name' => 'task to update', 'pid' => @project['id'] })
     end
 
     after :each do
@@ -58,29 +60,30 @@ describe 'Tasks', :pro_account do
 
   context 'multiple tasks' do
     before :each do
-      @task1 = @toggl.create_task({ name: 'task1', pid: @project['id'] })
-      @task2 = @toggl.create_task({ name: 'task2', pid: @project['id'] })
-      @task3 = @toggl.create_task({ name: 'task3', pid: @project['id'] })
+      timestamp = Time.now.strftime("%H%M%S.%9N")
+      @task1 = @toggl.create_task({ 'name' => "task1-#{timestamp}", 'pid' => @project['id'] })
+      @task2 = @toggl.create_task({ 'name' => "task2-#{timestamp}", 'pid' => @project['id'] })
+      @task3 = @toggl.create_task({ 'name' => "task3-#{timestamp}", 'pid' => @project['id'] })
+      @task_ids = [ @task1['id'], @task2['id'], @task3['id'] ]
     end
 
     after :all do
-      TogglV8SpecHelper.delete_all_tasks(@toggl)
+      @toggl.delete_tasks(@task_ids)
     end
 
     it 'updates multiple tasks' do
       # start with 3 active tasks
       tasks = @toggl.get_project_tasks(@project['id'])
       active_flags = tasks.map { |t| t['active'] }
-      expect().to match_array(['true', 'true', 'true'])
+      expect(active_flags).to match_array([true, true, true])
 
       t_ids = [@task1, @task2, @task3].map { |t| t['id'] }
-      params = { 'active': true }
+      params = { 'active': false }
       @toggl.update_tasks(t_ids, params)
 
-      # end with 3 inactive tasks
+      # end with no active tasks
       tasks = @toggl.get_project_tasks(@project['id'])
-      active_flags = tasks.map { |t| t['active'] }
-      expect().to match_array(['true', 'true', 'true'])
+      expect(tasks).to be_empty
     end
 
     it 'deletes multiple tasks' do
@@ -90,8 +93,8 @@ describe 'Tasks', :pro_account do
       t_ids = [@task1, @task2, @task3].map { |t| t['id'] }
       @toggl.delete_tasks(t_ids)
 
-      # end with no tasks
-      expect(@toggl.get_project_tasks(@project['id']).length).to be_empty
+      # end with no active tasks
+      expect(@toggl.get_project_tasks(@project['id'])).to be_empty
     end
   end
 end

data/spec/lib/togglv8/time_entries_spec.rb

@@ -101,9 +101,7 @@ describe 'Time Entries' do
     end
 
     after :all do
-      @toggl.delete_time_entry(@last_week_id)
-      @toggl.delete_time_entry(@now_id)
-      @toggl.delete_time_entry(@next_week_id)
+      TogglV8SpecHelper.delete_all_time_entries(@toggl)
     end
 
     it 'gets time entries (reaching back 9 days up till now)' do
@@ -116,11 +114,6 @@ describe 'Time Entries' do
       expect(ids).to eq [ @now_id ]
     end
 
-    it 'gets time entries between 9 days ago and end_date' do
-      ids = @toggl.get_time_entries({end_date: @now + 1}).map { |t| t['id']}
-      expect(ids).to eq [ @last_week_id, @now_id ]
-    end
-
     it 'gets time entries between start_date and end_date' do
       ids = @toggl.get_time_entries({start_date: @now - 1, end_date: @now + 1}).map { |t| t['id']}
       expect(ids).to eq [ @now_id ]
@@ -181,6 +174,124 @@ describe 'Time Entries' do
     end
   end
 
+  context 'time entry tags' do
+    before :each do
+      time_entry_info = {
+        'wid' => @workspace_id,
+        'duration' => 7777
+      }
+      @now = DateTime.now
+
+      start = { 'start' => @toggl.iso8601(@now - 7) }
+      @time7 = @toggl.create_time_entry(time_entry_info.merge(start))
+
+      start = { 'start' => @toggl.iso8601(@now - 6) }
+      @time6 = @toggl.create_time_entry(time_entry_info.merge(start))
+
+      start = { 'start' => @toggl.iso8601(@now - 5) }
+      @time5 = @toggl.create_time_entry(time_entry_info.merge(start))
+
+      start = { 'start' => @toggl.iso8601(@now - 4) }
+      @time4 = @toggl.create_time_entry(time_entry_info.merge(start))
+
+      @time_entry_ids = [ @time7['id'], @time6['id'], @time5['id'], @time4['id']]
+    end
+
+    after :each do
+      TogglV8SpecHelper.delete_all_time_entries(@toggl)
+      TogglV8SpecHelper.delete_all_tags(@toggl)
+    end
+
+    it 'adds and removes one tag' do
+      # Add one tag
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['money'], 'tag_action' => 'add'})
+
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }
+      expect(tags).to eq [
+        ['money'],
+        ['money'],
+        ['money'],
+        ['money']
+      ]
+
+      # Remove one tag
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['money'], 'tag_action' => 'remove'})
+
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }.compact
+      expect(tags).to eq []
+    end
+
+    it '"removes" a non-existent tag' do
+      # Not tags to start
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }.compact
+      expect(tags).to eq []
+
+      # "Remove" a tag
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['void'], 'tag_action' => 'remove'})
+
+      # No tags to finish
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }.compact
+      expect(tags).to eq []
+    end
+
+    it 'adds and removes multiple tags' do
+      # Add multiple tags
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['billed', 'productive'], 'tag_action' => 'add'})
+
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }
+      expect(tags).to eq [
+        ['billed', 'productive'],
+        ['billed', 'productive'],
+        ['billed', 'productive'],
+        ['billed', 'productive']
+      ]
+
+      # Remove multiple tags
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['billed','productive'], 'tag_action' => 'remove'})
+
+      time_entries = @toggl.get_time_entries
+      tags = time_entries.map { |t| t['tags'] }.compact
+      expect(tags).to eq []
+    end
+
+    it 'manages multiple tags' do
+      # Add some tags
+      @toggl.update_time_entries_tags(@time_entry_ids,
+        {'tags' =>['billed', 'productive'], 'tag_action' => 'add'})
+
+      # Remove some tags
+      @toggl.update_time_entries_tags([ @time6['id'], @time4['id'] ],
+        {'tags' =>['billed'], 'tag_action' => 'remove'})
+
+      # Add some tags
+      @toggl.update_time_entries_tags([ @time7['id'] ],
+        {'tags' =>['best'], 'tag_action' => 'add'})
+
+      time7 = @toggl.get_time_entry(@time7['id'])
+      time6 = @toggl.get_time_entry(@time6['id'])
+      time5 = @toggl.get_time_entry(@time5['id'])
+      time4 = @toggl.get_time_entry(@time4['id'])
+
+      tags = [ time7['tags'], time6['tags'], time5['tags'], time4['tags'] ]
+      expect(tags).to eq [
+        ['best', 'billed', 'productive'],
+        [                  'productive'],
+        [        'billed', 'productive'],
+        [                  'productive']
+      ]
+    end
+  end
+
   context 'iso8601' do
     before :all do
       @ts = DateTime.new(2008,6,21, 13,30,2, "+09:00")
@@ -210,13 +321,6 @@ describe 'Time Entries' do
     end
 
     context 'String' do
-      xit 'converts Zulu to +00:00' do
-        ts = '2015-08-21T09:21:02Z'
-        expected = '2015-08-21T09:21:02+00:00'
-
-        expect(@toggl.iso8601(ts)).to eq expected
-      end
-
       it 'converts +00:00 to Zulu' do
         ts = '2015-08-21T09:21:02+00:00'
         expected = '2015-08-21T09:21:02Z'

data/spec/lib/togglv8/users_spec.rb

@@ -2,39 +2,66 @@ describe 'Users' do
   before :all do
     @toggl = TogglV8::API.new(Testing::API_TOKEN)
     @user = @toggl.me(all=true)
+    @workspaces = @toggl.workspaces
+    @workspace_id = @workspaces.first['id']
   end
 
   it 'returns /me' do
     expect(@user).to_not be_nil
-    expect(@user['id']).to eq 1820939
-    expect(@user['fullname']).to eq 'togglv8'
-    expect(@user['image_url']).to eq 'https://assets.toggl.com/avatars/a5d106126b6bed8df283e708af0828ee.png'
-    expect(@user['timezone']).to eq 'Etc/UTC'
-    expect(@user['workspaces'].length).to eq 1
-    expect(@user['workspaces'].first['name']).to eq "togglv8's workspace"
+    expect(@user['id']).to eq Testing::USER_ID
+    # expect(@user['fullname']).to eq 'togglv8'
+    # expect(@user['image_url']).to eq 'https://assets.toggl.com/avatars/a5d106126b6bed8df283e708af0828ee.png'
+    # expect(@user['timezone']).to eq 'Etc/UTC'
+    # expect(@user['workspaces'].length).to eq 1
+    # expect(@user['workspaces'].first['name']).to eq "togglv8's workspace"
   end
 
-  it 'returns /my_clients' do
+  it 'returns my_clients' do
     my_clients = @toggl.my_clients(@user)
     expect(my_clients).to be_empty
   end
 
-  it 'returns /my_projects' do
+  it 'returns my_projects' do
     my_projects = @toggl.my_projects(@user)
     expect(my_projects).to be_empty
   end
 
-  it 'returns /my_tags' do
+  it 'returns my_projects and my_deleted_projects' do
+    # Create project
+    project = @toggl.create_project({ 'name' => 'my project', 'wid' => @workspace_id })
+
+    my_project_ids         = @toggl.my_projects.map { |p| p['id'] }
+    my_deleted_project_ids = @toggl.my_deleted_projects.map { |p| p['id'] }
+
+    expect(my_project_ids).to eq [ project['id'] ]
+    expect(my_deleted_project_ids).not_to include(project['id'])
+
+    # Delete project
+    @toggl.delete_project(project['id'])
+
+    my_project_ids         = @toggl.my_projects.map { |p| p['id'] }
+    my_deleted_project_ids = @toggl.my_deleted_projects.map { |p| p['id'] }
+
+    expect(my_project_ids).to eq []
+    expect(my_deleted_project_ids).to include(project['id'])
+  end
+
+  it 'returns my_tags' do
     my_tags = @toggl.my_tags(@user)
     expect(my_tags).to be_empty
   end
 
-  it 'returns /my_time_entries' do
+  it 'returns my_tasks' do
+    my_tasks = @toggl.my_tasks(@user)
+    expect(my_tasks).to be_empty
+  end
+
+  it 'returns my_time_entries' do
     my_time_entries = @toggl.my_time_entries(@user)
     expect(my_time_entries).to be_empty
   end
 
-  it 'returns /my_workspaces' do
+  it 'returns my_workspaces' do
     my_workspaces = @toggl.my_workspaces(@user)
     expect(my_workspaces.length).to eq 1
   end

data/spec/spec_helper.rb

@@ -1,45 +1,17 @@
-# require "codeclimate-test-reporter"
-# CodeClimate::TestReporter.start
+require "simplecov"
+require "coveralls"
 
-require 'coveralls'
-Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
-# require 'simplecov'
-# SimpleCov.start do
-#   require 'simplecov-badge'
-#   add_group 'lib', 'lib/'
-#   add_filter '/doc/'
-#   add_filter '/spec/'
-#   add_filter '/pkg/'
-#   # configure any options you want for SimpleCov::Formatter::BadgeFormatter
-#   SimpleCov::Formatter::BadgeFormatter.generate_groups = true
-#   SimpleCov::Formatter::BadgeFormatter.timestamp = true
-#   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#       SimpleCov::Formatter::HTMLFormatter,
-#       SimpleCov::Formatter::BadgeFormatter,
-#   ]
-# end
-# NOTE: SimpleCov.start must be issued before any application code is required!
-# -----------------------------------------------------------------------------
+require 'pry-byebug'
 
 require_relative 'togglv8_spec_helper'
 require_relative '../lib/togglv8'
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.filter_run :focus
@@ -49,27 +21,12 @@ RSpec.configure do |config|
   config.order = :random
   Kernel.srand config.seed
 
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #   # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
     expectations.syntax = :expect
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
@@ -77,59 +34,11 @@ RSpec.configure do |config|
     toggl = TogglV8::API.new(Testing::API_TOKEN)
     TogglV8SpecHelper.setUp(toggl)
   end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
 end
 
 class Testing
-  API_TOKEN = '4880adbe1bee9a241fa08070d33bd49f'
-  USERNAME  = 'togglv8@mailinator.com'
-  PASSWORD  = 'togglv8'
+  API_TOKEN = ENV['API_TOKEN'] || '4880adbe1bee9a241fa08070d33bd49f'
+  USERNAME  = ENV['USERNAME']  || 'togglv8@mailinator.com'
+  PASSWORD  = ENV['PASSWORD']  || 'togglv8'
+  USER_ID   = (ENV['USER_ID']  || 1820939).to_i
 end

data/spec/togglv8_spec_helper.rb

@@ -6,69 +6,69 @@ class TogglV8SpecHelper
   @logger.level = Logger::WARN
 
   def self.setUp(toggl)
-    @toggl = toggl
-    user = @toggl.me(all=true)
+    user = toggl.me(all=true)
     @default_workspace_id = user['default_wid']
 
-    delete_all_projects(@toggl)
-    delete_all_clients(@toggl)
-    delete_all_tags(@toggl)
-    delete_all_time_entries(@toggl)
-    delete_all_workspaces(@toggl)
+    delete_all_projects(toggl)
+    delete_all_clients(toggl)
+    delete_all_tags(toggl)
+    delete_all_time_entries(toggl)
+    delete_all_workspaces(toggl)
   end
 
   def self.delete_all_clients(toggl)
-    clients = @toggl.my_clients
+    clients = toggl.my_clients
     unless clients.nil?
       client_ids ||= clients.map { |c| c['id'] }
       @logger.debug("Deleting #{client_ids.length} clients")
       client_ids.each do |c_id|
-        @toggl.delete_client(c_id)
+        toggl.delete_client(c_id)
       end
     end
   end
 
   def self.delete_all_projects(toggl)
-    projects = @toggl.projects(@default_workspace_id)
+    projects = toggl.projects(@default_workspace_id)
     unless projects.nil?
       project_ids ||= projects.map { |p| p['id'] }
       @logger.debug("Deleting #{project_ids.length} projects")
       return unless project_ids.length > 0
-      @toggl.delete_projects(project_ids)
+      toggl.delete_projects(project_ids)
     end
   end
 
   def self.delete_all_tags(toggl)
-    tags = @toggl.my_tags
+    tags = toggl.my_tags
     unless tags.nil?
       tag_ids ||= tags.map { |t| t['id'] }
       @logger.debug("Deleting #{tag_ids.length} tags")
       tag_ids.each do |t_id|
-        @toggl.delete_tag(t_id)
+        toggl.delete_tag(t_id)
       end
     end
   end
 
   def self.delete_all_time_entries(toggl)
-    time_entries = @toggl.my_time_entries
+    time_entries = toggl.get_time_entries(
+      { start_date: DateTime.now - 30, end_date: DateTime.now + 30 } )
     unless time_entries.nil?
       time_entry_ids ||= time_entries.map { |t| t['id'] }
       @logger.debug("Deleting #{time_entry_ids.length} time_entries")
       time_entry_ids.each do |t_id|
-        @toggl.delete_time_entry(t_id)
+        toggl.delete_time_entry(t_id)
       end
     end
   end
 
   def self.delete_all_workspaces(toggl)
-    user = @toggl.me(all=true)
-    workspaces = @toggl.my_workspaces(user)
+    user = toggl.me(all=true)
+    workspaces = toggl.my_workspaces(user)
     unless workspaces.nil?
       workspace_ids ||= workspaces.map { |w| w['id'] }
       workspace_ids.delete(user['default_wid'])
       @logger.debug("Leaving #{workspace_ids.length} workspaces")
       workspace_ids.each do |w_id|
-        @toggl.leave_workspace(w_id)
+        toggl.leave_workspace(w_id)
       end
     end
   end

data/togglv8.gemspec

@@ -25,10 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-mocks"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "fivemat"
-  spec.add_development_dependency "simplecov"
-  # spec.add_development_dependency "simplecov-badge"
-  # spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry-byebug"
 
   spec.add_dependency "logger"
   spec.add_dependency "faraday"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togglv8
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Tom Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="