wakatime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 501e021ea28516b7b838aef0e5ceca05c50f0446
-  data.tar.gz: c0a1675154cd4f095fff5f59a0bcef4ceb9efc12
+  metadata.gz: e029e38b9c34933d0e6c8aa8318c89d354617042
+  data.tar.gz: 7d2d7ea7b012dd97724ce757285b6b6e1b0680b3
 SHA512:
-  metadata.gz: 017bb1801871fd2bbb4415232b8435e80c776ca2b4db9b6534ff92b255890ba5bed3530c5e602b7bdfbc6b2aa61d65681f978b9484707c7676f103b84ede451f
-  data.tar.gz: 2b5b36159ae7985b3d46765620da1c470ab8173e9e198c511425809d21eb8074a1f8612c87048b9eb0b82e9b8f98db2cefa9e60f38fca94e22aee8f1351b213b
+  metadata.gz: 663a41a707a98a1f06c64263978e19c361cacae275dde22848c74c61a6d08d12d99dab66aa57b7ce4a4142783193a80fb49641443ea11804eaa08ee7149085ee
+  data.tar.gz: 2153191f498ee20414fe19934ad2eebec421dfcf07e2971997109a67851278c58387478821c55ef66fa8fe92fcebf3ce9a937cecd0661db61a479bbc7bac8b6b

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.1.1
+  - 2.2.3
 before_install:
-  - gem install bundler --pre
-script: bundle exec rake spec
+  - gem install bundler
+script: bundle exec rake

data/README.md

@@ -1,4 +1,4 @@
-# Wakatime Ruby 
+# Wakatime Ruby
   [![Code Climate](https://codeclimate.com/github/burningpony/wakatime.png)](https://codeclimate.com/github/burningpony/wakatime)
   [![Build Status](https://travis-ci.org/burningpony/wakatime.svg?branch=master)](https://travis-ci.org/burningpony/wakatime)
     An Unofficial Wakatime Ruby API Client
@@ -26,10 +26,7 @@ Or install it yourself as:
     @client = Wakatime::Client.new(@session)
 
 #### Summary
-    @client.summary
-
-#### Daily Summary
-    @client.daily
+    @client.summaries
 
 #### Durations
     @client.durations
@@ -39,10 +36,10 @@ Or install it yourself as:
 
 #### Current User
     @client.current_user
-    
+
 #### Plugin Data
     @client.plugins
-    
+
 
 ## Testing
 
@@ -59,4 +56,4 @@ Or install it yourself as:
 
 ## Credits
 
-  Massive Credit to [Ruby Box][https://github.com/attachmentsme/ruby-box] as being a template API client. 
+  Massive Credit to [Ruby Box][https://github.com/attachmentsme/ruby-box] as being a template API client.

data/lib/wakatime/client.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'net/http/post/multipart'
 require 'open-uri'
 require 'cgi'
+require 'active_support'
 require 'active_support/inflector'
 require 'addressable/template'
 require 'base64'
@@ -14,27 +15,27 @@ module Wakatime
     end
 
     def summaries(start_at = Time.now - 86_400, end_at = Time.now)
-      request_builder('summaries', start: start_at, end: end_at)
+      request_builder('users/current/summaries', start: start_at, end: end_at)
     end
 
     def durations(date = Date.today)
-      request_builder('durations', date: date)
+      request_builder('users/current/durations', date: date)
     end
 
     def heartbeats(params = {})
-      params[:date]      ||= Date.today
-      params[:show]      ||= 'file,branch,project,time'
+      params[:date] ||= Date.today
+      params[:show] ||= 'file,branch,project,time'
 
-      request_builder('heartbeats', params)
+      request_builder('users/current/heartbeats', params)
     end
 
     def plugins(params = {})
-      params[:show]      ||= 'name,version'
-      request_builder('plugins', params)
+      params[:show] ||= 'name,version'
+      request_builder('users/current/plugins', params)
     end
 
     def current_user(params = {})
-      params[:show]      ||= 'email,timeout,last_plugin,timezone'
+      params[:show] ||= 'email,timeout,last_plugin,timezone'
       request_builder('users/current', params)
     end
 
@@ -54,7 +55,7 @@ module Wakatime
     end
 
     def request_builder(action, params = {}, raw = false)
-      uri  =  Addressable::Template.new("#{Wakatime::API_URL}/#{action}{?query*}")
+      uri  = Addressable::Template.new("#{Wakatime::API_URL}/#{action}{?query*}")
       uri  = uri.expand(
         'query' => cast_params(params)
       )
@@ -74,7 +75,7 @@ module Wakatime
       if response['data'].is_a? Hash
         klass.new(response['data'])
       else
-        response['data'].map  do |attributes|
+        response['data'].map do |attributes|
           klass.new(attributes)
         end
       end

data/lib/wakatime/session.rb

@@ -24,9 +24,7 @@ module Wakatime
 
       response = http.request(request)
 
-      if response.is_a? Net::HTTPNotFound
-        fail Wakatime::ObjectNotFound
-      end
+      fail Wakatime::ObjectNotFound if response.is_a? Net::HTTPNotFound
 
       sleep(@backoff) # try not to excessively hammer API.
 

data/lib/wakatime/version.rb

@@ -1,3 +1,3 @@
 module Wakatime
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/client_spec.rb

@@ -12,25 +12,23 @@ describe Wakatime::Client do
 
   describe '#summaries' do
     it 'should return json' do
-      stub_request(:get, "#{Wakatime::API_URL}/summaries")
-      .with(query: hash_including(:start, :end))
-      .to_return(body: File.read('./spec/fixtures/summaries.json'), status: 200)
+      stub_request(:get, "#{Wakatime::API_URL}/users/current/summaries")
+        .with(query: hash_including(:start, :end))
+        .to_return(body: File.read('./spec/fixtures/summaries.json'), status: 200)
 
       client = Wakatime::Client.new(@session)
       expect(client.summaries.grand_total.total_seconds).to eq 49_740
-
     end
   end
 
   describe '#heartbeats' do
     it 'should return json' do
-      stub_request(:get, "#{Wakatime::API_URL}/heartbeats")
-      .with(query: hash_including(:date))
-      .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
+      stub_request(:get, "#{Wakatime::API_URL}/users/current/heartbeats")
+        .with(query: hash_including(:date))
+        .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
 
       client = Wakatime::Client.new(@session)
       expect(client.heartbeats.last.time).to eq 1_422_631_940.699831
-
     end
   end
 end

data/spec/integration/core_spec.rb

@@ -9,16 +9,15 @@ describe Wakatime, skip: true do
   before do
     WebMock.allow_net_connect!
     @session = Wakatime::Session.new(
-                                       api_key: ACCOUNT['api_key']
+      api_key: ACCOUNT['api_key']
     )
 
     @client = Wakatime::Client.new(@session)
-
   end
 
   it 'raises an AuthError if not client auth fails' do
     session = Wakatime::Session.new(
-                                      api_key: 'bad-key'
+      api_key: 'bad-key'
     )
 
     @bad_client = Wakatime::Client.new(session)
@@ -26,7 +25,6 @@ describe Wakatime, skip: true do
     expect { @bad_client.summary }.to raise_error(Wakatime::AuthError)
   end
   describe Wakatime::Client do
-
     it 'will return json scoped to specified times' do
       summary = @client.summary
       expect(summary).to be_a Wakatime::Models::Summaries

data/spec/session_spec.rb

@@ -7,13 +7,11 @@ require 'webmock/rspec'
 
 describe Wakatime::Session do
   before do
-
     @session = Wakatime::Session.new(
-                                       api_key: 'Lame Key'
+      api_key: 'Lame Key'
     )
 
     @client = Wakatime::Client.new(@session)
-
   end
 
   it 'raises a RequestError if a badly formed request detected by the server' do
@@ -32,7 +30,7 @@ describe Wakatime::Session do
 
   it 'raises a ServerError if the server raises a 500 error' do
     stub_request(:get, /.*\/summaries.*/)
-    .to_return(status: 503, body: '{"type": "error", "status": 503, "message": "We messed up!"}', headers: {})
+      .to_return(status: 503, body: '{"type": "error", "status": 503, "message": "We messed up!"}', headers: {})
     expect { @client.summaries }.to raise_error(Wakatime::ServerError)
 
     # make sure status and body is
@@ -40,9 +38,8 @@ describe Wakatime::Session do
     begin
       @client.summaries
     rescue StandardError => e
-      expect(e.body).to eq '{"type": "error", "status": 503, "message": "We messed up!"}' # TODO establish what happens when wakatime returns a 500 or something else.
+      expect(e.body).to eq '{"type": "error", "status": 503, "message": "We messed up!"}' # TODO: establish what happens when wakatime returns a 500 or something else.
       expect(e.status).to eq 503
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wakatime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Russell Osborne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie