dock_test 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8581199686fbe02a48c12fe6c5c1a8054d78d98
-  data.tar.gz: 9efc94514c0b47fdc40ad59c35753462cf823952
+  metadata.gz: d7d02f2bd497b1164ea2681c4d3e511d80ba5d4e
+  data.tar.gz: 76b280e326bb795ac5a5346bff4cfa4d8e929221
 SHA512:
-  metadata.gz: 0568f54759aeb0218096e83cf83e3c2dad52162c8992694e1ffa515d8787ec3486779fb1fbf0060afde76f782e6ace60ddd8e3bbf3ad458cee99906b97e4f5d5
-  data.tar.gz: 9ccf38447390a0c1600e5c2699ad1d0de6a8c2f85a4636ca3e1ce3ef259fff21b6115077726e9317bc03394573744eb62ba34fbf64001671d4f0fe23a69615d2
+  metadata.gz: f38ac82284f77aeeaf6f36c57d789d0bf4dcfac4664adbcbe37727ec8520628dc92901ac52feab7f50d16fd5e274a59d34e75c85c3c4ce360e947013eb50f27e
+  data.tar.gz: 0f48db876fea3d8b463ecc3b019cdc89c89ae4ddf4aaf32b0c389cfec13a18252acca600e4580e14cda53bdaa14968cb04c3ddaeabbe62e29f8321529334c334

data/lib/dock_test/methods.rb

@@ -6,43 +6,27 @@ module DockTest
     %w(get post put patch delete options head).each do |meth_name|
       define_method meth_name do |path, params = '', headers = {}, &block|
 
-        with_side_effects = verb_has_side_effects?(meth_name)
-
-        if with_side_effects && DockTest.skippy?
+        if verb_has_side_effects?(meth_name) && DockTest.skippy?
           skip_test_to_avoid_side_efforts
         end
 
-        request_url = full_url(DockTest.url, path)
-        uri = URI.parse(request_url)
+        construct_request(meth_name, path, params, headers)
 
-        if DockTest.localhost?
-          uri.port = DockTest.port
-        end
+        execute_request
 
-        # add the params to the GET requests
-        if !with_side_effects && !params.empty?
-          if(params.is_a?(Hash))
-            uri.query = URI.encode_www_form(URI.decode_www_form(uri.query || '') + params.to_a)
-          else
-            uri.query = uri.query.nil? ? params : "#{uri.query}&#{params}"
-          end
-        end
+        yield @last_response if block_given?
 
-        @last_request = Net::HTTP.const_get(meth_name.capitalize).new(uri.request_uri)
+        @last_response
+      end
 
-        # add the params to the body of other requests
-        if with_side_effects
-          @last_request.body = params
-        end
+    end
 
-        # sets the headers
-        headers.each do |key, value|
-          @last_request[key] = value
-        end
+    private
 
+      def execute_request
         # execute the request
-        @last_response = Net::HTTP.start(uri.hostname, uri.port,
-                                        :use_ssl => (uri.scheme == 'https'),
+        @last_response = Net::HTTP.start(@uri.hostname, @uri.port,
+                                        :use_ssl => (@uri.scheme == 'https'),
                                         :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
           # processing oauth signing
           if DockTest.oauth?
@@ -61,16 +45,44 @@ module DockTest
 
           http.request(@last_request)
         end
+      end
 
-        yield @last_response if block_given?
+      def construct_request(meth_name, path, params, headers)
 
-        @last_response
+        construct_uri(meth_name, path, params)
+
+        @last_request = Net::HTTP.const_get(meth_name.capitalize).new(@uri.request_uri).tap do |req|
+
+          # add the params to the body of other requests
+          if verb_has_side_effects?(meth_name)
+            req.body = params
+          end
+
+          # sets the headers
+          headers.each do |key, value|
+            req[key] = value
+          end
+        end
       end
 
-      private meth_name
-    end
+      def construct_uri(meth_name, path, params)
+        request_url = full_url(DockTest.url, path)
+        @uri = URI.parse(request_url).tap do |uri|
 
-    private
+          if DockTest.localhost?
+            uri.port = DockTest.port
+          end
+
+          # add the params to the GET requests
+          if !verb_has_side_effects?(meth_name) && !params.empty?
+            if(params.is_a?(Hash))
+              uri.query = URI.encode_www_form(URI.decode_www_form(uri.query || '') + params.to_a)
+            else
+              uri.query = uri.query.nil? ? params : "#{uri.query}&#{params}"
+            end
+          end
+        end
+      end
 
       def verb_has_side_effects?(verb)
         %w(post put patch delete).include?(verb)

data/lib/dock_test/version.rb

@@ -1,3 +1,3 @@
 module DockTest
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock_test
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Jack Xu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement