mockserver-client 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ZiZDY2MzcwMzQ5NGViNDc2YTQzYmY0NmYxMWI3ZjhkNGY5NzYyNQ==
+    MDRhZTQwOTYwOTZjZjQ3ZThlNWFlZTk0NjIwMjIzZjUwMzRiY2UxMA==
   data.tar.gz: !binary |-
-    OGVmMWM2ZWExZGVmZTk0YTU0MDI1MzU2ODM5YWNmMTNmYTY1M2NiMw==
+    MGM5MWMyZWYzYzJjZTU5Y2NjZDhiNjM2YWI0OWM1MTU4ZWE1OWYzNg==
 SHA512:
   metadata.gz: !binary |-
-    MzNkZDY5NWE2YTNlMGQ5YjQ1YWNiYjY0MGRlNTllYmZmMzRmN2YwNDYyOGM4
-    ODA2YzFiNzY0MGZjOWVlYTYyZGRhNzRmMzZlYmRkMzk4NjU3N2EyYzc5OGNk
-    NDBkMWFmMmRkNTk0YTI4NTFiOGM3MjMzMTc4NzQ4MTFiNzc2ZmQ=
+    NzlmZDZlYTcyMzQ0YWFkOWViMmI0ZmFlZDgwODdmM2ZhM2QyYWIwZWRkYThj
+    MmU2YzkyNDEyZDI3NWZiN2NkNjc1Mzk5NGJhYmI1ZTU3YTdiYmEzYTI3NzM5
+    ZGEwMWRkYWUwYWQ2MjQwZjM0YWUwZTQ4MWUzOWYxMTc4MGVmMmQ=
   data.tar.gz: !binary |-
-    MGIyZDEwOTUwMjllYTc4YTgzNWEyYTdlMjAzZDg4MWUyMmExMDA3Nzg3ZTI1
-    ODNlNmJmYzcxODI4NjVkZWMxOTgzZGQyNmMxOGRiZGQzYmEyZWMwYWNhYzIw
-    MTMyMTk3ZTk5M2MzOTcwNjg4ZjliOTFlZWQ2OWM4MmY5ZTQ1MjQ=
+    MzljZWQ0MjNkMGJiOGFkMjM1N2FlM2MzYjczOWQxODZlOGJhYWFmODg4NDg3
+    MjBlMmYyMGI2NGI3ZTA0MjdhNWNhMDUxN2QwYTZmOTBmODI4NWZhZjA1ZDUz
+    NGRjYzhjOGRmN2VlNGQ1YWMxMGEzNjk2NTEwMjg2MGNlZjQ1YzQ=

data/README.md

@@ -190,6 +190,64 @@ Expectation (use in register)
 * **expectation**: Create an expectation object. If a block is passed, will configure the object first before returning it. Example: `expectation {|e| e.request {|r| r.path = "index.html} }`. 
 Getter methods for `request`, `response` and `forward` methods will optionally accept a block. If block is passed object is configured before it is returned. The attribute `times` has conventional getter and setter methods.
 
+## CLI
+
+This gem comes with a command line interface which allow you to run the Mock Server calls from the command line. When this gem is installed, you will have the `mockserver` executable on your PATH. Type `mockserver --help` and you will get this output: 
+
+```
+mockserver --help 
+
+Commands: 
+  mockserver clear           # Clears all stored mock request/responses from server.
+  mockserver dump_log        # Dumps the matching request to the mock server logs.
+  mockserver help [COMMAND]  # Describe available commands or one specific command
+  mockserver register        # Register an expectation with the mock server.
+  mockserver reset           # Resets the server clearing all data.
+  mockserver retrieve        # Retrieve the list of requests that have been made to the mock/proxy server.
+  mockserver verify          # Verify that a request has been made the specified number of times to the server.
+
+Options:
+  -h, --host=HOST    # The host for the MockServer client.
+                     # Default: localhost
+  -p, --port=N       # The port for the MockServer client.
+                     # Default: 8080
+  -d, [--data=DATA]  # A JSON or YAML file containing the request payload.
+```
+
+To get help for an individual command, e.g. `dump_log`, you would do:
+
+```
+mockserver --help dump_log
+
+Usage:
+  mockserver dump_log
+
+Options:
+  -j, [--java], [--no-java]  # A switch to turn Java format for logs on/off.
+  -h, --host=HOST            # The host for the MockServer client.
+                             # Default: localhost
+  -p, --port=N               # The port for the MockServer client.
+                             # Default: 8080
+  -d, [--data=DATA]          # A JSON or YAML file containing the request payload.
+
+Dumps the matching request to the mock server logs.
+```
+
+Here is an example on how you would run the command:
+
+```
+mockserver dump_log -j true
+
+Running with parameters:
+	host: localhost
+	port: 8080
+	java: true
+
+[2014-06-21 09:23:32] DEBUG [MockServerClient] Sending dump log request to mockserver
+[2014-06-21 09:23:32] DEBUG [MockServerClient] URL: /dumpToLog?type=java. Payload: {}
+[2014-06-21 09:23:32] DEBUG [MockServerClient] Got dump to log response: 202
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/mockserver-client/fork )

data/Rakefile

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
-require 'rspec/mocks/version'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/bin/mockserver

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+#!/usr/bin/env ruby
+
+#
+# A thor-based runner for commands in this project
+# @author: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
+#
+require_relative '../lib/cli'
+MockServerCLI.start

data/lib/cli.rb

@@ -0,0 +1,146 @@
+# encoding: UTF-8
+require 'thor'
+require 'colorize'
+require_relative './mockserver-client'
+
+# CLI for this gem
+# @author Nayyara Samuel(nayyara.samuel@opower.com)
+#
+module CLIHelpers
+  include MockServer
+
+  LOGGER = LoggingFactory::DEFAULT_FACTORY.log('MockServerClient')
+
+  # Prints out the parameters passed to it
+  # @param options [Hash] a hash of parameters
+  def print_parameters(options)
+    puts "\nRunning with parameters:".bold
+    options.each { |k, v| puts "\t#{k}: #{v}".yellow }
+    puts ''
+  end
+
+  # Create a mockserver client
+  # @param options [Struct] with host and port set
+  # @return [MockServerClient] the mockserver client with the host and port
+  def mockserver_client(options)
+    client = MockServerClient.new(options.host, options.port)
+    client.logger = LOGGER
+    client
+  end
+
+  # Create a proxy client
+  # @param options [Struct] with host and port set
+  # @return [ProxyClient] the proxy client with the host and port
+  def proxy_client(options)
+    client = ProxyClient.new(options.host, options.port)
+    client.logger = LOGGER
+    client
+  end
+
+  # Convert a hash to a struct
+  # @param hash [Hash] a hash
+  # @return [Struct] a struct constructed from the hash
+  def to_struct(hash)
+    hash = symbolize_keys(hash)
+    Struct.new(*hash.keys).new(*hash.values)
+  end
+
+  # Process a block using options extracted into a struct
+  # @param mockserver [Boolean] true to use mockserver, false to use proxy
+  # @yieldparam [AbstractClient] a mockserver or a proxy client
+  # @yieldparam [Struct] a struct created from options hash
+  def execute_command(mockserver = false, data_required = false, error_msg = '--data option must be provided', &_)
+    print_parameters(options)
+    struct_options = to_struct({ data: nil }.merge(options))
+    if data_required && !options['data']
+      error(error_msg)
+    else
+      client = mockserver ? mockserver_client(struct_options) : proxy_client(struct_options)
+      yield client, struct_options if block_given?
+    end
+  end
+
+  # Prints an error message
+  # @param message [String] an error message
+  def error(message)
+    puts message.red
+  end
+
+  # Read a file
+  # @param file [String] a file to read
+  def read_file(file)
+    YAML.load_file(file)
+  end
+end
+
+# CLI for mock server and proxy clients
+class MockServerCLI < Thor
+  include CLIHelpers
+  include MockServer::UtilityMethods
+  include MockServer::Model::DSL
+
+  class_option :host, type: :string, aliases: '-h', required: true, default: 'localhost', desc: 'The host for the MockServer client.'
+  class_option :port, type: :numeric, aliases: '-p', required: true, default: 8080, desc: 'The port for the MockServer client.'
+  class_option :data, type: :string, aliases: '-d', desc: 'A JSON or YAML file containing the request payload.'
+
+  desc 'retrieve', 'Retrieve the list of requests that have been made to the mock/proxy server.'
+
+  def retrieve
+    execute_command do |client, _|
+      result = options.data ? client.retrieve(read_file(options.data)) : client.retrieve
+      puts "RESULT:\n".bold + "#{result.to_json}".green
+    end
+  end
+
+  desc 'register', 'Register an expectation with the mock server.'
+
+  def register
+    execute_command(true, true) do |client, options|
+      payload = read_file(options.data)
+      mock_expectation = expectation do |expectation|
+        expectation.populate_from_payload(payload)
+      end
+      client.register(mock_expectation)
+    end
+  end
+
+  desc 'dump_log', 'Dumps the matching request to the mock server logs.'
+  option :java, type: :boolean, aliases: '-j', default: false, desc: 'A switch to turn Java format for logs on/off.'
+
+  def dump_log
+    execute_command do |client, options|
+      options.data ? client.dump_log(read_file(options.data), options.java) : client.dump_log(nil, options.java)
+    end
+  end
+
+  desc 'clear', 'Clears all stored mock request/responses from server.'
+
+  def clear
+    error_message = 'ERROR: No request provided. HINT: Use `clear` to selectively clear requests. Use `reset` to clear all.'
+    execute_command(false, true, error_message) do |client, _|
+      payload = read_file(options.data)
+      client.clear(payload)
+    end
+  end
+
+  desc 'reset', 'Resets the server clearing all data.'
+
+  def reset
+    execute_command do |client, _|
+      client.reset
+    end
+  end
+
+  desc 'verify', 'Verify that a request has been made the specified number of times to the server.'
+
+  def verify
+    execute_command(false, true) do |client, _|
+      payload = read_file(options.data)
+      mock_request = payload[HTTP_REQUEST]
+      mock_times = payload[HTTP_TIMES]
+
+      error 'No request found for verifying against' unless mock_request
+      mock_times ? client.verify(mock_request, mock_times) : client.verify(mock_request)
+    end
+  end
+end

data/lib/mockserver/abstract_client.rb

@@ -3,16 +3,13 @@ require 'rest-client'
 require 'logging_factory'
 require_relative './model/times'
 require_relative './model/request'
+require_relative './model/expectation'
+require_relative './utility_methods'
 
 # An abstract client for making requests supported by mock and proxy client.
 # @author Nayyara Samuel(mailto: nayyara.samuel@opower.com)
 #
 module MockServer
-  HTTP_REQUEST = 'httpRequest'
-  HTTP_RESPONSE = 'httpResponse'
-  HTTP_FORWARD = 'httpForward'
-  HTTP_TIMES = 'times'
-
   RESET_ENDPOINT = '/reset'
   CLEAR_ENDPOINT = '/clear'
   RETRIEVE_ENDPOINT = '/retrieve'
@@ -22,6 +19,7 @@ module MockServer
   class AbstractClient
     include Model::DSL
     include Model
+    include UtilityMethods
 
     attr_accessor :logger
 
@@ -36,7 +34,7 @@ module MockServer
     # @param request [Request] the request to use to clear an expectation
     # @return [Object] the response from the clear action
     def clear(request)
-      request = prepare_hash(HTTP_REQUEST => Request.new(request))
+      request = camelized_hash(HTTP_REQUEST => Request.new(symbolize_keys(request)))
       url = CLEAR_ENDPOINT
 
       logger.debug("Clearing expectation with request: #{request}")
@@ -65,7 +63,7 @@ module MockServer
     # @param request [Request] to filter requests
     # @return [Object] the list of responses processed by the server
     def retrieve(request = nil)
-      request = request ? prepare_hash(HTTP_REQUEST => Request.new(request)) : {}
+      request = request ? camelized_hash(HTTP_REQUEST => Request.new(symbolize_keys(request))) : {}
       url = RETRIEVE_ENDPOINT
 
       logger.debug('Retrieving request list from mockserver')
@@ -73,7 +71,18 @@ module MockServer
 
       response = @base[RETRIEVE_ENDPOINT].put(request.to_json)
       logger.debug("Got retrieve response: #{response.code}")
-      parse_response(response)
+      results = parse_response(response)
+      mocks = Mocks.new([])
+      unless results.empty?
+        results.each do |result|
+          mock = Mock.new
+          mock.populate_from_payload(result)
+          mocks << mock
+        end
+      end
+      mocks.code = response.code
+
+      mocks
     end
 
     # Request to dump logs to file
@@ -82,7 +91,7 @@ module MockServer
     def dump_log(request = nil, java = false)
       type_params = java ? '?type=java' : ''
       url = "#{DUMP_LOG_ENDPOINT}#{type_params}"
-      request = Request.new(request) || {}
+      request = request ? Request.new(symbolize_keys(request)) : {}
 
       logger.debug('Sending dump log request to mockserver')
       logger.debug("URL: #{url}. Payload: #{request.to_hash}")
@@ -101,6 +110,7 @@ module MockServer
       results = retrieve(request)
 
       # Reusing the times model here so interpreting values here
+      times = Times.new(symbolize_keys(times))
       num_times = times.remaining_times
       is_exact = !times.unlimited
 

data/lib/mockserver/mock_server_client.rb

@@ -37,11 +37,7 @@ module MockServer
     # @param expectation [Expectation] the expectation  to create the request from
     # @return [Hash] a hash representing the request to use in registering an expectation with the mock server
     def create_expectation_request(expectation)
-      expectation_request = prepare_hash(HTTP_REQUEST => expectation.request,
-                                         HTTP_RESPONSE => expectation.response,
-                                         HTTP_FORWARD => expectation.forward,
-                                         HTTP_TIMES => expectation.times)
-
+      expectation_request = camelized_hash(expectation)
       logger.debug("Expectation JSON: #{expectation_request.to_json}")
       fail "You can only set either of #{[HTTP_RESPONSE, HTTP_FORWARD]}. But not both" if expectation_request[HTTP_RESPONSE] && expectation_request[HTTP_FORWARD]
       expectation_request

data/lib/mockserver/model/array_of.rb

@@ -75,7 +75,7 @@ module MockServer::Model
       if item && item.class != child_class
         begin
           item = child_class.new(item)
-        rescue e
+        rescue Exception => e # rubocop:disable Lint/RescueException
           raise "Failed to convert element: #{item} to required type #{child_class}. Error: #{e.message}"
         end
       end

data/lib/mockserver/model/expectation.rb

@@ -3,58 +3,33 @@ require_relative './request'
 require_relative './response'
 require_relative './forward'
 require_relative './times'
-
+require_relative '../utility_methods'
+require_relative './mock'
 #
 # A class to model an expectation sent to the Mockserver instance.
 # See http://www.mock-server.com/#create-expectations for details.
 #
 # @author:: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
 #
-module MockServer::Model
-  # Expectation model
-  class Expectation
-    attr_accessor :times
-
-    # Method to setup the request on the expectation object
-    # @yieldparam [Request] the request that this expectation references
-    # @return [Expectation] this object according to the  the builder pattern
-    def request(&_)
-      if block_given?
-        @request ||= Request.new
-        yield @request
-      end
-      @request
-    end
+module MockServer
+  HTTP_REQUEST = 'httpRequest'
+  HTTP_RESPONSE = 'httpResponse'
+  HTTP_FORWARD = 'httpForward'
+  HTTP_TIMES = 'times'
 
-    # Method to setup the response on the expectation object
-    # @yieldparam [Response] the response that this expectation references
-    # @return [Expectation] this object according to the  the builder pattern
-    def response(&_)
-      if block_given?
-        @response ||= Response.new
-        yield @response
-      end
-      @response
+  # Models
+  module Model
+    # Expectation model
+    class Expectation < Mock
     end
 
-    # Method to setup the request on the expectation object
-    # @yieldparam [Forward] the forward object that this expectation references
-    # @return [Expectation] this object according to the  the builder pattern
-    def forward(&_)
-      if block_given?
-        @forward ||= Forward.new
-        yield @forward
+    # DSL method for creating expectation
+    module DSL
+      def expectation(&_)
+        expectation = Expectation.new
+        yield expectation if block_given?
+        expectation
       end
-      @forward
-    end
-  end
-
-  # DSL methods related to expectation
-  module DSL
-    def expectation(&_)
-      expectation = Expectation.new
-      yield expectation if block_given?
-      expectation
     end
   end
 end

data/lib/mockserver/model/mock.rb

@@ -0,0 +1,123 @@
+# encoding: UTF-8
+require_relative './array_of'
+require_relative './request'
+require_relative './response'
+require_relative './forward'
+require_relative './times'
+require_relative '../utility_methods'
+
+#
+# A class to model a mock object used to create and retrieve mock requests.
+# See http://www.mock-server.com/#create-expectations for details.
+#
+# @author:: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
+#
+module MockServer
+  HTTP_REQUEST = 'httpRequest'
+  HTTP_RESPONSE = 'httpResponse'
+  HTTP_FORWARD = 'httpForward'
+  HTTP_TIMES = 'times'
+
+  # Models
+  module Model # rubocop:disable Style/ClassAndModuleChildren
+    # Mock object model
+    class Mock
+      include MockServer::UtilityMethods
+      attr_accessor :times
+
+      # Creates an expectation from a hash
+      # @param payload [Hash] a hash representation of the expectation
+      def populate_from_payload(payload)
+        @request = payload[MockServer::HTTP_REQUEST]
+        @request = Request.new(symbolize_keys(@request)) if @request
+
+        @response = payload[MockServer::HTTP_RESPONSE]
+        @response = Response.new(symbolize_keys(@response)) if @response
+
+        @forward = payload[MockServer::HTTP_FORWARD]
+        @forward = Forward.new(symbolize_keys(@forward)) if @forward
+
+        @times = payload[MockServer::HTTP_TIMES]
+        @times = Times.new(symbolize_keys(@times)) if @times
+      end
+
+      # Method to setup the request on the expectation object
+      # @yieldparam [Request] the request that this expectation references
+      # @return [Expectation] this object according to the  the builder pattern
+      def request(&_)
+        if block_given?
+          @request ||= Request.new
+          yield @request
+        end
+        @request
+      end
+
+      # Method to setup the response on the expectation object
+      # @yieldparam [Response] the response that this expectation references
+      # @return [Expectation] this object according to the  the builder pattern
+      def response(&_)
+        if block_given?
+          @response ||= Response.new
+          yield @response
+        end
+        @response
+      end
+
+      # Method to setup the request on the expectation object
+      # @yieldparam [Forward] the forward object that this expectation references
+      # @return [Expectation] this object according to the  the builder pattern
+      def forward(&_)
+        if block_given?
+          @forward ||= Forward.new
+          yield @forward
+        end
+        @forward
+      end
+
+      # Setter for request
+      # @param request [Request] a request object
+      def request=(request)
+        @request = Request.new(request)
+      end
+
+      # Setter for response
+      # @param response [Response] a response object
+      def response=(response)
+        @response = Response.new(response)
+      end
+
+      # Setter for forward
+      # @param forward [Forward] a forward object
+      def forward=(forward)
+        @forward = Forward.new(forward)
+      end
+
+      # Override to_json method
+      # @return [String] the json representation for this object
+      def to_json(*p)
+        to_hash.to_json(*p)
+      end
+
+      # Convert to hash
+      # @return [Hash] the hash representation for this object
+      def to_hash
+        {
+          MockServer::HTTP_REQUEST => @request,
+          MockServer::HTTP_RESPONSE => @response,
+          MockServer::HTTP_FORWARD => @forward,
+          MockServer::HTTP_TIMES => @times
+        }
+      end
+    end
+
+    # Class to store a list of mocks - useful for modeling retrieve endpoint result
+    class Mocks < ArrayOf
+      # Code is used to store HTTP status code returned from retrieve endpoint
+      attr_accessor :code
+
+      def child_class
+        Mock
+      end
+    end
+  end
+end

data/lib/mockserver/model/response.rb

@@ -2,6 +2,7 @@
 require_relative './body'
 require_relative './delay'
 require_relative './parameter'
+require 'base64'
 
 #
 # A class to model a response in an expectation.
@@ -34,6 +35,10 @@ module MockServer::Model
       obj
     end
 
+    def decode(string)
+      Base64.decode64(string)
+    end
+
     alias_method :http_response, :response
   end
 end

data/lib/mockserver/utility_methods.rb

@@ -12,21 +12,34 @@ module MockServer::UtilityMethods
   # - camelize the keys of the hash
   # @param hash [Object] an object which will be used to create the hash. Must support :to_hash method
   # @return [Hash] the transformed hash
-  def prepare_hash(obj)
+  def camelized_hash(obj)
     obj = obj && obj.respond_to?(:to_hash) ? obj.to_hash : obj
 
     if obj.is_a?(Hash)
       obj.each_with_object({}) do |(k, v), acc|
         is_empty = v.nil? || (v.respond_to?(:empty?) ? v.empty? : false)
-        acc[camelize(k)] = prepare_hash(v) unless is_empty
+        acc[camelize(k)] = camelized_hash(v) unless is_empty
       end
     elsif obj.respond_to?(:map)
-      obj.map { |element| prepare_hash(element) }
+      obj.map { |element| camelized_hash(element) }
     else
       obj
     end
   end
 
+  # Converts keys to symbols
+  # @param hash [Hash] a hash
+  # @return [Hash] a copy of the hash where keys are symbols
+  def symbolize_keys(hash)
+    if hash.is_a?(Hash)
+      Hash[hash.map { |k, v| [k.to_s.underscore.to_sym, symbolize_keys(v)] }]
+    elsif hash.respond_to?(:map)
+      hash.map { |obj| symbolize_keys(obj) }
+    else
+      hash
+    end
+  end
+
   # @param [Object] an object to camelize the string representation of
   # @return [String] the string converted to camelcase with first letter in lower case
   def camelize(str)

data/lib/mockserver/version.rb

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

data/mockserver-client.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name = 'mockserver-client'
   spec.version = MockServer::VERSION
   spec.authors = ['Nayyara Samuel']
-  spec.email = ['nayyara.samuel@gmail.com']
+  spec.email = ['nayyara.samuel@opower.com']
   spec.summary = %q(A Ruby client for MockServer)
   spec.required_ruby_version = '~> 1.9.3'
 
@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '~> 4.1.1'
   spec.add_dependency 'rest-client', '~> 1.6.7'
   spec.add_dependency 'logging_factory', '~> 0.0.2'
+  spec.add_dependency 'thor', '~> 0.19.1'
+  spec.add_dependency 'colorize', '~> 0.7.0'
 end

data/spec/mockserver/builder_spec.rb

@@ -69,6 +69,14 @@ describe MockServer::Model::DSL do
     expect(to_camelized_hash(HTTP_TIMES => mock_times)).to eq(FIXTURES.read('times_once.json'))
   end
 
+  it 'generates expectation correctly from file' do
+    payload = FIXTURES.read('register_expectation.json')
+    mock_expectation = expectation
+    mock_expectation.populate_from_payload(payload)
+
+    expect(to_camelized_hash(mock_expectation.to_hash)).to eq(payload)
+  end
+
   it 'generates body correctly' do
     expect(to_camelized_hash(regex('*/login'))).to eq('type' => 'REGEX', 'value' => '*/login')
     expect(to_camelized_hash(xpath('/login[1]'))).to eq('type' => 'XPATH', 'value' => '/login[1]')

data/spec/mockserver/proxy_client_spec.rb

@@ -14,8 +14,8 @@ describe MockServer::ProxyClient do
 
     # Stub requests
     stub_request(:put, /.+\/retrieve/).with(body: search_request_json).to_return(
-        body: "[#{register_expectation_json}, #{register_expectation_json}]",
-        status: 200
+      body: "[#{register_expectation_json}, #{register_expectation_json}]",
+      status: 200
     )
     stub_request(:put, /.+\/dumpToLog$/).to_return(status: 202).once
     stub_request(:put, /.+\/dumpToLog\?type=java$/).to_return(status: 202).once
@@ -23,6 +23,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])
   end
 

data/spec/spec_helper.rb

@@ -41,7 +41,7 @@ module HelperMethods
 
   # Reparse hash from json to make keys strings and ensure consistency of keys for tests
   def to_camelized_hash(hash)
-    JSON.parse(prepare_hash(hash).to_json)
+    JSON.parse(camelized_hash(hash).to_json)
   end
 
   FIXTURES = FileAccessor.new(:spec, :fixtures)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mockserver-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Nayyara Samuel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,10 +164,39 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: 
 email:
-- nayyara.samuel@gmail.com
-executables: []
+- nayyara.samuel@opower.com
+executables:
+- mockserver
 extensions: []
 extra_rdoc_files: []
 files:
@@ -177,6 +206,8 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/mockserver
+- lib/cli.rb
 - lib/mockserver-client.rb
 - lib/mockserver/abstract_client.rb
 - lib/mockserver/mock_server_client.rb
@@ -186,6 +217,7 @@ files:
 - lib/mockserver/model/enum.rb
 - lib/mockserver/model/expectation.rb
 - lib/mockserver/model/forward.rb
+- lib/mockserver/model/mock.rb
 - lib/mockserver/model/parameter.rb
 - lib/mockserver/model/request.rb
 - lib/mockserver/model/response.rb