request_interceptor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ccd56344e9eeee0f940e9042db9d19f26490fa
-  data.tar.gz: 356ededd222ceac8fea4b64ae978994cef14bd6b
+  metadata.gz: 244056547ed0ff2bc1acaeb6fa12f6aec7eb7fb7
+  data.tar.gz: 8b0719757447a76119044afefb543020ed1718a8
 SHA512:
-  metadata.gz: b12b0f6b6eb87bfbd3203c1e9087c7681be611932df6dcf1d108975a96b2277e9666b9e2e4addffb96ea82603d5cf103bd024e3d772da4f6f483da69c1c93ecd
-  data.tar.gz: 9781bed571b57a806e658d08dd64ce4f93003130c86e4cd9d1b63085787d26b72c70017e184740492dfd7f6faae37db395f65c91074d03d08c0ea63864907542
+  metadata.gz: 98452c1e2592dbdb2746a1eea5bf4627bd135743b0074864a1aab8b553bef146b0190950ac1d57311f492fe685697e757e24cffb5ecb8ba18c6569914c318731
+  data.tar.gz: 398a7146eb773b04749296906832216b93587aa05a279374df7c692b0def45a60fdbcf05b26bb0e7d88f8f32e151ad52023ae6886ef0621d766b2628412c1f87

data/README.md

@@ -91,7 +91,7 @@ These two features are only available for Sinatra based interceptors that inheri
 
 ### Constructor argument forwarding
 
-Any arugments provided to the `.intercept` method are forwarded to the interceptor's constructor:
+Any arguments provided to the `.intercept` method are forwarded to the interceptor's constructor:
 
 ```ruby
 multilingual_app = RequestInterceptor.define do
@@ -117,7 +117,7 @@ end
 
 multilingual_app.intercept do
   response = Net::HTTP.get(URI("http://example.com/"))
-  response = "Hello World" # => true
+  response == "Hello World" # => true
 end
 ```
 

data/lib/request_interceptor/version.rb

@@ -1,3 +1,3 @@
 class RequestInterceptor
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/request_interceptor.rb

@@ -4,7 +4,14 @@ require "net/http"
 require "rack/mock"
 
 class RequestInterceptor
-  class Transaction < Struct.new(:request, :response); end
+  Transaction = Struct.new(:request, :response)
+
+  Restart = Struct.new(:required, :instructions) do
+    protected :required
+    def required?
+      !!required
+    end
+  end
 
   GET = "GET".freeze
   POST = "POST".freeze
@@ -103,6 +110,25 @@ class RequestInterceptor
     response
   end
 
+  def start(http_context, &block)
+    self.restart = Restart.new(true, block)
+    http_context.instance_variable_set(:@started, true)
+    return block.call(http_context) if block
+    http_context
+  end
+
+  def finish(http_context)
+    http_context.instance_variable_set(:@started, false)
+    nil
+  end
+
+  protected
+
+  attr_writer :restart
+
+  def restart
+    @restart || Restart.new(false)
+  end
 
   private
 
@@ -120,21 +146,23 @@ class RequestInterceptor
     runner = self
 
     Net::HTTP.class_eval do
-      def start
-        @started = true
-        return yield(self) if block_given?
-        self
-      end
+      define_method(:start) { |&block| runner.start(self, &block) }
+      define_method(:finish) { runner.finish(self) }
+      define_method(:request) { |request, body = nil, &block| runner.request(self, request, body, &block) }
+    end
+  end
 
-      def finish
-        @started = false
-        nil
-      end
+  def real_request(http_context, request, body, &block)
+    http_context.finish if restart.required?
 
-      define_method(:request) do |request, body = nil, &block|
-        runner.request(self, request, body, &block)
-      end
+    restore_net_http_methods(http_context)
+
+    if restart.required?
+      http_context.start(&restart.instructions)
+      self.restart = nil
     end
+
+    http_context.request(request, body, &block)
   end
 
   def restore_net_http_methods(instance = nil)
@@ -171,11 +199,6 @@ class RequestInterceptor
     end
   end
 
-  def real_request(http_context, request, body, &block)
-    restore_net_http_methods(http_context)
-    http_context.request(request, body, &block)
-  end
-
   def log_transaction(request, response)
     transactions << RequestInterceptor::Transaction.new(request, response)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Konstantin Tennhard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sinatra based foreign API simulation
 test_files: []
-has_rdoc: