mockserver-client 1.0.0 → 1.0.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86289f77e2efef3c34040c7b59b760b900e12612
-  data.tar.gz: 47b0a45edbd262dda2dc2c1b22dfb9e9807bfe4f
+  metadata.gz: 0ed68ee40c6b94664569195d71513a69c951e9be
+  data.tar.gz: c7c2a2c49318c1976c6333de83f4a6904d1a61cf
 SHA512:
-  metadata.gz: d1bdd0b78eed3bba01e1ea2638a4911fa970dbb488f95f9fd0eab46600e4e58db1f3d080d07e22fb9fe0a95da0c421eb0c9fc3af8181450487f850ee2d34986f
-  data.tar.gz: c05018382285db7d7e65345a2fa27675fc60da49381bb0d1f4f03c6faa77b539fbec895fd806279fd9e31ef814211fa881b16f7eb8d7782c7c62b5fdc5dc12cc
+  metadata.gz: f5562f6fcd450871e68d0b6571c7fd90037c461f98fe334776866aae38fe2c24eb0f79ecfff08002459033c2f53cb7c5bd825a94f230b2817bc562c0799d4d39
+  data.tar.gz: e5cfb897b02297323d3bd067824fd8b8c1dd646f4db2d9a7fdef5673e72d958bc68523a3de20b6e407ddd2f80ce04c42622b1cf8015ffa5f425b855bf04dab48

data/CHANGELOG.md

@@ -8,4 +8,8 @@
  - 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.
+ - 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.

data/README.md

@@ -161,7 +161,7 @@ Request
 
 Body
 * **body**: Create a string body object (use in a response). Example: `body("unaccepted")`.
-* **exact**: Create a body of type `EXACT`. Example: `exact('{"reason": "unauthorized"}')`.
+* **exact**: Create a body of type `STRING`. Example: `exact('{"reason": "unauthorized"}')`.
 * **regex**: Create a body of type `REGEX`. Example: `regex('username[a-z]{4}')`.
 * **xpath**: Used to create a body of type `XPATH`. Example: `xpath("/element[key = 'some_key' and value = 'some_value']")`.
 * **parameterized**; Create a body to type `PARAMETERS`. Example `parameterized(parameter('someValue', 1, 2), parameter('otherValue', 4, 5))`.

data/lib/mockserver-client.rb

@@ -2,3 +2,16 @@
 require_relative './mockserver/version'
 require_relative './mockserver/mock_server_client'
 require_relative './mockserver/proxy_client'
+
+# Setup serialization correctly with multi_json
+require 'json/pure'
+
+# To fix serialization bugs. See: http://prettystatemachine.blogspot.com/2010/09/typeerrors-in-tojson-make-me-briefly.html
+class Fixnum
+  def to_json(_)
+    to_s
+  end
+end
+
+require 'multi_json'
+MultiJson.use(:json_pure)

data/lib/mockserver/model/body.rb

@@ -11,7 +11,7 @@ module MockServer::Model
   # An enum for body type
   class BodyType < SymbolizedEnum
     def allowed_values
-      [:EXACT, :REGEX, :XPATH, :PARAMETERS]
+      [:STRING, :REGEX, :XPATH, :PARAMETERS]
     end
   end
 
@@ -38,7 +38,7 @@ module MockServer::Model
     end
 
     def exact(value)
-      Body.new(type: :EXACT, value: value)
+      Body.new(type: :STRING, value: value)
     end
 
     def regex(value)

data/lib/mockserver/version.rb

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

data/mockserver-client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hashie', '~> 3'
   spec.add_dependency 'json', '~> 1'
-  spec.add_dependency 'activesupport', '~> 4'
+  spec.add_dependency 'activesupport', '~> 3'
   spec.add_dependency 'rest-client', '~> 1'
   spec.add_dependency 'logging_factory', '~> 0'
   spec.add_dependency 'thor', '~> 0'

data/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>mockserver</artifactId>
         <groupId>org.mock-server</groupId>
-        <version>3.4</version>
+        <version>3.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data/spec/fixtures/post_login_request.json

@@ -15,7 +15,7 @@
             }
         ],
         "body": {
-            "type": "EXACT",
+            "type": "STRING",
             "value": "{username:'foo', password:'bar'}"
         }
     }

data/spec/fixtures/register_expectation.json

@@ -19,7 +19,7 @@
             }
         ],
         "body": {
-            "type": "EXACT",
+            "type": "STRING",
             "value": "{\"username\":\"foo\",\"password\":\"bar\"}"
         }
     },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mockserver-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre
 platform: ruby
 authors:
 - Nayyara Samuel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement