wiremock_mapper 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fa1527716e579fdceae8884c5afbe07db66862
-  data.tar.gz: ca83101dfb8018ed99bcc69193e21f9f5c283d45
+  metadata.gz: 9f120074815585f809be94a0c688f74dab08a525
+  data.tar.gz: 3aa65a0f6e7f0b48b68093a4d424dd694447cbf1
 SHA512:
-  metadata.gz: f7962ea5867013599c6883d8f6eacb06b30dac8718168803099a1026b28f29b500dd7894204b0445f68dabfb556156b33be657f1f366f190cfe4aceebd2cc7f3
-  data.tar.gz: 58ce785da47a5997b4d13d24d1186321e3792701124e7cd7f7d6e0c8ea5b8badb3c07978e22b64e4cf84acfa05ebedff34a3f4497ddcbc715cb4bbdf2f7ea5c0
+  metadata.gz: 1cc94dd1aa580de748d23ff5231cfd612a950b0134cb9d6714e0a070670766e7a3aaff11f384ee712ef9e3dc763d2598cc070b54b09b67364bbbcc2a3c923541
+  data.tar.gz: 876d7d72b05cdd6c15a5da27ff9e1a55e5bfe2df554b0e1541afb70a1c4d4c82ebfff2a76ec466a031b9e8c278ba5618df42ef920c8629e265df7be7b28cb3d7

data/lib/builders/match_builder.rb

@@ -0,0 +1,106 @@
+module WireMockMapper
+  module Builders
+    class MatchBuilder
+      def initialize(request_builder)
+        @request_builder = request_builder
+        @type = ''
+        @value = ''
+        @options = {}
+      end
+
+      # Match if attribute is absent
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def absent
+        @type = :absent
+        @value = true
+        @request_builder
+      end
+
+      # Match if attribute value contains the arg
+      # @param value [String] string to match
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def containing(value)
+        @type = :contains
+        @value = value
+        @request_builder
+      end
+
+      # Match if attribute value is equal to the arg
+      # @param value [String] string to compare against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def equal_to(value)
+        @type = :equalTo
+        @value = value
+        @request_builder
+      end
+
+      # Match if attribute json is equal to the arg
+      # @param json [String] json to compare against
+      # @param ignore_array_order [true, false] flag to ignore the order of arrays
+      # @param ignore_extra_elements [true, false] flag to ignore any extra elements
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def equal_to_json(json, ignore_array_order = false, ignore_extra_elements = false)
+        @type = :equalToJson
+        @value = json
+
+        @options[:ignoreArrayOrder] = true if ignore_array_order
+        @options[:ignoreExtraElements] = true if ignore_extra_elements
+
+        @request_builder
+      end
+
+      # Match if attribute xml is equal to the arg
+      # @param xml [String] xml to compare against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def equal_to_xml(xml)
+        @type = :equalToXml
+        @value = xml
+        @request_builder
+      end
+
+      # Match if attribute value matches the regex_string
+      # @param regex_string [String] xml to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def matching(regex_string)
+        @type = :matches
+        @value = regex_string
+        @request_builder
+      end
+
+      # Match if attribute json matches the json_path
+      # @param json_path [String] json_path to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def matching_json_path(json_path)
+        @type = :matchesJsonPath
+        @value = json_path
+        @request_builder
+      end
+
+      # Match if attribute xml matches the xpath
+      # @param xpath [String] xpath to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def matching_xpath(xpath)
+        @type = :matchesXPath
+        @value = xpath
+        @request_builder
+      end
+
+      # Match if attribute value does not match
+      # @param regex_string [String] regex_string to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def not_matching(regex_string)
+        @type = :doesNotMatch
+        @value = regex_string
+        @request_builder
+      end
+
+      def to_hash(*)
+        { @type => @value }.merge(@options)
+      end
+
+      def to_json(*)
+        to_hash.to_json
+      end
+    end
+  end
+end

data/lib/builders/request_builder.rb

@@ -0,0 +1,124 @@
+require_relative 'match_builder'
+require_relative 'url_match_builder'
+
+module WireMockMapper
+  module Builders
+    class RequestBuilder
+      def initialize
+        @options = {}
+      end
+
+      ##
+      # @!method receives_any
+      # Sets the request HTTP method to ANY
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_delete
+      # Sets the request HTTP method to DELETE
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_get
+      # Sets the request HTTP method to GET
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_head
+      # Sets the request HTTP method to HEAD
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_options
+      # Sets the request HTTP method to OPTIONS
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_post
+      # Sets the request HTTP method to POST
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_put
+      # Sets the request HTTP method to PUT
+      # @return [RequestBuilder] request builder for chaining
+
+      ##
+      # @!method receives_trace
+      # Sets the request HTTP method to TRACE
+      # @return [RequestBuilder] request builder for chaining
+      HTTP_VERBS = %w(ANY DELETE GET HEAD OPTIONS POST PUT TRACE).freeze
+      private_constant :HTTP_VERBS
+
+      HTTP_VERBS.each do |verb|
+        define_method("receives_#{verb.downcase}") do
+          @options[:method] = verb
+          self
+        end
+      end
+
+      # Expect basic auth
+      # @param username [String] username to expect
+      # @param password [String] password to expect
+      # @return [RequestBuilder] request builder for chaining
+      def with_basic_auth(username, password)
+        @options[:basicAuth] = { username: username, password: password }
+        self
+      end
+
+      # Expect body
+      # @return [MatchBuilder] match builder to declare the match on the body
+      def with_body
+        @options[:bodyPatterns] ||= []
+        match_builder = MatchBuilder.new(self)
+        @options[:bodyPatterns] << match_builder
+        match_builder
+      end
+
+      # Expect cookie
+      # @param key [String] the cookie key
+      # @return [MatchBuilder] match builder to declare the match on the cookie
+      def with_cookie(key)
+        @options[:cookies] ||= {}
+        @options[:cookies][key] = MatchBuilder.new(self)
+      end
+
+      # Expect header
+      # @param key [String] the header key
+      # @return [MatchBuilder] match builder to declare the match on the header
+      def with_header(key)
+        @options[:headers] ||= {}
+        @options[:headers][key] = MatchBuilder.new(self)
+      end
+
+      # Expect query param
+      # @param key [String] the query param key
+      # @return [MatchBuilder] match builder to declare the match on the query param
+      def with_query_param(key)
+        @options[:queryParameters] ||= {}
+        @options[:queryParameters][key] = MatchBuilder.new(self)
+      end
+
+      # Expect url path with query params
+      # @return [UrlMatchBuilder] url match builder to declare the match on the url
+      def with_url
+        @url_match = UrlMatchBuilder.new(self)
+      end
+
+      # Expect url path only
+      # @return [UrlMatchBuilder] url match builder to declare the match on the url
+      def with_url_path
+        @url_match = UrlMatchBuilder.new(self, true)
+      end
+
+      def to_hash(*)
+        options_with_url_match = @options.merge(@url_match.to_hash) if @url_match
+        options_with_url_match || @options
+      end
+
+      def to_json(*)
+        to_hash.to_json
+      end
+    end
+  end
+end

data/lib/builders/response_builder.rb

@@ -0,0 +1,52 @@
+module WireMockMapper
+  module Builders
+    class ResponseBuilder
+      def initialize
+        @options = {}
+      end
+
+      # Response body
+      # @param value [String] the value to set the response body to
+      # @return [ResponseBuilder] response builder for chaining
+      def with_body(value)
+        value = value.to_json unless value.is_a? String
+        @options[:body] = value
+        self
+      end
+
+      # Add a response header
+      # @param key [String] the key of the header
+      # @param value [String] the value of the header
+      # @return [ResponseBuilder] response builder for chaining
+      def with_header(key, value)
+        @options[:headers] ||= {}
+        @options[:headers][key] = value
+        self
+      end
+
+      # Add a response http status
+      # @param status_code [String, Numeric] the status code to respond with
+      # @return [ResponseBuilder] response builder for chaining
+      def with_status(status_code)
+        @options[:status] = status_code
+        self
+      end
+
+      # Add a response http status
+      # @param status_code [String] the status message to respond with
+      # @return [ResponseBuilder] response builder for chaining
+      def with_status_message(status_message)
+        @options[:statusMessage] = status_message
+        self
+      end
+
+      def to_hash(*)
+        @options
+      end
+
+      def to_json(*)
+        @options.to_json
+      end
+    end
+  end
+end

data/lib/builders/url_match_builder.rb

@@ -0,0 +1,38 @@
+module WireMockMapper
+  module Builders
+    class UrlMatchBuilder
+      def initialize(request_builder, path = false)
+        @request_builder = request_builder
+        @path = path
+        @type = ''
+        @url_or_pattern = ''
+      end
+
+      # Expect url to equal
+      # @param url [String] url to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def equal_to(url)
+        @type = @path ? :urlPath : :url
+        @url_or_pattern = url
+        @request_builder
+      end
+
+      # Expect url to match
+      # @param regex_string [String] regex for url to match against
+      # @return [RequestBuilder] calling request builder for chaining additional attributes
+      def matching(regex_string)
+        @type = @path ? :urlPathPattern : :urlPattern
+        @url_or_pattern = regex_string
+        @request_builder
+      end
+
+      def to_hash(*)
+        { @type => @url_or_pattern }
+      end
+
+      def to_json(*)
+        to_hash.to_json
+      end
+    end
+  end
+end

data/lib/configuration.rb

@@ -1,12 +1,12 @@
-require_relative 'request_builder'
-require_relative 'response_builder'
+require_relative 'builders/request_builder'
+require_relative 'builders/response_builder'
 
 module WireMockMapper
   class Configuration
     @wiremock_url = ''
 
-    @request_builder = RequestBuilder.new
-    @response_builder = ResponseBuilder.new
+    @request_builder = Builders::RequestBuilder.new
+    @response_builder = Builders::ResponseBuilder.new
 
     class << self
       attr_reader :request_builder, :response_builder, :wiremock_url
@@ -16,13 +16,6 @@ module WireMockMapper
         yield @request_builder, @response_builder
       end
 
-      # Add a request header for all future requests
-      # @param key [String] header key
-      # @return [MatchBuilder] match builder to declare the match on the header
-      def add_request_header(key)
-        @request_headers[key] = MatchBuilder.new(self)
-      end
-
       # Set the WireMock url
       # @param url [String] the url of the WireMock server
       def set_wiremock_url(url)

data/lib/version.rb

@@ -0,0 +1,3 @@
+module WireMockMapper
+  VERSION = '0.6.0'.freeze
+end

data/lib/wiremock_mapper.rb

@@ -1,11 +1,7 @@
 require 'net/http'
 require_relative 'configuration'
-require_relative 'request_builder'
-require_relative 'response_builder'
 
 module WireMockMapper
-  VERSION = '0.4.0'.freeze
-
   def self.create_mapping(url = Configuration.wiremock_url)
     request_builder = deep_clone(Configuration.request_builder)
     response_builder = deep_clone(Configuration.response_builder)

data/spec/configuration_spec.rb

@@ -10,10 +10,11 @@ describe WireMockMapper::Configuration do
       end
 
       header_key_value = WireMockMapper::Configuration.request_builder.to_hash[:headers]['foo']
-      expect(header_key_value).to be_a(WireMockMapper::MatchBuilder)
+      expect(header_key_value).to be_a(WireMockMapper::Builders::MatchBuilder)
 
       # BOOOOOO!
-      WireMockMapper::Configuration.instance_variable_set(:@request_builder, WireMockMapper::RequestBuilder.new)
+      WireMockMapper::Configuration.instance_variable_set(:@request_builder,
+                                                          WireMockMapper::Builders::RequestBuilder.new)
     end
   end
 

data/spec/match_builder_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe WireMockMapper::MatchBuilder do
+describe WireMockMapper::Builders::MatchBuilder do
+  let(:builder) { WireMockMapper::Builders::MatchBuilder.new(nil) }
+
   describe 'absent' do
     it 'returns a hash of { absent => true }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.absent
       expect(builder.to_hash).to eq(absent: true)
     end
@@ -11,7 +12,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'containing' do
     it 'returns a hash of { contains => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.containing 'foo'
       expect(builder.to_hash).to eq(contains: 'foo')
     end
@@ -19,7 +19,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'equal_to' do
     it 'returns a hash of { equalTo => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.equal_to 'foo'
       expect(builder.to_hash).to eq(equalTo: 'foo')
     end
@@ -27,19 +26,16 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'equal_to_json' do
     it 'returns a hash of { equalToJson => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.equal_to_json 'foo'
       expect(builder.to_hash).to eq(equalToJson: 'foo')
     end
 
     it 'returns a hash of { equalToJson => value, ignoreArrayOrder => true }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.equal_to_json 'foo', true
       expect(builder.to_hash).to eq(equalToJson: 'foo', ignoreArrayOrder: true)
     end
 
     it 'returns a hash of { equalToJson => value, ignoreExtraElements => true }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.equal_to_json 'foo', false, true
       expect(builder.to_hash).to eq(equalToJson: 'foo', ignoreExtraElements: true)
     end
@@ -47,7 +43,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'equal_to_xml' do
     it 'returns a hash of { equalToXml => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.equal_to_xml 'foo'
       expect(builder.to_hash).to eq(equalToXml: 'foo')
     end
@@ -55,7 +50,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'matching' do
     it 'returns a hash of { matches => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.matching 'foo'
       expect(builder.to_hash).to eq(matches: 'foo')
     end
@@ -63,7 +57,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'matching_json_path' do
     it 'returns a hash of { matchesJsonPath => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.matching_json_path 'foo'
       expect(builder.to_hash).to eq(matchesJsonPath: 'foo')
     end
@@ -71,7 +64,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'matching_xpath' do
     it 'returns a hash of { matchesXPath => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.matching_xpath 'foo'
       expect(builder.to_hash).to eq(matchesXPath: 'foo')
     end
@@ -79,7 +71,6 @@ describe WireMockMapper::MatchBuilder do
 
   describe 'not_matching' do
     it 'returns a hash of { doesNotMatch => value }' do
-      builder = WireMockMapper::MatchBuilder.new(nil)
       builder.not_matching 'foo'
       expect(builder.to_hash).to eq(doesNotMatch: 'foo')
     end

data/spec/request_builder_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe WireMockMapper::RequestBuilder do
+describe WireMockMapper::Builders::RequestBuilder do
+  let(:builder) { WireMockMapper::Builders::RequestBuilder.new }
+
   describe 'receives_any' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_any
       result = builder.to_hash
       expect(result[:method]).to eq('ANY')
@@ -12,7 +13,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_delete' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_delete
       result = builder.to_hash
       expect(result[:method]).to eq('DELETE')
@@ -21,7 +21,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_get' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_get
       result = builder.to_hash
       expect(result[:method]).to eq('GET')
@@ -30,7 +29,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_head' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_head
       result = builder.to_hash
       expect(result[:method]).to eq('HEAD')
@@ -39,7 +37,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_options' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_options
       result = builder.to_hash
       expect(result[:method]).to eq('OPTIONS')
@@ -48,7 +45,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_put' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_put
       result = builder.to_hash
       expect(result[:method]).to eq('PUT')
@@ -57,7 +53,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_post' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_post
       result = builder.to_hash
       expect(result[:method]).to eq('POST')
@@ -66,7 +61,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'receives_trace' do
     it 'sets the http method and url path' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.receives_trace
       result = builder.to_hash
       expect(result[:method]).to eq('TRACE')
@@ -75,7 +69,6 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'with_basic_auth' do
     it 'adds basic auth' do
-      builder = WireMockMapper::RequestBuilder.new
       builder.with_basic_auth('ike', '123456')
       expect(builder.to_hash[:basicAuth]).to eq(username: 'ike', password: '123456')
     end
@@ -83,12 +76,10 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'with_body' do
     it 'returns a MatchBuilder' do
-      builder = WireMockMapper::RequestBuilder.new
-      expect(builder.with_body).to be_a(WireMockMapper::MatchBuilder)
+      expect(builder.with_body).to be_a(WireMockMapper::Builders::MatchBuilder)
     end
 
     it 'adds the matcher to bodyPatterns' do
-      builder = WireMockMapper::RequestBuilder.new
       matcher = builder.with_body
       expect(builder.to_hash).to eq(bodyPatterns: [matcher])
     end
@@ -96,22 +87,38 @@ describe WireMockMapper::RequestBuilder do
 
   describe 'with_cookie' do
     it 'returns a MatchBuilder' do
-      builder = WireMockMapper::RequestBuilder.new
-      expect(builder.with_cookie(:whatever)).to be_a(WireMockMapper::MatchBuilder)
+      expect(builder.with_cookie(:whatever)).to be_a(WireMockMapper::Builders::MatchBuilder)
     end
   end
 
   describe 'with_header' do
     it 'returns a MatchBuilder' do
-      builder = WireMockMapper::RequestBuilder.new
-      expect(builder.with_header(:whatever)).to be_a(WireMockMapper::MatchBuilder)
+      expect(builder.with_header(:whatever)).to be_a(WireMockMapper::Builders::MatchBuilder)
+    end
+  end
+
+  describe 'with_url' do
+    it 'should return a UrlMatchBuilder' do
+      expect(builder.with_url).to be_a(WireMockMapper::Builders::UrlMatchBuilder)
+    end
+  end
+
+  describe 'with_url_path' do
+    it 'should return a UrlMatchBuilder' do
+      expect(builder.with_url_path).to be_a(WireMockMapper::Builders::UrlMatchBuilder)
+    end
+  end
+
+  describe 'to_hash' do
+    it 'should merge in url_match info' do
+      builder.with_url.equal_to('foo')
+      expect(builder.to_hash).to eq(url: 'foo')
     end
   end
 
   describe 'with_query_param' do
     it 'returns a MatchBuilder' do
-      builder = WireMockMapper::RequestBuilder.new
-      expect(builder.with_query_param(:whatever)).to be_a(WireMockMapper::MatchBuilder)
+      expect(builder.with_query_param(:whatever)).to be_a(WireMockMapper::Builders::MatchBuilder)
     end
   end
 end

data/spec/response_builder_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe WireMockMapper::ResponseBuilder do
+describe WireMockMapper::Builders::ResponseBuilder do
+  let(:builder) { WireMockMapper::Builders::ResponseBuilder.new }
+
   describe 'with_body' do
     it 'adds the body' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_body('some body')
       result = builder.to_hash
       expect(result[:body]).to eq('some body')
     end
 
     it 'converts value to_json if it is not a string' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_body(some: 'hash')
       result = builder.to_hash
       expect(result[:body]).to eq('{"some":"hash"}')
@@ -19,14 +19,12 @@ describe WireMockMapper::ResponseBuilder do
 
   describe 'with_header' do
     it 'adds the header' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_header('key', 'value')
       result = builder.to_hash
       expect(result[:headers]).to eq('key' => 'value')
     end
 
     it 'adds multiple headers' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_header('key', 'value')
       builder.with_header('another key', 'another value')
       result = builder.to_hash
@@ -36,7 +34,6 @@ describe WireMockMapper::ResponseBuilder do
 
   describe 'with_status' do
     it 'adds the status code' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_status(400)
       result = builder.to_hash
       expect(result[:status]).to eq(400)
@@ -45,7 +42,6 @@ describe WireMockMapper::ResponseBuilder do
 
   describe 'with_status_message' do
     it 'adds the status message' do
-      builder = WireMockMapper::ResponseBuilder.new
       builder.with_status_message('message')
       result = builder.to_hash
       expect(result[:statusMessage]).to eq('message')

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
+require 'bundler/setup'
 require 'webmock/rspec'
-require 'codeclimate-test-reporter'
-require 'pry'
 
+Bundler.require :development
 CodeClimate::TestReporter.start
+
+WebMock.disable_net_connect!(allow: 'codeclimate.com')
+
+require_all 'lib'

data/spec/url_match_builder_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
-require_relative '../lib/url_match_builder'
 
-describe WireMockMapper::MatchBuilder do
+describe WireMockMapper::Builders::MatchBuilder do
   context 'initialized with path = true' do
-    let(:builder) { WireMockMapper::UrlMatchBuilder.new(nil, true) }
+    let(:builder) { WireMockMapper::Builders::UrlMatchBuilder.new(nil, true) }
 
     describe 'equal_to' do
       it 'sets the return of to_hash to {urlPath: value}' do
@@ -21,7 +20,7 @@ describe WireMockMapper::MatchBuilder do
   end
 
   context 'initialized with path = false' do
-    let(:builder) { WireMockMapper::UrlMatchBuilder.new(nil) }
+    let(:builder) { WireMockMapper::Builders::UrlMatchBuilder.new(nil) }
 
     describe 'equal_to' do
       it 'sets the return of to_hash to {url: value}' do

data/spec/wiremock_mapper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe WireMockMapper do
-  context 'control' do
+  describe 'create_mapping' do
     it 'posts the correct json to the wiremock url' do
       url = 'http://nowhere.com'
       expected_request_body = { request: { 'method' => 'POST',
@@ -27,7 +27,7 @@ describe WireMockMapper do
     it 'posts the correct json with configured global mappings to the wiremock url' do
       url = 'http://nowhere.com'
       expected_request_body = { request: { 'method' => 'POST',
-                                           'urlPath' => '/some/path',
+                                           'url' => '/some/url',
                                            'headers' => { 'some_global_header' => { 'equalTo' => 'some global header value' },
                                                           'some_header' => { 'equalTo' => 'some header value' } },
                                            'bodyPatterns' => [
@@ -36,12 +36,12 @@ describe WireMockMapper do
                                 response: { 'body' => 'some response body' } }
       stub_request(:post, "#{url}/__admin/mappings/new").with(body: expected_request_body)
 
-      request_builder = WireMockMapper::RequestBuilder.new.with_header('some_global_header').equal_to('some global header value')
+      request_builder = WireMockMapper::Builders::RequestBuilder.new.with_header('some_global_header').equal_to('some global header value')
       expect(WireMockMapper::Configuration).to receive(:request_builder).and_return(request_builder)
 
       WireMockMapper.create_mapping(url) do |request, respond|
         request.receives_post
-               .with_url_path.equal_to('/some/path')
+               .with_url.equal_to('/some/url')
                .with_header('some_header').equal_to('some header value')
                .with_body.matching('some request body')
 

data/wiremock_mapper.gemspec

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
-require 'wiremock_mapper'
+
+require 'version'
 
 Gem::Specification.new do |spec|
   spec.name             = 'wiremock_mapper'
@@ -14,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.summary          = 'Ruby DSL for setting up WireMock mappings'
   spec.description      = spec.summary
 
-  spec.files            = `git ls-files`.split($/)
+  spec.files            = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
   spec.executables      = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.extra_rdoc_files = ['LICENSE.txt', 'README.md']
@@ -23,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'require_all'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiremock_mapper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Isaac Datlof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,11 +124,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/builders/match_builder.rb
+- lib/builders/request_builder.rb
+- lib/builders/response_builder.rb
+- lib/builders/url_match_builder.rb
 - lib/configuration.rb
-- lib/match_builder.rb
-- lib/request_builder.rb
-- lib/response_builder.rb
-- lib/url_match_builder.rb
+- lib/version.rb
 - lib/wiremock_mapper.rb
 - spec/configuration_spec.rb
 - spec/match_builder_spec.rb

data/lib/match_builder.rb

@@ -1,104 +0,0 @@
-module WireMockMapper
-  class MatchBuilder
-    def initialize(request_builder)
-      @request_builder = request_builder
-      @type = ''
-      @value = ''
-      @options = {}
-    end
-
-    # Match if attribute is absent
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def absent
-      @type = :absent
-      @value = true
-      @request_builder
-    end
-
-    # Match if attribute value contains the arg
-    # @param value [String] string to match
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def containing(value)
-      @type = :contains
-      @value = value
-      @request_builder
-    end
-
-    # Match if attribute value is equal to the arg
-    # @param value [String] string to compare against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def equal_to(value)
-      @type = :equalTo
-      @value = value
-      @request_builder
-    end
-
-    # Match if attribute json is equal to the arg
-    # @param json [String] json to compare against
-    # @param ignore_array_order [true, false] flag to ignore the order of arrays
-    # @param ignore_extra_elements [true, false] flag to ignore any extra elements
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def equal_to_json(json, ignore_array_order = false, ignore_extra_elements = false)
-      @type = :equalToJson
-      @value = json
-
-      @options[:ignoreArrayOrder] = true if ignore_array_order
-      @options[:ignoreExtraElements] = true if ignore_extra_elements
-
-      @request_builder
-    end
-
-    # Match if attribute xml is equal to the arg
-    # @param xml [String] xml to compare against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def equal_to_xml(xml)
-      @type = :equalToXml
-      @value = xml
-      @request_builder
-    end
-
-    # Match if attribute value matches the regex_string
-    # @param regex_string [String] xml to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def matching(regex_string)
-      @type = :matches
-      @value = regex_string
-      @request_builder
-    end
-
-    # Match if attribute json matches the json_path
-    # @param json_path [String] json_path to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def matching_json_path(json_path)
-      @type = :matchesJsonPath
-      @value = json_path
-      @request_builder
-    end
-
-    # Match if attribute xml matches the xpath
-    # @param xpath [String] xpath to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def matching_xpath(xpath)
-      @type = :matchesXPath
-      @value = xpath
-      @request_builder
-    end
-
-    # Match if attribute value does not match
-    # @param regex_string [String] regex_string to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def not_matching(regex_string)
-      @type = :doesNotMatch
-      @value = regex_string
-      @request_builder
-    end
-
-    def to_hash(*)
-      { @type => @value }.merge(@options)
-    end
-
-    def to_json(*)
-      to_hash.to_json
-    end
-  end
-end

data/lib/request_builder.rb

@@ -1,83 +0,0 @@
-require_relative 'match_builder'
-require_relative 'url_match_builder'
-
-module WireMockMapper
-  class RequestBuilder
-    def initialize
-      @options = {}
-    end
-
-    HTTP_VERBS = %w(ANY DELETE GET HEAD OPTIONS POST PUT TRACE).freeze
-    private_constant :HTTP_VERBS
-
-    HTTP_VERBS.each do |verb|
-      define_method("receives_#{verb.downcase}") do
-        @options[:method] = verb
-        self
-      end
-    end
-
-    # Expect basic auth
-    # @param username [String] username to expect
-    # @param password [String] password to expect
-    # @return [RequestBuilder] request builder for chaining
-    def with_basic_auth(username, password)
-      @options[:basicAuth] = { username: username, password: password }
-      self
-    end
-
-    # Expect body
-    # @return [MatchBuilder] match builder to declare the match on the body
-    def with_body
-      @options[:bodyPatterns] ||= []
-      match_builder = MatchBuilder.new(self)
-      @options[:bodyPatterns] << match_builder
-      match_builder
-    end
-
-    # Expect cookie
-    # @param key [String] the cookie key
-    # @return [MatchBuilder] match builder to declare the match on the cookie
-    def with_cookie(key)
-      @options[:cookies] ||= {}
-      @options[:cookies][key] = MatchBuilder.new(self)
-    end
-
-    # Expect header
-    # @param key [String] the header key
-    # @return [MatchBuilder] match builder to declare the match on the header
-    def with_header(key)
-      @options[:headers] ||= {}
-      @options[:headers][key] = MatchBuilder.new(self)
-    end
-
-    # Expect query param
-    # @param key [String] the query param key
-    # @return [MatchBuilder] match builder to declare the match on the query param
-    def with_query_param(key)
-      @options[:queryParameters] ||= {}
-      @options[:queryParameters][key] = MatchBuilder.new(self)
-    end
-
-    # Expect url path with query params
-    # @return [UrlMatchBuilder] url match builder to declare the match on the url
-    def with_url
-      @url_match = UrlMatchBuilder.new(self)
-    end
-
-    # Expect url path only
-    # @return [UrlMatchBuilder] url match builder to declare the match on the url
-    def with_url_path
-      @url_match = UrlMatchBuilder.new(self, true)
-    end
-
-    def to_hash(*)
-      options_with_url_match = @options.merge(@url_match.to_hash) if @url_match
-      options_with_url_match || @options
-    end
-
-    def to_json(*)
-      to_hash.to_json
-    end
-  end
-end

data/lib/response_builder.rb

@@ -1,50 +0,0 @@
-module WireMockMapper
-  class ResponseBuilder
-    def initialize
-      @options = {}
-    end
-
-    # Response body
-    # @param value [String] the value to set the response body to
-    # @return [ResponseBuilder] response builder for chaining
-    def with_body(value)
-      value = value.to_json unless value.is_a? String
-      @options[:body] = value
-      self
-    end
-
-    # Add a response header
-    # @param key [String] the key of the header
-    # @param value [String] the value of the header
-    # @return [ResponseBuilder] response builder for chaining
-    def with_header(key, value)
-      @options[:headers] ||= {}
-      @options[:headers][key] = value
-      self
-    end
-
-    # Add a response http status
-    # @param status_code [String, Numeric] the status code to respond with
-    # @return [ResponseBuilder] response builder for chaining
-    def with_status(status_code)
-      @options[:status] = status_code
-      self
-    end
-
-    # Add a response http status
-    # @param status_code [String] the status message to respond with
-    # @return [ResponseBuilder] response builder for chaining
-    def with_status_message(status_message)
-      @options[:statusMessage] = status_message
-      self
-    end
-
-    def to_hash(*)
-      @options
-    end
-
-    def to_json(*)
-      @options.to_json
-    end
-  end
-end

data/lib/url_match_builder.rb

@@ -1,36 +0,0 @@
-module WireMockMapper
-  class UrlMatchBuilder
-    def initialize(request_builder, path = false)
-      @request_builder = request_builder
-      @path = path
-      @type = ''
-      @url_or_pattern = ''
-    end
-
-    # Expect url to equal
-    # @param url [String] url to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def equal_to(url)
-      @type = @path ? :urlPath : :url
-      @url_or_pattern = url
-      @request_builder
-    end
-
-    # Expect url to match
-    # @param regex_string [String] regex for url to match against
-    # @return [RequestBuilder] calling request builder for chaining additional attributes
-    def matching(regex_string)
-      @type = @path ? :urlPathPattern : :urlPattern
-      @url_or_pattern = regex_string
-      @request_builder
-    end
-
-    def to_hash(*)
-      { @type => @url_or_pattern }
-    end
-
-    def to_json(*)
-      to_hash.to_json
-    end
-  end
-end