bwapi 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4692c7ee38a0d1359f41ff3e69ed9e5aa80c6d4
-  data.tar.gz: bb7baf572ec356c81a815b4f4e1452d17d01e17b
+  metadata.gz: 7c2e256ae41a00031f7d4c5f62d2cab076b34e80
+  data.tar.gz: d07297df0f274cbe15e42f07492382a3d5b691e7
 SHA512:
-  metadata.gz: e1339f1f0921fece977f5b524dc70873d0e6a1388259c0cbe9db686a79f5226a3619e0a7125b91e51cd874a2e841d7160c0ea11b310214c4f56483771f7826ba
-  data.tar.gz: 8cdfb5a20bbc1df62aa829fb7db51f69be3d7aed5ae758845732738198a8aa1c74e83d16ed0e1106f459c50930b28ebdd1bb009efa726dbcdb3234d3ff661c76
+  metadata.gz: 7e6ed60c84b9354250f1e9dead2923020f7b64690d1eada936b9d7acfd590dd006d9e51ad6158abc8f9eee3d9311c3b9b39d3d5c9892b9c676a55ad3b54a8930
+  data.tar.gz: 752d23785c294481eae8e43eeab66ad6089f74dd7bfbca75a6b97ab858c7128237ea0e9c056f1a58c17ef9015601ab979fd4f090c84bb6fe7bf0d6523ce9f1e2

data/lib/bwapi/client/logout.rb

@@ -9,12 +9,12 @@ module BWAPI
         begin
           get "logout"
         ensure
+          self.access_token   = nil
+          self.refresh_token  = nil
           self.username       = nil
           self.password       = nil
-          self.access_token   = nil
           self.client_id      = nil
-          self.access_token   = nil
-          self.refresh_token  = nil
+          self.grant_type     = nil
           self.expires_in     = nil
         end
       end

data/lib/bwapi/client/oauth.rb

@@ -21,20 +21,7 @@ module BWAPI
           force_urlencoded: true
         }.merge opts
 
-        begin
-          creds  = post 'oauth/token', opts
-        rescue BWAPI::BWError
-          return false
-        else
-          self.access_token = creds.access_token
-          self.expires_in = creds.expires_in
-
-          if application_client?
-            self.refresh_token = creds.refresh_token
-          end
-
-          return true
-        end
+        oauth_request opts
       end
       alias :login :oauth_token
 
@@ -46,7 +33,7 @@ module BWAPI
       # @option opts [String] grant_type Grant type of user
       # @option opts [String] client_id Client id
       # @option opts [String] force_urlencoded Force urlencoded
-      def oauth_refresh_token opts={}
+      def oauth_refresh_token opts={}, refresh_token = nil
         opts = {
           username: username,
           password: password,
@@ -56,22 +43,29 @@ module BWAPI
           force_urlencoded: true
         }.merge opts
 
+        oauth_request opts
+      end
+      alias :refresh :oauth_refresh_token
+
+      # Sends a oauth request
+      #
+      # @param opts [Hash] options hash of parameters
+      def oauth_request opts
         begin
           creds = post 'oauth/token', opts
         rescue BWAPI::BWError
-          return false
+          false
         else
           self.access_token = creds.access_token
           self.expires_in = creds.expires_in
 
           if application_client?
-            self.access_token = creds.access_token
+            self.refresh_token = creds.refresh_token
           end
 
-          return true
+          true
         end
       end
-      alias :refresh :oauth_refresh_token
 
     end
   end

data/lib/bwapi/client/projects.rb

@@ -18,7 +18,7 @@ module BWAPI
       # Get all projects
       #
       # @param opts [Hash] options hash of parameters
-      # @option opts [Integer] page Page of projects to retrieve
+      # @option opts [Integer] pagePage of projects to retrieve
       # @option opts [Integer] pageSize Results per page of results
       # @return [Hashie::Mash] All projects
       def projects opts={}

data/lib/bwapi/request.rb

@@ -50,35 +50,38 @@ module BWAPI
 
     private
 
-    # Perform a request
+    # Sets connection options
     #
-    # @param method [String] Type of request path
-    # @param path [String] URL path to send request
-    # @param opts [Hash] Request parameters
-    # @return [Hashie::Mash] Response
-    def request method, path, opts={}
-      conn_opts = {
+    # @param opts [Hash] hash of opts passed
+    # @return [Hash] connection options
+    def connection_options opts
+      {
         :headers => {
+          :authorization => access_token ? "bearer #{access_token}" : "",
           :user_agent => user_agent
         },
         :force_urlencoded => opts.delete(:force_urlencoded) || false,
         :url => api_endpoint,
         :ssl => {:verify => verify_ssl}
       }
+    end
 
-      response = connection(conn_opts).send(method) do |request|
-        # Add token to the header
-        if access_token
-          request.headers[:authorization] = "bearer #{access_token}"
-        end
-
+    # Perform a request
+    #
+    # @param method [String] Type of request path
+    # @param path [String] URL path to send request
+    # @param opts [Hash] Request parameters
+    # @return [Hashie::Mash] Response
+    def request method, path, opts={}
+      conn_options = connection_options opts
+      response = connection(conn_options).send(method) do |request|
         case method
         when :get
           request.url path, opts
         when :delete
           request.url path, opts
         when :patch, :post, :put
-          if conn_opts[:force_urlencoded]
+          if conn_options[:force_urlencoded]
             request.url path, opts
           else
             request.path = path

data/lib/bwapi/version.rb

@@ -1,3 +1,3 @@
 module BWAPI
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jonathan Chrisp
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Brandwatch v2 API Wrapper