vanilli-ruby 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71610d79cf64f6347948403c03dbe8bde77d0add
-  data.tar.gz: 89da382ee09231dcd46fc0b6080b7bafeeda91f6
+  metadata.gz: 850c08697fd20442edc6b872f01293106b1acd68
+  data.tar.gz: 23bb8ea26132554175a221b74bd357f71a523441
 SHA512:
-  metadata.gz: f0c7c9d4fe986a2b2bbd187ec1870f71ecadd43d66fa70644f8187bc7dc1b34ff4ffde1c90b83aa867badb472271f5753a4259abf5c37e8a6f32081136ee0951
-  data.tar.gz: 290cc44db28b220dbf8cf16db772a41002c85d34129b422e09054873717785c2759ab3e02d8737e610ada1c26872f68bfe151fe7a070b19e2d13f01c2e29f339
+  metadata.gz: da337069dc06329fb6cb87ce276d883b7bada2c00a678006cad31921bda793f28cd3ce91fa9ef593fd6af447967678256f28e367dfa9279aec7d9ae90a506146
+  data.tar.gz: bc398d3e781b0b5530cbe5942c5c396c0f42ffd3a3949d1822370349905c09e1cfc1b278e6f5eaa78b4d24caefcada526d6404bd5b836eee56603434cc1a16d3

data/lib/vanilli/client.rb

@@ -42,7 +42,7 @@ class VanilliClient
   def initialize(port)
     @port = port
   end
-  
+
   # Represents a single stub as will be registered with
   # the vanilli server.
   class Stub
@@ -62,7 +62,7 @@ class VanilliClient
                                                         contentType: content_type,
                                                         body: body,
                                                         headers: headers))
-      @times = times
+      @times = times unless times == :any
 
       self
     end
@@ -90,6 +90,10 @@ class VanilliClient
                  captureId: @capture_id,
                  expect: @expect).to_json
     end
+
+    def ensure_times_exists
+      @expect = 1 unless @expect
+    end
   end
 
   # Create a new Stub that will be matched
@@ -146,6 +150,8 @@ class VanilliClient
   # vanilli server.
   def expect(expectation)
     expectation.expect = true
+    expectation.ensure_times_exists
+
     stub(expectation)
   end
 
@@ -182,14 +188,11 @@ class VanilliClient
     get_captures(capture_id).last
   end
 
-
   # Verifies that all vanilli expectations have been met. If
   # not, an error is thrown.
   def dump
-    begin
-      puts RestClient.get("http://localhost:#{@port}/_vanilli/dump")
-    rescue => e
-      raise e.response
-    end
+    puts RestClient.get("http://localhost:#{@port}/_vanilli/dump")
+  rescue => e
+    raise e.response
   end
 end

data/vanilli-ruby.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "vanilli-ruby"
-  spec.version       = "1.1.3"
+  spec.version       = "1.2.0"
   spec.authors       = ["Alistair Dutton"]
   spec.email         = ["kelveden@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanilli-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Alistair Dutton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler