geoloqi 0.9.13 → 0.9.14

data/lib/geoloqi.rb

@@ -5,6 +5,7 @@ require 'faraday'
 require 'logger'
 require 'geoloqi/config'
 require 'geoloqi/error'
+require 'geoloqi/response'
 require 'geoloqi/session'
 require 'geoloqi/version'
 
@@ -25,4 +26,4 @@ module Geoloqi
     raise "client_id required to authorize url. Pass with Geoloqi.config" unless client_id
     "#{OAUTH_URL}?response_type=code&client_id=#{Rack::Utils.escape client_id}&redirect_uri=#{Rack::Utils.escape redirect_uri}"
   end
-end
+end

data/lib/geoloqi/config.rb

@@ -22,4 +22,4 @@ module Geoloqi
       !client_secret.nil? && !client_secret.empty?
     end
   end
-end
+end

data/lib/geoloqi/error.rb

@@ -14,4 +14,4 @@ module Geoloqi
 
   class Error < StandardError; end
   class ArgumentError < ArgumentError; end
-end
+end

data/lib/geoloqi/response.rb

@@ -0,0 +1,10 @@
+module Geoloqi
+  class Response
+    attr_reader :status, :headers, :body
+    def initialize(status, headers, body)
+      @status = status
+      @headers = headers
+      @body = body
+    end
+  end
+end

data/lib/geoloqi/session.rb

@@ -40,20 +40,11 @@ module Geoloqi
     end
 
     def run(meth, path, query=nil)
-      query = Rack::Utils.parse_query query if query.is_a?(String)
       renew_access_token! if auth[:expires_at] && Time.rfc2822(auth[:expires_at]) <= Time.now && !(path =~ /^\/?oauth\/token$/)
       retry_attempt = 0
 
       begin
-        response = @connection.send(meth) do |req|
-          req.url "/#{API_VERSION.to_s}/#{path.gsub(/^\//, '')}"
-          req.headers = headers
-
-          if query
-            meth == :get ? req.params = query : req.body = query.to_json
-          end
-        end
-
+        response = execute meth, path, query
         hash = JSON.parse response.body
         raise ApiError.new(response.status, hash['error'], hash['error_description']) if hash.is_a?(Hash) && hash['error'] && !config.throw_exceptions
       rescue Geoloqi::ApiError
@@ -69,6 +60,19 @@ module Geoloqi
       @config.use_hashie_mash ? Hashie::Mash.new(hash) : hash
     end
 
+    def execute(meth, path, query=nil)
+      query = Rack::Utils.parse_query query if query.is_a?(String)
+      raw = @connection.send(meth) do |req|
+        req.url "/#{API_VERSION.to_s}/#{path.gsub(/^\//, '')}"
+        req.headers = headers
+
+        if query
+          meth == :get ? req.params = query : req.body = query.to_json
+        end
+      end
+      Response.new raw.status, raw.headers, raw.body
+    end
+
     def establish(opts={})
       require 'client_id and client_secret are required to get access token' unless @config.client_id? && @config.client_secret?
       auth = post 'oauth/token', {:client_id => @config.client_id,
@@ -103,4 +107,4 @@ module Geoloqi
       headers
     end
   end
-end
+end

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.13'
+    '0.9.14'
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors: 
 - Kyle Drake
@@ -101,6 +101,7 @@ files:
 - lib/geoloqi.rb
 - lib/geoloqi/config.rb
 - lib/geoloqi/error.rb
+- lib/geoloqi/response.rb
 - lib/geoloqi/session.rb
 - lib/geoloqi/version.rb
 - license.txt