rescuetime 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6464e2b8b391cfa2b334288ba6cdbd81fe7728f6
-  data.tar.gz: e293998bd6552509d6225422b1a7f029a26dcde3
+  metadata.gz: ce870b11b2ff5bc0257b76ef6e494a279dedd5b8
+  data.tar.gz: 5d2a5e4e0884b38c321cdd6a64dcb4a00da2d57c
 SHA512:
-  metadata.gz: 4e022e5eefb8a858051f8c5264d394562ba6939381beb5b9072807f2dad2a70f9d8047ada933a2be9172ba050ed5b71ed41e51934e1b2a8ade83bd67d7a645c2
-  data.tar.gz: 8c09915abb016f0680d9b48c1f45362ccf6312fc970f1e58d38feeb25e15afda6cfeba1d5f18a877712ac7b29bce2e65f39cdf14ebea57caf79f26fbcdc5df33
+  metadata.gz: ec48c9a8f5c98ffe39c1e43ff2342d617b20ffc95fb785ed25d171dd0d3f43184234064d1488aebd4f5a274a38bda29f1febb3e2e365c249d518a2baa96acf63
+  data.tar.gz: 3f24d854c6e41263ac3ad2012e55743eefd7c72d1a7960e3749c8002d59c0213bbf33cecc2a20891ad569ad50aec8fe84dabad5cae115b4ea290743b6be27540

data/lib/rescuetime/client.rb

@@ -1,6 +1,3 @@
-require 'faraday'
-require 'csv'
-
 require 'rescuetime/query_buildable'
 
 require 'rescuetime/requester'

data/lib/rescuetime/collection.rb

@@ -1,3 +1,5 @@
+require 'csv'
+
 require 'rescuetime/query_buildable'
 
 module Rescuetime
@@ -34,7 +36,9 @@ module Rescuetime
     #
     # @see Rescuetime::Requester#get
     def all
-      parse_response Requester.get(HOST, params).body
+      requester = Rescuetime::Requester
+      host      = HOST
+      parse_response requester.get(host, params)
     end
 
     # Enumerates over the collection of Rescuetime report records. Performs

data/lib/rescuetime/requester.rb

@@ -20,7 +20,7 @@ module Rescuetime
       # @param  [String] host    request host
       # @param  [Hash]   params  request parameters
       # @param  [#get]   http    HTTP requester
-      # @return [Faraday::Response]
+      # @return [String]
       #
       # @raise [Rescuetime::MissingCredentialsError] if no api key is present
       # @raise [Rescuetime::InvalidCredentialsError] if api key is incorrect
@@ -29,31 +29,38 @@ module Rescuetime
       #                                              not 200
       #
       # @see Rescuetime::Client#api_key=
-      def get(host, params, http: Faraday)
+      def get(host, params, http: Net::HTTP)
         # Fail if no api key is provided
         unless params[:key] && !params[:key].to_s.empty?
           fail(Rescuetime::MissingCredentialsError)
         end
 
-        req_params = params.delete_if { |_, v| !v || v.to_s.empty? }
-        response = http.get host, req_params
+        uri = set_uri host, params
+        response = http.get_response uri
 
-        fail_or_return response
+        fail_or_return_body response
       end
 
       private
 
+      def set_uri(host, params)
+        req_params = params.delete_if { |_, v| !v || v.to_s.empty? }
+        uri = URI(host)
+        uri.query = URI.encode_www_form(req_params)
+        uri
+      end
+
       # Checks for an error in the Rescuetime response. If an error was recieved
       # raise the appropriate Rescuetime::Error. Otherwise, return the response.
       #
-      # @param  [Faraday::Response] response   HTTP response from rescuetime.com
-      # @return [Faraday::Response] 200 HTTP response from rescuetime.com
+      # @param  [Net::HTTPResponse] response   HTTP response from rescuetime.com
+      # @return [String]            valid response body
       #
       # @raise [Rescuetime::InvalidCredentialsError] if api key is incorrect
       # @raise [Rescuetime::InvalidQueryError]       if query is badly formed
       # @raise [Rescuetime::Error] an error that varies based on the
       #                             response status
-      def fail_or_return(response)
+      def fail_or_return_body(response)
         # match the response body to known error messages with 200 status
         case response.body
         when key_not_found? then fail Rescuetime::InvalidCredentialsError
@@ -61,10 +68,11 @@ module Rescuetime
         end
 
         # check the response status for errors
-        error = Rescuetime::Error::CODES[response.status.to_i]
+        status = response.code.to_i
+        error = Rescuetime::Error::CODES[status]
         fail(error) if error
 
-        response
+        response.body
       end
 
       # Returns lambda that returns true if the response body states that the

data/lib/rescuetime/version.rb

@@ -1,5 +1,5 @@
 # lib/rescuetime/version.rb
 module Rescuetime
   # rescuetime gem version number
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/rescuetime.gemspec

@@ -15,15 +15,13 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-                       .reject { |f| f.match(%r{^(test|spec|features)/}) }
+                                        .reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'faraday', '~> 0.9.1'
-
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescuetime
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Lee Sharma
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement