bwapi 10.0.0.pre.467 → 10.0.0.pre.470

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYwMGJkMzM5NzFiNTYyMzk4ZWUxZTY0NDhjNTQyZjM4YjA0ZjFiZQ==
+    NjlhYmZiMTNjMjdlN2QwNzA2YmM3MWZjNjg1MmYwZDZmZjg0NWQ0NQ==
   data.tar.gz: !binary |-
-    NmMwODBjZTBjOTk0MDc5MTAxZDdlNzFlNzgwMGNlMjUyNDRmYzVlOA==
+    ZDYyNjNlMjM4M2YzNzMxMzMyNWVkYzMyODc4NjlkYTUzMmI3YjNiNA==
 SHA512:
   metadata.gz: !binary |-
-    ZTRmZjQwZDIyYmY0NWZmMDNlNDIxMjgzNzlmZGU0NGY2NTk1OTZiYTliYzZl
-    ZTI2ZTRiODYxMTk2ODAzODQ5YjRiNjMzMTk3YWQyMzQzYjUwOTUyNWI5ZmYz
-    YzU2M2Y5MDY2Y2Q3ZTFkY2IwMGQzYzMzOWU2MjQ5Nzk5NTRlNjc=
+    YWI4MGRmMWYwNGRjOTBjOWNjMDg0ODFjN2VkOWYxODcyNWNhOGUxOTZiNzBm
+    OTdjNmZjMjMwOWE1NGI1NWZkYmQxMTQyZjBjYTNiMTYwNjExNWQ5ZjgzMjMz
+    NjAxOGE4NjQ5OTJjYWQyOTc0YTcxN2U3NDE0YTU3NTk4NDI3N2Y=
   data.tar.gz: !binary |-
-    NjVhOWMwYmRjY2E0YjJmMGEzMTQzZjg5YjMxM2E3YTk0MjYzOWMwNDkxNzdh
-    OTlmNjkwNzRhNDcxNGZiOWI2MTY3YWJkYzNiZjgyYmVhNTYxNWM4Y2M3NTM1
-    NmY1ODlhYjMyYTY4NDk4ZDVhOWNmYjRjZmQ1MDBjMzJjNjA4Nzk=
+    OTkwOTBjNzg3OWM0Yjc0OTQwMWZhMGVmZTM2M2JhNDg2NzM0ZmJkNTFiYjkz
+    ZGRjMWRlNzk4NGMzOTRhMTYxYTY2MTdiZDJhYjgwOTQ5NTRhZjAzZTA5OGZk
+    NDhkMjY3NDgyMThmOTk0MDlmNzNkMWZmY2MzMzEwMTYwYjhhYmE=

data/lib/bwapi/request.rb

@@ -57,21 +57,51 @@ module BWAPI
     # @param opts [Hash] Request parameters
     # @return [Hash] Response
     def request(method, path, opts = {})
-      response = connection.send(method) do |r|
+      connection.send(method) do |req|
         case method
         when :get, :delete
-          r.url path, opts
+          request_url(req, path, opts)
         when :patch, :post, :put
-          if opts.is_a?(Hash) && opts.key?(:force_urlencoded)
-            opts.delete(:force_urlencoded)
-            r.url path, opts
-          else
-            r.path = path
-            r.body = opts
-          end
+          request_body(req, path, opts)
         end
       end
-      response
+    end
+
+    # Configures url encoded request unless force_body key is passed
+    #
+    # @param req [Object] the request object
+    # @param path [String] URL path to send request
+    # @param opts [Hash] Request parameters
+    def request_url(req, path, opts)
+      if key?(opts, :force_body)
+        req.path, req.body = path, opts
+      else
+        req.url path, opts
+      end
+    end
+
+    # Configures body request unless force_urlencoded key is passed
+    #
+    # @param req [Object] the request object
+    # @param path [String] URL path to send request
+    # @param opts [Hash] Request parameters
+    def request_body(req, path, opts)
+      if key?(opts, :force_urlencoded)
+        req.url path, opts
+      else
+        req.path, req.body = path, opts
+      end
+    end
+
+    # Checks if a request options has a given key
+    # Deletes the key if it is present
+    #
+    # @param opts [Hash] Request parameters
+    # @param key [Symbol] The key to check for
+    # @return [Boolean] false or key value
+    def key?(opts, key)
+      return false unless opts.is_a?(Hash) && opts.key?(key)
+      opts.delete(key)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.467
+  version: 10.0.0.pre.470
 platform: ruby
 authors:
 - Jonathan Chrisp