pingboard 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e0686595560ccc7ff0618340442403855f0e24
-  data.tar.gz: f02da016217d420d2626d88ed52a544034b036a2
+  metadata.gz: 187e7f10439900d992e6039ed5170364bca739fb
+  data.tar.gz: 712674cb12a728c694c435f4a5d636457eb1659a
 SHA512:
-  metadata.gz: 504bd9ade0e2f3ddc3bd64bf2b4f49f8fe3fb133028f41fb1b20396f134939d7a981e04fb537e6727101fe14cd21619e055ba75df4241ff4aab7fb0da6229ca0
-  data.tar.gz: 37237cfe77fcb9a9703f6700a669d75388c18b1844bd26ac3997b0594e617513a855fea9b02d805c4313d4b25b5ca9ecbec5377d46c2dc9fbde9bbcae6023a2a
+  metadata.gz: c2b57635f5a6c337200c1e3823f04f45146f1f4b6e25e16fffdae471b285eb0f23bcba437dfc8f1150c2ece6b46035fd7796499aa82c59f892d22c1b5f3a3b4e
+  data.tar.gz: 74ebfcdbfc14584e059ea19963ba02afe370e39abae03267e7e0e0002e97e6dac113685b78b3824a430d32d609f95e18c499867d7dd080bc655be72f97e8a994

data/lib/pingboard/client.rb

@@ -23,27 +23,62 @@ module Pingboard
 
     def search(query, options={})
       options.merge!(q: query)
-      response = @request.new(self, :get, URL_API_VERSION_PATH + URL_SEARCH_USERS_PATH, options).do
+      response = @request.new(
+        client: self,
+        http_verb: :get,
+        path: URL_API_VERSION_PATH + URL_SEARCH_USERS_PATH,
+        headers: {'Authorization' => "Bearer #{access_token}" },
+        body: nil,
+        params: options
+      ).do
       JSON.parse(response.body)
     end
 
     def users(options={})
-      response = @request.new(self, :get, URL_API_VERSION_PATH + URL_USERS_PATH, options).do
+      response = @request.new(
+        client: self,
+        http_verb: :get,
+        path: URL_API_VERSION_PATH + URL_USERS_PATH,
+        headers: {'Authorization' => "Bearer #{access_token}" },
+        body: nil,
+        params: options
+      ).do
       JSON.parse(response.body)
     end
 
     def user(user_id, options={})
-      response = @request.new(self, :get, URL_API_VERSION_PATH + URL_USERS_PATH + "/#{user_id}", options).do
+      response = @request.new(
+        client: self,
+        http_verb: :get,
+        path: URL_API_VERSION_PATH + URL_USERS_PATH + "/#{user_id}", 
+        headers: {'Authorization' => "Bearer #{access_token}" },
+        body: nil,
+        params: options
+      ).do
       JSON.parse(response.body)
     end
 
     def status(status_id, options={})
-      response = @request.new(self, :get, URL_API_VERSION_PATH + URL_STATUSES_PATH + "/#{status_id}", options).do
+      response = @request.new(
+        client: self, 
+        http_verb: :get, 
+        path: URL_API_VERSION_PATH + URL_STATUSES_PATH + "/#{status_id}", 
+        headers: {'Authorization' => "Bearer #{access_token}" },
+        body: nil,
+        params: options
+      ).do
       JSON.parse(response.body)
     end
 
     def status_types
-      response = @request.new(self, :get, URL_API_VERSION_PATH + URL_STATUS_TYPES_PATH).do
+      response = @request.new(
+        client: self,
+        http_verb: :get,
+        path: URL_API_VERSION_PATH + URL_STATUS_TYPES_PATH,
+        headers: {'Authorization' => "Bearer #{access_token}" },
+        body: nil,
+        params: nil
+      ).do
       JSON.parse(response.body)
     end
 
@@ -70,14 +105,14 @@ module Pingboard
     end
 
     def access_token_request
-      @access_token_request = connection.post do |req|
-        req.url URL_OAUTH_TOKEN_PATH
-        req.params['grant_type'] = 'client_credentials'
-        req.body = {
-          client_id: service_app_id,
-          client_secret: service_app_secret
-        }
-      end
+      @access_token_request = @request.new(
+        client: self,
+        http_verb: :post,
+        path: URL_OAUTH_TOKEN_PATH,
+        headers: { 'Content-Type' => 'application/x-www-form-urlencoded' },
+        body: { 'client_id' => "#{service_app_id}", 'client_secret' => "#{service_app_secret}" }, 
+        params: { 'grant_type' => 'client_credentials' }
+      ).do
     end
 
   end

data/lib/pingboard/request.rb

@@ -1,23 +1,39 @@
 module Pingboard
   class Request
 
-    attr_accessor :client, :path, :http_verb
+    attr_accessor :client, :path, :http_verb, :headers, :body, :params
 
-    def initialize(client, http_verb, path, options={})
+    def initialize(client:, http_verb:, path:, headers:, body:, params: {})
       @client = client
       @http_verb = http_verb
       @path = path
-      @options = options
+      @headers = headers
+      @body = body
+      @params = params
     end
 
     def do
-      @client.connection.public_send(@http_verb) do |req|
-        req.url "#{@path}"
-        req.headers['Authorization'] = "Bearer #{@client.access_token}"
-        @options.each do |key, value|
-          req.params["#{key}"] = value
-        end
+      @test = @client.connection.public_send(@http_verb) do |request|
+        request.url "#{@path}"
+        set_headers!(request) if headers
+        set_body!(request) if body
+        set_params!(request) if params
       end
+      @test
+    end
+
+    private
+
+    def set_body!(request)
+      request.body = body
+    end
+
+    def set_headers!(request)
+      headers.each { |key, value| request.headers["#{key}"] = value }
+    end
+
+    def set_params!(request)
+      params.each { |key, value| request.params["#{key}"] = value }
     end
 
   end

data/pingboard.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'pingboard'
-  s.version       = '0.0.7'
-  s.date          = '2017-07-30'
+  s.version       = '0.0.8'
+  s.date          = '2017-08-05'
   s.summary       = "The Pingboard API Ruby Client"
   s.description   = "A Ruby client interface for the Pingboard API"
   s.authors       = ["Bryan B. Cabalo"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingboard
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Bryan B. Cabalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby client interface for the Pingboard API
 email: bcabalo@gmail.com