dock_test 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d02f2bd497b1164ea2681c4d3e511d80ba5d4e
-  data.tar.gz: 76b280e326bb795ac5a5346bff4cfa4d8e929221
+  metadata.gz: 69b4418dfb475cb98e6a1f5fb3c06c42cf5ad7d9
+  data.tar.gz: 84b502628f75912d52ab1bfd4c853e1011dfab14
 SHA512:
-  metadata.gz: f38ac82284f77aeeaf6f36c57d789d0bf4dcfac4664adbcbe37727ec8520628dc92901ac52feab7f50d16fd5e274a59d34e75c85c3c4ce360e947013eb50f27e
-  data.tar.gz: 0f48db876fea3d8b463ecc3b019cdc89c89ae4ddf4aaf32b0c389cfec13a18252acca600e4580e14cda53bdaa14968cb04c3ddaeabbe62e29f8321529334c334
+  metadata.gz: ed1c9a530b71541d4d7fc6c44c81dc1b3f3bbee98539c8bd9bdeff84f3e48cf4179cf782f5ad0484b4646fa311833f34ffb6a2de00b94eeafb1eefab3409f8a2
+  data.tar.gz: f7dd09585cf31346a3ce24c382495d6ac81edceb4ba36aba578c41436d8386bdb9ff4f2a6f5f689997ac8367b33989322bcaca79c2efc0cc0a23dddbc080e13f

data/lib/dock_test.rb

@@ -2,6 +2,7 @@ require 'multi_json'
 require 'nokogiri'
 require 'json-schema'
 require 'dock_test/version'
+require 'dock_test/request_context'
 require 'dock_test/methods'
 require 'dock_test/dsl'
 

data/lib/dock_test/methods.rb

@@ -6,13 +6,16 @@ module DockTest
     %w(get post put patch delete options head).each do |meth_name|
       define_method meth_name do |path, params = '', headers = {}, &block|
 
-        if verb_has_side_effects?(meth_name) && DockTest.skippy?
-          skip_test_to_avoid_side_efforts
+        context = RequestContext.new(verb: meth_name, path: path, params: params, headers: headers)
+
+        if DockTest.skippy? && context.verb_has_side_effects
+          skip('this test is skipped in order to avoid potential side effects.')
         end
 
-        construct_request(meth_name, path, params, headers)
+        @last_request = context.http_request
+        @last_response = context.execute
 
-        execute_request
+        puts context.curl_command if ENV['OUTPUT_CURL']
 
         yield @last_response if block_given?
 
@@ -23,71 +26,6 @@ module DockTest
 
     private
 
-      def execute_request
-        # execute the request
-        @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?
-            @last_request['Authorization'] =
-              SimpleOAuth::Header.new(@last_request.method,
-                                      request_url,
-                                      {},
-                                      :consumer_key => DockTest.oauth_consumer_key,
-                                      :consumer_secret => DockTest.oauth_consumer_secret)
-          end
-
-          if ENV['OUTPUT_CURL']
-            headers_string = @last_request.to_hash.map {|key, vals| vals.map {|val| [key, val]}.flatten}.map {|x| "-H '#{x[0].capitalize}: #{x[1]}'"}.join(' ')
-            puts "curl -vv -X #{@last_request.method.upcase} -d '#{@last_request.body}' #{headers_string} '#{request_url}'"
-          end
-
-          http.request(@last_request)
-        end
-      end
-
-      def construct_request(meth_name, path, params, headers)
-
-        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
-
-      def construct_uri(meth_name, path, params)
-        request_url = full_url(DockTest.url, path)
-        @uri = URI.parse(request_url).tap do |uri|
-
-          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)
-      end
-
       def last_response
         @last_response
       end
@@ -100,19 +38,5 @@ module DockTest
         @last_request
       end
 
-      def skip_test_to_avoid_side_efforts
-        skip('this test is skipped in order to avoid potential side effects.')
-      end
-
-      # cleanse and combine url and path to retrieve a valid full url
-      def full_url(url, path)
-        if path.start_with?('http')
-          path
-        else
-          url = url[0..1] if url.end_with?('/')
-          path = path[1..-1] if path.start_with?('/')
-          "#{url}/#{path}"
-        end
-      end
   end
 end

data/lib/dock_test/request_context.rb

@@ -0,0 +1,92 @@
+require 'simple_oauth'
+
+module DockTest
+  class RequestContext
+
+    def initialize(options)
+      @options = options
+    end
+
+    def http_request
+      @_request ||= Net::HTTP.const_get(verb.capitalize).new(uri.request_uri).tap do |req|
+
+                      # add the params to the body of other requests
+                      req.body = params if verb_has_side_effects?
+
+                      # sets the headers
+                      headers.each do |key, value|
+                        req[key] = value
+                      end
+                    end
+    end
+
+    def curl_command
+      headers_string = http_request.to_hash.
+                            map {|key, vals| vals.map {|val| [key, val]}.flatten}.
+                            map {|x| "-H '#{x[0].capitalize}: #{x[1]}'"}.join(' ')
+      "curl -vv -X #{http_request.method.upcase} -d '#{http_request.body}' #{headers_string} '#{request_url}'"
+    end
+
+    def execute
+      Net::HTTP.start(uri.hostname, uri.port,
+                      :use_ssl => (uri.scheme == 'https'),
+                      :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+
+        oauth_sign! if DockTest.oauth? # processing oauth signing
+
+        http.request(http_request)
+      end
+
+    end
+
+    def verb_has_side_effects?
+      %w(post put patch delete).include?(verb)
+    end
+
+    private
+
+      def verb()     @options[:verb];    end
+      def path()     @options[:path];    end
+      def headers()  @options[:headers]; end
+      def params()   @options[:params];  end
+      def endpoint() DockTest.url;      end
+
+      def oauth_sign!
+        http_request['Authorization'] =
+          SimpleOAuth::Header.new(verb,
+                                  request_url,
+                                  {},
+                                  :consumer_key => DockTest.oauth_consumer_key,
+                                  :consumer_secret => DockTest.oauth_consumer_secret)
+      end
+
+      def uri
+        @_uri ||= URI.parse(request_url).tap do |uri|
+
+                    uri.port = DockTest.port if DockTest.localhost?
+
+                    # add the params to the GET requests
+                    if !verb_has_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
+                  end
+      end
+
+      def request_url
+        end_path = path().dup
+        if end_path.start_with?('http')
+          end_path
+        else
+          url = endpoint.dup
+          url = url[0..1] if url.end_with?('/')
+          end_path = end_path[1..-1] if end_path.start_with?('/')
+          "#{url}#{path}"
+        end
+      end
+
+  end
+end

data/lib/dock_test/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock_test
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Jack Xu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,7 @@ files:
 - lib/dock_test/assertions.rb
 - lib/dock_test/dsl.rb
 - lib/dock_test/methods.rb
+- lib/dock_test/request_context.rb
 - lib/dock_test/version.rb
 - schemas/response.schema.json
 - schemas/response.schema.xsd