wiremock_mapper 1.0.1 → 1.1.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: [:rubocop, :spec]
 
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']

data/lib/builders/helpers.rb

@@ -1,8 +1,10 @@
 module WireMockMapper
   module Builders
     module Helpers
-      def self.regexp_to_string(regexp)
-        %r{^/(.*)/$}.match(regexp.inspect)[1]
+      class << self
+        def regexp_to_string(regexp)
+          %r{^/(.*)/$}.match(regexp.inspect)[1]
+        end
       end
     end
   end

data/lib/builders/match_builder.rb

@@ -35,7 +35,7 @@ module WireMockMapper
       end
 
       # Match if attribute json is equal to the arg
-      # @param json [String] json to compare against
+      # @param json [String, Hash] 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

data/lib/wiremock_mapper.rb

@@ -2,29 +2,54 @@ require 'net/http'
 require_relative 'configuration'
 
 module WireMockMapper
-  def self.create_mapping(url = Configuration.wiremock_url)
-    request_builder = deep_clone(Configuration.request_builder)
-    response_builder = deep_clone(Configuration.response_builder)
+  class << self
+    def create_mapping(url = Configuration.wiremock_url)
+      request_builder = deep_clone(Configuration.request_builder)
+      response_builder = deep_clone(Configuration.response_builder)
 
-    yield request_builder, response_builder
+      yield request_builder, response_builder
 
-    send_to_wiremock(url, request: request_builder, response: response_builder)
-  end
+      response = send_to_wiremock(url, request: request_builder, response: response_builder)
+      JSON.parse(response.body).fetch('id')
+    end
 
-  WIREMOCK_NEW_MAPPING_PATH = '__admin/mappings/new'.freeze
-  private_constant :WIREMOCK_NEW_MAPPING_PATH
+    def delete_mapping(mapping_id, url = Configuration.wiremock_url)
+      delete_from_wiremock(url, mapping_id)
+    end
 
-  def self.deep_clone(object)
-    Marshal.load(Marshal.dump(object))
-  end
-  private_class_method :deep_clone
-
-  def self.send_to_wiremock(url, body)
-    uri = URI(URI.join(url, WIREMOCK_NEW_MAPPING_PATH))
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
-    request.body = body.to_json
-    http.request(request)
+    def clear_mappings(url = Configuration.wiremock_url)
+      clear_wiremock_mappings(url)
+    end
+
+    private
+
+    WIREMOCK_MAPPINGS_PATH = '__admin/mappings'.freeze
+    WIREMOCK_CLEAR_MAPPINGS_PATH = "#{WIREMOCK_MAPPINGS_PATH}/reset".freeze
+
+    def deep_clone(object)
+      Marshal.load(Marshal.dump(object))
+    end
+
+    def clear_wiremock_mappings(url)
+      uri = URI([url, WIREMOCK_CLEAR_MAPPINGS_PATH].join('/'))
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Post.new(uri.path)
+      http.request(request)
+    end
+
+    def delete_from_wiremock(url, mapping_id)
+      uri = URI([url, WIREMOCK_MAPPINGS_PATH, mapping_id].join('/'))
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Delete.new(uri.path)
+      http.request(request)
+    end
+
+    def send_to_wiremock(url, body)
+      uri = URI([url, WIREMOCK_MAPPINGS_PATH].join('/'))
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
+      request.body = body.to_json
+      http.request(request)
+    end
   end
-  private_class_method :send_to_wiremock
 end

data/spec/wiremock_mapper_spec.rb

@@ -11,7 +11,9 @@ describe WireMockMapper do
                                              { 'matches' => 'some request body' }
                                            ] },
                                 response: { 'body' => 'some response body' } }
-      stub_request(:post, "#{url}/__admin/mappings/new").with(body: expected_request_body)
+
+      stub = stub_request(:post, "#{url}/__admin/mappings").with(body: expected_request_body)
+                                                           .to_return(body: { id: 'whatevs' }.to_json)
 
       WireMockMapper.create_mapping(url) do |request, respond|
         request.is_a_post
@@ -21,23 +23,27 @@ describe WireMockMapper do
 
         respond.with_body('some response body')
       end
+
+      expect(stub).to have_been_requested
     end
 
-    # rubocop:disable Metrics/LineLength
     it 'posts the correct json with configured global mappings to the wiremock url' do
       url = 'http://nowhere.com'
       expected_request_body = { request: { 'method' => 'POST',
                                            'url' => '/some/url',
-                                           'headers' => { 'some_global_header' => { 'equalTo' => 'some global header value' },
+                                           'headers' => { 'some_global_header' => { 'equalTo' => 'global value' },
                                                           'some_header' => { 'equalTo' => 'some header value' } },
                                            'bodyPatterns' => [
                                              { 'matches' => 'some request body' }
                                            ] },
                                 response: { 'body' => 'some response body' } }
-      stub_request(:post, "#{url}/__admin/mappings/new").with(body: expected_request_body)
 
-      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)
+      stub = stub_request(:post, "#{url}/__admin/mappings").with(body: expected_request_body)
+                                                           .to_return(body: { id: 'whatevs' }.to_json)
+
+      WireMockMapper::Configuration.create_global_mapping do |request|
+        request.with_header('some_global_header').equal_to('global value')
+      end
 
       WireMockMapper.create_mapping(url) do |request, respond|
         request.is_a_post
@@ -47,7 +53,29 @@ describe WireMockMapper do
 
         respond.with_body('some response body')
       end
+
+      expect(stub).to have_been_requested
+    end
+  end
+
+  describe 'delete_mapping' do
+    it 'issues a DELETE for the supplied mapping id' do
+      mapping_id = 'james-james-james'
+      url = 'http://nowhere.com'
+      stub = stub_request(:delete, "#{url}/__admin/mappings/#{mapping_id}")
+      WireMockMapper.delete_mapping(mapping_id, url)
+
+      expect(stub).to have_been_requested
+    end
+  end
+
+  describe 'clear_mappings' do
+    it 'POSTS to the wiremock __admin/mappings/reset path' do
+      url = 'http://nowhere.com'
+      stub = stub_request(:post, "#{url}/__admin/mappings/reset")
+      WireMockMapper.clear_mappings(url)
+
+      expect(stub).to have_been_requested
     end
-    # rubocop:enable Metrics/LineLength
   end
 end

data/wiremock_mapper.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 
 Gem::Specification.new do |spec|
   spec.name             = 'wiremock_mapper'
-  spec.version          = '1.0.1'
+  spec.version          = '1.1.0'
   spec.platform         = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 1.9.3'
   spec.authors          = ['Isaac Datlof']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiremock_mapper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter