mockserver-client 1.0.7.pre → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d593d56d5c9005af9a6c183429add811ddec07b7
-  data.tar.gz: 215e26cdc2d7c24295776e993fe7b51935d6da7a
+  metadata.gz: 0c9608d1182a5fd5dad69e1cf7589d75406b920d
+  data.tar.gz: ff425ace2962b277a43488a3a4e6d17bf1381e3a
 SHA512:
-  metadata.gz: 60bba3c35b6ce13f25d935e11316654626e43eba0b8e6dad073ff80c8ffa98917d66044dd3f77e933e48b5ba50b1675845a6fc00e46f44eb648e72babb7efa6b
-  data.tar.gz: 0984c9d95911dd75eda7fde1c5da379d63bd9ab912fcf0d043ae2fe5055ac982bcb7531029e13c2eca7ecfef94facb88b01f4c350caf1e9f40cd0f89301e4058
+  metadata.gz: bd48ddc76ee25042489a8c0c137eb1f772afe5fb8b089166edf5ae1ed31b0f57e6bdb3b0f2a12bce8ce0f58bc4a0d022fb9dda6c4fe8a3cc66d65c2d7c2ce428
+  data.tar.gz: 2230ffbaaca0adb85da49c696707a902c753032640962eadf005b6de3b11acb2312e780b9b8b78b0a933cddac78a6ed199459e4d30d6a804e6550557bb745523

data/README.md

@@ -70,7 +70,7 @@ expectation = expectation do |expectation|
      expectation.request do |request|
         request.method = 'POST'
         request.path = '/login'
-        request.query_parameters << parameter('returnUrl', '/account')
+        request.query_string_parameters << parameter('returnUrl', '/account')
         request.cookies = [cookie('sessionId', '2By8LOhBmaW5nZXJwcmludCIlMDAzMW')]
         request.body = exact("{username: 'foo', password: 'bar'}")
      end

data/lib/mockserver/abstract_client.rb

@@ -26,7 +26,7 @@ module MockServer
     def initialize(host, port)
       fail 'Cannot instantiate AbstractClient class. You must subclass it.' if self.class == AbstractClient
       fail 'Host/port must not be nil' unless host && port
-      @base   = RestClient::Resource.new("http://#{host}:#{port}")
+      @base   = RestClient::Resource.new("http://#{host}:#{port}", headers: { 'Content-Type' => 'application/json' })
       @logger = ::LoggingFactory::DEFAULT_FACTORY.log(self.class)
     end
 
@@ -68,11 +68,10 @@ module MockServer
 
       response = @base[RETRIEVE_ENDPOINT].put(request.to_json)
       logger.debug("Got retrieve response: #{response.code}")
-      expectations = Expectations.new([])
-      parse_string_to_json(response).map { |result| expectations << expectation_from_json(result) } unless response.empty?
-      # expectations = Expectations.new([]).insert(0, (parse_string_to_json(response).map { |result| expectation_from_json(result) } unless response.empty?))
-      expectations.code = response.code
-      expectations
+      requests = Requests.new([])
+      parse_string_to_json(response.body).map { |result| requests << request_from_json(result) } unless response.empty?
+      requests.code = response.code
+      requests
     end
 
     # Request to dump logs to file

data/lib/mockserver/model/cookie.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+require 'hashie'
+require_relative './array_of'
+
+#
+# A class to model cookies in payloads.
+# @author:: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
+#
+module MockServer::Model
+  # Model for cookie
+  class Cookie < Hashie::Dash
+    include Hashie::Extensions::MethodAccess
+    include Hashie::Extensions::IgnoreUndeclared
+    include Hashie::Extensions::Coercion
+
+    property :name, required: true
+    property :value, required: true
+
+    coerce_key :name, String
+    coerce_key :value, String
+  end
+
+  # A collection that only stores cookies
+  class Cookies < ArrayOf
+    def child_class
+      Cookie
+    end
+  end
+
+  # DSL methods for cookie
+  module DSL
+    def cookie(key, value)
+      Cookie.new(name: key, value: value)
+    end
+  end
+end

data/lib/mockserver/model/header.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+require 'hashie'
+require_relative './array_of'
+
+#
+# A class to model headers in payloads.
+# @author:: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
+#
+module MockServer::Model
+  # A class that only stores strings
+  class Strings < ArrayOf
+    def child_class
+      String
+    end
+  end
+
+  # Model for header
+  class Header < Hashie::Dash
+    include Hashie::Extensions::MethodAccess
+    include Hashie::Extensions::IgnoreUndeclared
+    include Hashie::Extensions::Coercion
+
+    property :name, required: true
+    property :values, default: Strings.new([])
+
+    coerce_key :name, String
+    coerce_key :values, Strings
+  end
+
+  # A collection that only stores headers
+  class Headers < ArrayOf
+    def child_class
+      Header
+    end
+  end
+
+  # DSL methods for header
+  module DSL
+    def header(key, *value)
+      Header.new(name: key, values: value)
+    end
+  end
+end

data/lib/mockserver/model/parameter.rb

@@ -39,8 +39,5 @@ module MockServer::Model
     def parameter(key, *value)
       Parameter.new(name: key, values: value)
     end
-
-    alias_method :cookie, :parameter
-    alias_method :header, :parameter
   end
 end

data/lib/mockserver/model/request.rb

@@ -1,6 +1,8 @@
 # encoding: UTF-8
 require 'hashie'
 require_relative './parameter'
+require_relative './header'
+require_relative './cookie'
 require_relative './body'
 require_relative './enum'
 require 'base64'
@@ -26,9 +28,9 @@ module MockServer::Model
 
     property :method, required: true, default: :GET
     property :path, required: true, default: ''
-    property :query_parameters, default: Parameters.new([])
-    property :cookies, default: Parameters.new([])
-    property :headers, default: Parameters.new([])
+    property :query_string_parameters, default: Parameters.new([])
+    property :cookies, default: Cookies.new([])
+    property :headers, default: Headers.new([])
     property :body, transform_with: (lambda do |body|
       is_base_64_body = body && body.type == :BINARY
       body_value = is_base_64_body ? Base64.decode64(body.value) : body.value
@@ -37,10 +39,27 @@ module MockServer::Model
 
     coerce_key :method, HTTPMethod
     coerce_key :path, String
-    coerce_key :query_parameters, Parameters
-    coerce_key :cookies, Parameters
-    coerce_key :headers, Parameters
+    coerce_key :query_string_parameters, Parameters
+    coerce_key :cookies, Cookies
+    coerce_key :headers, Headers
     coerce_key :body, Body
+
+    # Creates a request from a hash
+    # @param payload [Hash] a hash representation of the request
+    def populate_from_payload(payload)
+      @request = payload[MockServer::HTTP_REQUEST]
+      @request = Request.new(symbolize_keys(@request)) if @request
+    end
+  end
+
+  # Class to store a list of mocks - useful for modeling retrieve endpoint result
+  class Requests < ArrayOf
+    # Code is used to store HTTP status code returned from retrieve endpoint
+    attr_accessor :code
+
+    def child_class
+      Request
+    end
   end
 
   # DSL methods related to requests
@@ -51,6 +70,12 @@ module MockServer::Model
       obj
     end
 
+    def request_from_json(payload)
+      request = Request.new(symbolize_keys(payload))
+      yield request if block_given?
+      request
+    end
+
     alias_method :http_request, :request
   end
 end

data/lib/mockserver/model/response.rb

@@ -1,7 +1,8 @@
 # encoding: UTF-8
 require_relative './body'
 require_relative './delay'
-require_relative './parameter'
+require_relative './header'
+require_relative './cookie'
 require 'base64'
 
 #
@@ -16,13 +17,13 @@ module MockServer::Model
     include Hashie::Extensions::Coercion
 
     property :status_code, default: 200
-    property :cookies, default: Parameters.new([])
-    property :headers, default: Parameters.new([])
+    property :cookies, default: Cookies.new([])
+    property :headers, default: Headers.new([])
     property :delay
     property :body
 
-    coerce_key :cookies, Parameters
-    coerce_key :headers, Parameters
+    coerce_key :cookies, Cookies
+    coerce_key :headers, Headers
     coerce_key :delay, Delay
     coerce_key :body, String
   end

data/lib/mockserver/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 # Version for this gem
 module MockServer
-  VERSION = '1.0.7.pre'
+  VERSION = '1.0.7'
 end

data/mockserver-client.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description = 'A Ruby Client for MockServer that enables easy mocking of any system you integrate with via HTTP or HTTPS (i.e. services, web sites, etc)'
 
   spec.required_ruby_version     = '>= 1.9'
-  spec.required_rubygems_version = '~> 2'
+  spec.required_rubygems_version = '~> 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
@@ -21,17 +21,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1'
-  spec.add_development_dependency 'rake', '~> 10.3.2'
-  spec.add_development_dependency 'rspec', '~> 3.0.0'
-  spec.add_development_dependency 'simplecov', '~> 0.8.2'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'simplecov', '~> 0.8'
   spec.add_development_dependency 'webmock', '~> 1.18'
-  spec.add_development_dependency 'rubocop', '~> 0.23.0'
+  spec.add_development_dependency 'rubocop', '~> 0.23'
 
   spec.add_dependency 'hashie', '~> 3.0'
-  spec.add_dependency 'json', '~> 1.8.1'
-  spec.add_dependency 'activesupport', '~> 4.2.0'
-  spec.add_dependency 'rest-client', '~> 1.7.2'
+  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency 'activesupport', '~> 4.1'
+  spec.add_dependency 'rest-client', '~> 1.7'
   spec.add_dependency 'logging_factory', '~> 0.0.2'
-  spec.add_dependency 'thor', '~> 0.19.1'
-  spec.add_dependency 'colorize', '~> 0.7.0'
+  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'colorize', '~> 0.7'
 end

data/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.mock-server</groupId>
         <artifactId>mockserver</artifactId>
-        <version>3.9.17-SNAPSHOT</version>
+        <version>3.10.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,6 +19,34 @@
 
     <build>
         <plugins>
+            <!-- run mock server for ruby client tests -->
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mockserver-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <logLevel>WARN</logLevel>
+                    <serverPort>1080</serverPort>
+                    <proxyPort>1090</proxyPort>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-test</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-test</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- run ruby bundle build and install -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>

data/spec/fixtures/forward_mockserver.json

@@ -1,7 +1,7 @@
 {
-    "httpForward": {
-        "host": "www.mock-server.com",
-        "port": 80,
-        "scheme": "HTTP"
-    }
+  "httpForward": {
+    "host": "www.mock-server.com",
+    "port": 80,
+    "scheme": "HTTP"
+  }
 }

data/spec/fixtures/incorrect_login_response.json

@@ -1,20 +1,20 @@
 {
-    "httpResponse": {
-        "statusCode": 401,
-        "headers": [
-            {
-                "name": "Content-Type",
-                "values": ["application/json; charset=utf-8"]
-            },
-            {
-                "name": "Cache-Control",
-                "values": ["public, max-age=86400"]
-            }
-        ],
-        "body": "incorrect username and password combination",
-        "delay": {
-            "timeUnit": "SECONDS",
-            "value": 1
-        }
+  "httpResponse": {
+    "statusCode": 401,
+    "headers": [
+      {
+        "name": "Content-Type",
+        "values": ["application/json; charset=utf-8"]
+      },
+      {
+        "name": "Cache-Control",
+        "values": ["public, max-age=86400"]
+      }
+    ],
+    "body": "incorrect username and password combination",
+    "delay": {
+      "timeUnit": "SECONDS",
+      "value": 1
     }
+  }
 }

data/spec/fixtures/post_login_request.json

@@ -2,7 +2,7 @@
     "httpRequest": {
         "method": "POST",
         "path": "/login",
-        "queryParameters": [
+        "queryStringParameters": [
             {
                 "name": "returnUrl",
                 "values": ["/account"]
@@ -11,7 +11,7 @@
         "cookies": [
             {
                 "name": "sessionId",
-                "values": ["2By8LOhBmaW5nZXJwcmludCIlMDAzMW"]
+              "value": "2By8LOhBmaW5nZXJwcmludCIlMDAzMW"
             }
         ],
         "body": {

data/spec/fixtures/register_expectation.json

@@ -2,7 +2,7 @@
     "httpRequest": {
         "method": "POST",
         "path": "/login",
-        "queryParameters": [
+        "queryStringParameters": [
             {
                 "values": [
                     "/account"
@@ -12,10 +12,8 @@
         ],
         "cookies": [
             {
-                "values": [
-                    "2By8LOhBmaW5nZXJwcmludCIlMDAzMW"
-                ],
-                "name": "sessionId"
+              "name": "sessionId",
+              "value": "2By8LOhBmaW5nZXJwcmludCIlMDAzMW"
             }
         ],
         "body": {

data/spec/fixtures/retrieved_request.json

@@ -0,0 +1,22 @@
+{
+  "method": "POST",
+  "path": "/login",
+  "queryStringParameters": [
+    {
+      "values": [
+        "/account"
+      ],
+      "name": "returnUrl"
+    }
+  ],
+  "cookies": [
+    {
+      "value": "2By8LOhBmaW5nZXJwcmludCIlMDAzMW",
+      "name": "sessionId"
+    }
+  ],
+  "body": {
+    "type": "STRING",
+    "value": "{\"username\":\"foo\",\"password\":\"bar\"}"
+  }
+}

data/spec/fixtures/search_request.json

@@ -1,6 +1,6 @@
 {
-    "httpRequest": {
-        "method": "POST",
-        "path": "/login"
-    }
+  "httpRequest": {
+    "method": "POST",
+    "path": "/login"
+  }
 }

data/spec/fixtures/times_once.json

@@ -1,6 +1,6 @@
 {
-    "times": {
-        "remainingTimes": 1,
-        "unlimited": "false"
-    }
+  "times": {
+    "remainingTimes": 1,
+    "unlimited": "false"
+  }
 }

data/spec/integration/mock_client_integration_spec.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+require 'rspec'
+require 'net/http'
+require 'webmock/rspec'
+require_relative '../../lib/mockserver-client'
+
+RSpec.configure do |config|
+  include WebMock::API
+  include MockServer
+  include MockServer::UtilityMethods
+  include MockServer::Model::DSL
+
+  # Only accept expect syntax do not allow old should syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+describe MockServer::MockServerClient do
+
+  let(:client) { MockServer::MockServerClient.new('localhost', 1080) }
+
+  before do
+    # To suppress logging output to standard output, write to a temporary file
+    client.logger = LoggingFactory::DEFAULT_FACTORY.log('test', output: 'tmp.log', truncate: true)
+  end
+
+  def create_agent
+    uri      = URI('http://api.nsa.gov:1337/agent')
+    http     = Net::HTTP.new(uri.host, uri.port)
+    req      = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
+    req.body = { name: 'John Doe', role: 'agent' }.to_json
+    res = http.request(req)
+    puts "response #{res.body}"
+  rescue => e
+    puts "failed #{e}"
+  end
+
+  it 'setup complex expectation' do
+    WebMock.allow_net_connect!
+
+    # given
+    mock_expectation = expectation do |expectation|
+      expectation.request do |request|
+        request.method = 'POST'
+        request.path   = '/somePath'
+        request.query_string_parameters << parameter('param', 'someQueryStringValue')
+        request.headers << header('Header', 'someHeaderValue')
+        request.cookies << cookie('cookie', 'someCookieValue')
+        request.body = exact('someBody')
+      end
+
+      expectation.response do |response|
+        response.status_code = 201
+        response.headers << header('header', 'someHeaderValue')
+        response.body  = body('someBody')
+        response.delay = delay_by(:SECONDS, 1)
+      end
+
+      expectation.times = exactly(1)
+    end
+
+    # and
+    expect(client.register(mock_expectation).code).to eq(201)
+
+    # when
+    uri           = URI('http://localhost:1080/somePath')
+    http          = Net::HTTP.new(uri.host, uri.port)
+    req           = Net::HTTP::Post.new('/somePath?param=someQueryStringValue')
+    req['Header'] = 'someHeaderValue'
+    req['Cookie'] = 'cookie=someCookieValue'
+    req.body      = 'someBody'
+    res           = http.request(req)
+
+    # then
+    expect(res.code).to eq('201')
+    expect(res.body).to eq('someBody')
+
+    WebMock.disable_net_connect!
+  end
+
+end

data/spec/mockserver/builder_spec.rb

@@ -5,7 +5,7 @@ describe MockServer::Model::DSL do
 
   it 'generates http requests correctly' do
     mock_request                  = http_request(:POST, '/login')
-    mock_request.query_parameters = [parameter('returnUrl', '/account')]
+    mock_request.query_string_parameters = [parameter('returnUrl', '/account')]
     mock_request.cookies          = [cookie('sessionId', '2By8LOhBmaW5nZXJwcmludCIlMDAzMW')]
     mock_request.body             = exact("{username:'foo', password:'bar'}")
 
@@ -13,7 +13,7 @@ describe MockServer::Model::DSL do
 
     # Block style
     mock_request = request(:POST, '/login') do |request|
-      request.query_parameters = [parameter('returnUrl', '/account')]
+      request.query_string_parameters = [parameter('returnUrl', '/account')]
       request.cookies          = [cookie('sessionId', '2By8LOhBmaW5nZXJwcmludCIlMDAzMW')]
       request.body             = exact("{username:'foo', password:'bar'}")
     end

data/spec/mockserver/mock_client_spec.rb

@@ -12,10 +12,13 @@ describe MockServer::MockServerClient do
     client.logger = LoggingFactory::DEFAULT_FACTORY.log('test', output: 'tmp.log', truncate: true)
 
     # Stub requests
-    stub_request(:put, /.+\/expectation/).with(body: register_expectation_json).to_return(status: 201)
-    stub_request(:put, /.+\/clear/).with(body: search_request_json).to_return(status: 202)
-    stub_request(:put, /.+\/reset/).to_return(status: 202)
-    stub_request(:put, /.+\/retrieve/).with(body: search_request_json).to_return(body: '', status: 200)
+    stub_request(:put, /.+\/expectation/).with(body: register_expectation_json, headers: { 'Content-Type' => 'application/json' }).to_return(status: 201)
+    stub_request(:put, /.+\/clear/).with(body: search_request_json, headers: { 'Content-Type' => 'application/json' }).to_return(status: 202)
+    stub_request(:put, /.+\/reset/).with(headers: { 'Content-Type' => 'application/json' }).to_return(status: 202)
+    stub_request(:put, /.+\/retrieve/).with(body: search_request_json, headers: { 'Content-Type' => 'application/json' }).to_return(
+      body: '[]',
+      status: 200
+    )
   end
 
   it 'registers an expectation correctly' do
@@ -23,7 +26,7 @@ describe MockServer::MockServerClient do
       expectation.request do |request|
         request.method = 'POST'
         request.path   = '/login'
-        request.query_parameters << parameter('returnUrl', '/account')
+        request.query_string_parameters << parameter('returnUrl', '/account')
         request.cookies << cookie('sessionId', '2By8LOhBmaW5nZXJwcmludCIlMDAzMW')
         request.body = exact({ username: 'foo', password: 'bar' }.to_json)
       end

data/spec/mockserver/proxy_client_spec.rb

@@ -4,8 +4,8 @@ require_relative '../spec_helper'
 describe MockServer::ProxyClient do
 
   let(:client) { MockServer::ProxyClient.new('localhost', 8080) }
-  let(:register_expectation) { FIXTURES.read('register_expectation.json') }
-  let(:register_expectation_json) { register_expectation.to_json }
+  let(:retrieved_request) { FIXTURES.read('retrieved_request.json') }
+  let(:retrieved_request_json) { retrieved_request.to_json }
   let(:search_request_json) { FIXTURES.read('search_request.json').to_json }
 
   before do
@@ -14,7 +14,7 @@ describe MockServer::ProxyClient do
 
     # Stub requests
     stub_request(:put, /.+\/retrieve/).with(body: search_request_json).to_return(
-      body:   "[#{register_expectation_json}, #{register_expectation_json}]",
+      body:   "[#{retrieved_request_json}, #{retrieved_request_json}]",
       status: 200
     )
     stub_request(:put, /.+\/dumpToLog$/).to_return(status: 202).once
@@ -24,7 +24,7 @@ describe MockServer::ProxyClient do
   it 'verifies requests correctly' do
     response = client.verify(request(:POST, '/login'), exactly(2))
     response = response.map { |mock| to_camelized_hash(mock.to_hash) }
-    expect(response).to eq([register_expectation, register_expectation])
+    expect(response).to eq([retrieved_request, retrieved_request])
   end
 
   it 'raises an error when verification fails' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mockserver-client
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre
+  version: 1.0.7
 platform: ruby
 authors:
 - Nayyara Samuel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -115,42 +115,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: logging_factory
   requirement: !ruby/object:Gem::Requirement
@@ -171,28 +171,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 description: A Ruby Client for MockServer that enables easy mocking of any system
   you integrate with via HTTP or HTTPS (i.e. services, web sites, etc)
 email:
@@ -205,7 +205,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
-- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -216,10 +215,12 @@ files:
 - lib/mockserver/mock_server_client.rb
 - lib/mockserver/model/array_of.rb
 - lib/mockserver/model/body.rb
+- lib/mockserver/model/cookie.rb
 - lib/mockserver/model/delay.rb
 - lib/mockserver/model/enum.rb
 - lib/mockserver/model/expectation.rb
 - lib/mockserver/model/forward.rb
+- lib/mockserver/model/header.rb
 - lib/mockserver/model/parameter.rb
 - lib/mockserver/model/request.rb
 - lib/mockserver/model/response.rb
@@ -233,8 +234,10 @@ files:
 - spec/fixtures/incorrect_login_response.json
 - spec/fixtures/post_login_request.json
 - spec/fixtures/register_expectation.json
+- spec/fixtures/retrieved_request.json
 - spec/fixtures/search_request.json
 - spec/fixtures/times_once.json
+- spec/integration/mock_client_integration_spec.rb
 - spec/mockserver/builder_spec.rb
 - spec/mockserver/mock_client_spec.rb
 - spec/mockserver/proxy_client_spec.rb
@@ -255,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ~>
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2
@@ -267,8 +270,10 @@ test_files:
 - spec/fixtures/incorrect_login_response.json
 - spec/fixtures/post_login_request.json
 - spec/fixtures/register_expectation.json
+- spec/fixtures/retrieved_request.json
 - spec/fixtures/search_request.json
 - spec/fixtures/times_once.json
+- spec/integration/mock_client_integration_spec.rb
 - spec/mockserver/builder_spec.rb
 - spec/mockserver/mock_client_spec.rb
 - spec/mockserver/proxy_client_spec.rb

data/CHANGELOG.md

@@ -1,15 +0,0 @@
-### Version 0.0.1
- - Basic code.
-
-### Version 0.0.2
- - CLI for this gem.
-
-### Version 0.0.3
- - Changes responses returned from /retrieve and /verify to be Ruby models.
-
-### Version 1.0.0
- - Merged ruby client fully into main MockServer build on master.
-
-### Version 1.0.1
- - Fixes serialization bug with multi_json.
- - Changes dependency on activesupport from '~> 4' to '~> 3' to be less conservative.