mockserver-client 1.0.4 → 1.0.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00fead1db5d272c1c677221beea0341436bcf3ee
-  data.tar.gz: df2e7477ecc5704eb538af7251cb129d3e3097dc
+  metadata.gz: cb049f3c5af0f80da1a3a8f317d553f4b67c68c6
+  data.tar.gz: c37ae55ab3ed301a9c40f3c7c3705dbc6e6a1795
 SHA512:
-  metadata.gz: 356286ca6dd15aa9182335af329558f05c4ae37cd479baf8dc7264a83463ae5a578f4a8ba7911a94b488abf181742c8eb86e5a30c6312c7e3863b4c20f575fe8
-  data.tar.gz: 43cdb0b6ec3aacc357d2c41772836f9818522203ebdc55ba7aea88e693c1e37e86f1c13563ee437250446208b228f369b6a62751b1ab1de3472500a2b4011c27
+  metadata.gz: cea9f1fe007d9f5f94a6994c05de9c11f5b387ae0fe7b84be1e2e46fbf6b87f5de927fcf8d278bfd4587ac9796a38c92092afcc6da43055342c2e8eee4806274
+  data.tar.gz: a1a925b8a65c9315452fad19903c99227f95455bd2a8090288f3209d96e985558f2e6eff75089a97e34e7be8cd53511c6abaae8027e641c00b0f4be4f86df87b

data/lib/mockserver/model/body.rb

@@ -11,7 +11,7 @@ module MockServer::Model
   # An enum for body type
   class BodyType < SymbolizedEnum
     def allowed_values
-      [:STRING, :REGEX, :XPATH, :PARAMETERS]
+      [:STRING, :REGEX, :XPATH, :PARAMETERS, :BINARY]
     end
   end
 

data/lib/mockserver/model/enum.rb

@@ -13,7 +13,7 @@ module MockServer::Model
     # @raise [Exception] if the supplied value is not valid for this enum
     def initialize(supplied_value)
       supplied_value = pre_process_value(supplied_value)
-      fail "Supplied value: #{supplied_value} is not valid. Allowed values are: #{supplied_value}" unless allowed_values.include?(supplied_value)
+      fail "Supplied value: #{supplied_value} is not valid. Allowed values are: #{allowed_values.inspect}" unless allowed_values.include?(supplied_value)
       @value = supplied_value
     end
 

data/lib/mockserver/model/request.rb

@@ -3,7 +3,7 @@ require 'hashie'
 require_relative './parameter'
 require_relative './body'
 require_relative './enum'
-
+require 'base64'
 #
 # A class to model a request in an expectation.
 # @author:: Nayyara Samuel (mailto: nayyara.samuel@opower.com)
@@ -17,7 +17,7 @@ module MockServer::Model
   end
 
   # Request model
-  class Request < Hashie::Dash
+  class Request < Hashie::Trash
     include Hashie::Extensions::MethodAccess
     include Hashie::Extensions::IgnoreUndeclared
     include Hashie::Extensions::Coercion
@@ -29,7 +29,11 @@ module MockServer::Model
     property :query_parameters, default: Parameters.new([])
     property :cookies, default: Parameters.new([])
     property :headers, default: Parameters.new([])
-    property :body
+    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
+      Body.new(type: :STRING, value: body_value)
+    end)
 
     coerce_key :method, HTTPMethod
     coerce_key :path, String

data/lib/mockserver/model/times.rb

@@ -12,6 +12,14 @@ module MockServer::Model
     def allowed_values
       [true, false]
     end
+
+    def !
+      !@value
+    end
+
+    def initialize(supplied_value)
+      @value = pre_process_value(supplied_value)
+    end
   end
 
   # Model for times class

data/lib/mockserver/version.rb

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

data/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.mock-server</groupId>
         <artifactId>mockserver</artifactId>
-        <version>3.9.9-SNAPSHOT</version>
+        <version>3.9.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <executions>
                     <execution>
                         <id>bundle_install</id>
@@ -56,6 +56,7 @@
                                 <argument>exec</argument>
                                 <argument>rake</argument>
                                 <argument>build</argument>
+                                <argument>spec</argument>
                             </arguments>
                             <environmentVariables>
                                 <BUNDLE_GEMFILE>${basedir}/Gemfile</BUNDLE_GEMFILE>

data/spec/fixtures/register_expectation.json

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

data/spec/fixtures/times_once.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mockserver-client
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6.pre
 platform: ruby
 authors:
 - Nayyara Samuel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler