kounta_rest 0.1.4 → 0.1.5

data/kounta.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oauth2", "0.9.2"
   spec.add_dependency "pry", "0.9.12.2"
   spec.add_dependency "yell", "1.5.1"
-end
+  spec.add_dependency "faraday_middleware", "0.9.0"
+end

data/lib/kounta.rb

@@ -22,7 +22,6 @@ module Kounta
 	TOKEN_URI = "https://api.kounta.com/v1/token.json"
 	SITE_URI = "https://api.kounta.com/v1/"
 	FORMAT = :json
-	REQUEST_HEADERS = {'Content-Type' => 'application/json'}
 
 	def self.log(message)
 

data/lib/kounta/rest/client.rb

@@ -1,6 +1,6 @@
 require 'oauth2'
-require 'yell'
 require 'oj'
+require 'faraday_middleware'
 
 module Kounta
 	module REST
@@ -8,9 +8,7 @@ module Kounta
 
 			def initialize
 				raise Kounta::Errors::MissingOauthDetails unless has_required_oauth_details?
-				@logger = Yell.new STDOUT
 				@conn = OAuth2::AccessToken.new(client, Kounta.client_token, {:refresh_token => Kounta.client_refresh_token})
-
 			end
 
 			def client
@@ -18,7 +16,12 @@ module Kounta
 					:site => Kounta::SITE_URI,
 					:authorize_url => Kounta::AUTHORIZATION_URI,
 					:token_url => Kounta::TOKEN_URI
-				})
+				}) do |faraday|
+					faraday.request :json
+					faraday.use Faraday::Request::UrlEncoded
+					faraday.use Faraday::Response::Logger if Kounta.enable_logging
+					faraday.adapter Faraday.default_adapter
+				end
 			end
 
 			def path_from_hash(url_hash)
@@ -30,11 +33,11 @@ module Kounta
 				options[:headers].merge!(Kounta::REQUEST_HEADERS)
 
 				begin
-					log("#{request_method}: #{Kounta::SITE_URI}#{path_from_hash(url_hash)}.#{FORMAT.to_s}")
-					response = @conn.request(request_method, "#{path_from_hash(url_hash)}.#{FORMAT.to_s}", options)
+					response = @conn.request(request_method, "#{path_from_hash(url_hash)}.#{FORMAT.to_s}", options) do |request|
+
+					end
 				rescue OAuth2::Error => ex
 					if ex.message.include? 'The access token provided has expired'
-						log(ex.message)
 						@conn = refreshed_token
 						retry
 					end
@@ -71,10 +74,6 @@ module Kounta
 					Kounta.client_id && Kounta.client_secret && Kounta.client_token && Kounta.client_refresh_token
 				end
 
-				def log(message)
-					@logger.info(message) unless !Kounta.enable_logging
-				end
-
 				def refreshed_token
 					OAuth2::AccessToken.from_hash(client, :refresh_token => Kounta.client_refresh_token).refresh!
 				end

data/lib/kounta/version.rb

@@ -1,3 +1,3 @@
 module Kounta
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kounta_rest
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -171,6 +171,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Library for accessing Kounta's RESTful API
 email:
 - sam@richardson.co.nz