lib/stub_requests/webmock/builder.rb in stub_requests-0.1.9 vs lib/stub_requests/webmock/builder.rb in stub_requests-0.1.10

@@ -19,98 +19,56 @@
     #
     # @author Mikael Henriksson <[e-mail]>
     # @since 0.1.2
     #
     class Builder
-      include HashUtil
-
       #
       # Builds and registers a WebMock::RequestStub
       #
       #
       # @param [Symbol] verb a HTTP verb/method
       # @param [String] uri a URI to call
-      # @param [Hash<Symbol>] options request/response options for Webmock::RequestStub
       #
       # @yield a callback to eventually yield to the caller
       #
-      # @return [WebMock::RequestStub] the registered stub
+      # @return [WebMock::RequestStub]
       #
-      def self.build(verb, uri, options = {}, &callback)
-        new(verb, uri, options, &callback).build
+      def self.build(verb, uri, &callback)
+        new(verb, uri, &callback).build
       end
 
       #
-      # @!attribute [r] request_stub
+      # @!attribute [r] webmock_stub
       #   @return [WebMock::RequestStub] a stubbed webmock request
-      attr_reader :request_stub
+      attr_reader :webmock_stub
       #
-      # @!attribute [r] options
-      #   @return [Hash<Symbol>] options for the stub_request
-      attr_reader :options
-      #
       # @!attribute [r] callback
       #   @return [Block] call back when given a block
       attr_reader :callback
 
       #
       # Initializes a new instance of
       #
       #
       # @param [Symbol] verb a HTTP verb/method
       # @param [String] uri a URI to call
-      # @param [Hash<Symbol>] options request/response options for Webmock::RequestStub
       #
       # @yield a block to eventually yield to the caller
       #
-      def initialize(verb, uri, options = {}, &callback)
-        @request_stub = ::WebMock::RequestStub.new(verb, uri)
-        @options      = options
+      def initialize(verb, uri, &callback)
+        @webmock_stub = ::WebMock::RequestStub.new(verb, uri)
         @callback     = callback
       end
 
       #
       # Prepares a WebMock::RequestStub and registers it in WebMock
       #
       #
       # @return [WebMock::RequestStub] the registered stub
       #
       def build
-        if callback.present?
-          Docile.dsl_eval(request_stub, &callback)
-        else
-          prepare_mock_request
-        end
-
-        request_stub
-      end
-
-      private
-
-      def prepare_mock_request
-        prepare_with
-        prepare_to_return
-        prepare_to_raise
-        request_stub.to_timeout if options[:timeout]
-        request_stub
-      end
-
-      def prepare_with
-        HashUtil.compact(options[:request]) do |request_options|
-          request_stub.with(request_options)
-        end
-      end
-
-      def prepare_to_return
-        HashUtil.compact(options[:response]) do |response_options|
-          request_stub.to_return(response_options)
-        end
-      end
-
-      def prepare_to_raise
-        return unless (error = options[:error])
-
-        request_stub.to_raise(*Array(error))
+        Docile.dsl_eval(webmock_stub, &callback) if callback.present?
+        webmock_stub
       end
     end
   end
 end