rack-request_replication 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d25517c39a0513f9daab7c9f90bf24382974c08
-  data.tar.gz: d534c1b60e433347a4488144b64ac8f26eeefa40
+  metadata.gz: 1b5f3b3d0ce122bb0437c305d39b81065462a923
+  data.tar.gz: f07ac10950d3c79c3a7b7d56324bb63ad3c18a81
 SHA512:
-  metadata.gz: 0291e0558590cb8f6fa162370962659c1a3a52a9214853c0fec6f8a0c192611306f666b04fa28c44274ee149b5ac1bccd9ce080051c7e4d314dbaf3c88ecd802
-  data.tar.gz: b71351c30606ff5ca4a454f2525645a4b9a84f55ce14d0dea363fa3a2b180a2fb76257d21b4aae7796531e7791d6961fadbf51c26f71a6b35c534f6115f1d0e7
+  metadata.gz: e50bf526bc98629172483e2ed48206ea362aacf55f59f1f2396f09c33db182bca44ee638c72b473d5f4b82d39fa013bf64343560b2b5e046dcf6aaa9df22a63a
+  data.tar.gz: 57a3c7b969f9b569fd39123cd37256cf0c5f8fe58cf6e5eb084b689770a70fd1738eecf5dd6bbfa848c8a41ebe9d0d0675ae9671fdf4065909b762148cc0d933

data/lib/rack/request_replication/forwarder.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'net/http'
 require 'uri'
 require 'redis'
+require 'active_support/core_ext/hash/conversions'
 
 module Rack
   module RequestReplication
@@ -32,7 +33,7 @@ module Rack
       #   @option redis [Integer] :port (6379)
       #   @option redis [String]  :db   ('rack-request-replication')
       #
-      def initialize( app, options = {} )
+      def initialize(app, options = {})
         @app = app
         @options = {
           host: 'localhost',
@@ -42,7 +43,7 @@ module Rack
           session_key: 'rack.session',
           root_url: '/',
           redis: {}
-        }.merge options
+        }.merge(options)
       end
 
       ##
@@ -50,10 +51,10 @@ module Rack
       # @return [Array(Integer, Hash, #each)]
       # @see    http://rack.rubyforge.org/doc/SPEC.html
       #
-      def call( env )
-        request = Rack::Request.new env
-        replicate request
-        app.call env
+      def call(env)
+        request = Rack::Request.new(env)
+        replicate(request)
+        app.call(env)
       end
 
       ##
@@ -62,11 +63,11 @@ module Rack
       #
       # @param  [Rack::Request] request
       #
-      def replicate( request )
-        opts = replicate_options_and_data request
-        uri = forward_uri request
+      def replicate(request)
+        opts = replicate_options_and_data(request)
+        uri = forward_uri(request)
 
-        http = Net::HTTP.new uri.host, uri.port
+        http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = options[:use_ssl]
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless options[:verify_ssl]
 
@@ -81,8 +82,8 @@ module Rack
 
         Thread.new do
           begin
-            forward_request.add_field("Cookie", cookies( request ))
-            update_csrf_token_and_cookies( request, http.request(forward_request) )
+            forward_request.add_field("Cookie", cookies(request))
+            update_csrf_token_and_cookies(request, http.request(forward_request))
           rescue => e
             logger.debug "Replicating request failed with: #{e.message}"
           end
@@ -95,9 +96,9 @@ module Rack
       # @param   [Rack::Request] request
       # @param   [Net::HTTP::Response] response
       #
-      def update_csrf_token_and_cookies( request, response )
-        update_csrf_token( request, response )
-        update_cookies( request, response )
+      def update_csrf_token_and_cookies(request, response)
+        update_csrf_token(request, response)
+        update_cookies(request, response)
       end
 
       ##
@@ -106,11 +107,11 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [String]
       #
-      def csrf_token( request )
+      def csrf_token(request)
         token = request.params["authenticity_token"]
         return if token.nil?
 
-        redis.get( "csrf-#{token}" ) || token
+        redis.get("csrf-#{token}") || token
       end
 
       ##
@@ -118,7 +119,7 @@ module Rack
       #
       # @param   [Rack::Request] request
       #
-      def update_csrf_token( request, response )
+      def update_csrf_token(request, response)
         token = request.params["authenticity_token"]
         return if token.nil?
 
@@ -134,7 +135,7 @@ module Rack
       # @param   [Net::HTTP::Response] response
       # @returns [String]
       #
-      def csrf_token_from( response )
+      def csrf_token_from(response)
         response.split("\n").
           select{|l| l.match(/csrf-token/) }.
           first.split(" ").
@@ -152,11 +153,11 @@ module Rack
       # @param [Rack::Request] request
       # @param [Net::HTTP::Response] response
       #
-      def update_cookies( request, response )
-        return unless cookies_id( request )
-        cookie = response.to_hash['set-cookie'].collect{|ea|ea[/^.*?;/]}.join rescue {}
-        cookie = Hash[cookie.split(";").map{|d|d.split('=')}] rescue {}
-        redis.set( cookies_id( request), cookie )
+      def update_cookies(request, response)
+        return unless cookies_id(request)
+        cookie = response.to_hash['set-cookie'].collect{ |ea|ea[/^.*?;/] }.join rescue {}
+        cookie = Hash[cookie.split(";").map{ |d|d.split('=') }] rescue {}
+        redis.set(cookies_id(request), cookie)
       end
 
       ##
@@ -169,11 +170,9 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [Hash]
       #
-      def cookies( request )
-        return ( request.cookies || "" ) unless cookies_id( request )
-        redis.get( cookies_id( request )) ||
-          request.cookies ||
-          {}
+      def cookies(request)
+        return (request.cookies || "") unless cookies_id(request)
+        redis.get(cookies_id(request)) || request.cookies || {}
       end
 
       ##
@@ -185,11 +184,11 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [String]
       #
-      def cookies_id( request )
+      def cookies_id(request)
         cs = request.cookies
-        sess = cs && cs[options[:session_key]]
-        sess_id = sess && sess.split("\n--").last
-        sess_id
+        session = cs && cs[options[:session_key]]
+        session_id = session && session.split("\n--").last
+        session_id
       end
 
       ##
@@ -201,8 +200,8 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Get]
       #
-      def create_get_request( uri, opts = {} )
-        Net::HTTP::Get.new uri.request_uri
+      def create_get_request(uri, opts = {})
+        Net::HTTP::Get.new(uri.request_uri)
       end
 
       ##
@@ -215,9 +214,9 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Post]
       #
-      def create_post_request( uri, opts = {} )
-        forward_request = Net::HTTP::Post.new uri.request_uri
-        forward_request.set_form_data opts[:params]
+      def create_post_request(uri, opts = {})
+        forward_request = Net::HTTP::Post.new(uri.request_uri)
+        forward_request.body = opts[:params].to_query
         forward_request
       end
 
@@ -231,9 +230,9 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Put]
       #
-      def create_put_request( uri, opts = {} )
-        forward_request = Net::HTTP::Put.new uri.request_uri
-        forward_request.set_form_data opts[:params]
+      def create_put_request(uri, opts = {})
+        forward_request = Net::HTTP::Put.new(uri.request_uri)
+        forward_request.body = opts[:params].to_query
         forward_request
       end
 
@@ -247,9 +246,9 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Patch]
       #
-      def create_patch_request( uri, opts = {} )
-        forward_request = Net::HTTP::Patch.new uri.request_uri
-        forward_request.set_form_data opts[:params]
+      def create_patch_request(uri, opts = {})
+        forward_request = Net::HTTP::Patch.new(uri.request_uri)
+        forward_request.body = opts[:params].to_query
         forward_request
       end
 
@@ -262,8 +261,8 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Delete]
       #
-      def create_delete_request( uri, opts = {} )
-        Net::HTTP::Delete.new uri.request_uri
+      def create_delete_request(uri, opts = {})
+        Net::HTTP::Delete.new(uri.request_uri)
       end
 
       ##
@@ -275,8 +274,8 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Options]
       #
-      def create_options_request( uri, opts = {} )
-        Net::HTTP::Options.new uri.request_uri
+      def create_options_request(uri, opts = {})
+        Net::HTTP::Options.new(uri.request_uri)
       end
 
       ##
@@ -288,8 +287,8 @@ module Rack
       # @param   [Hash{Symbol => Object}] opts ({})
       # @returns [Net:HTTP::Options]
       #
-      def create_propfind_request( uri, opts = {} )
-        Net::HTTP::Propfind.new uri.request_uri
+      def create_propfind_request(uri, opts = {})
+        Net::HTTP::Propfind.new(uri.request_uri)
       end
 
       ##
@@ -299,7 +298,7 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [Hash]
       #
-      def replicate_options_and_data( request )
+      def replicate_options_and_data(request)
         replicated_options ||= {}
         %w(
           accept_encoding
@@ -314,12 +313,12 @@ module Rack
           user_agent
           url
         ).map(&:to_sym).each do |m|
-          value = request.send( m )
+          value = request.send(m)
           replicated_options[m] = value unless value.nil?
         end
 
         if replicated_options[:params]["authenticity_token"]
-          replicated_options[:params]["authenticity_token"] = csrf_token( request )
+          replicated_options[:params]["authenticity_token"] = csrf_token(request)
         end
 
         replicated_options
@@ -332,8 +331,8 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [URI]
       #
-      def forward_uri( request )
-        url = "#{request.scheme}://#{forward_host_with_port( request )}"
+      def forward_uri(request)
+        url = "#{request.scheme}://#{forward_host_with_port(request)}"
         url << request.fullpath
         URI(url)
       end
@@ -345,9 +344,9 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [String]
       #
-      def forward_host_with_port( request )
+      def forward_host_with_port(request)
         host = options[:host].to_s
-        host = "#{host}:#{options[:port]}" unless port_matches_scheme? request
+        host = "#{host}:#{options[:port]}" unless port_matches_scheme?(request)
         host
       end
 
@@ -369,7 +368,7 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [boolean]
       #
-      def port_matches_scheme?( request )
+      def port_matches_scheme?(request)
         options[:port].to_i == DEFAULT_PORTS[clean_scheme(request)]
       end
 
@@ -379,7 +378,7 @@ module Rack
       # @param   [Rack::Request] request
       # @returns [String]
       #
-      def clean_scheme( request )
+      def clean_scheme(request)
         request.scheme.match(/^\w+/)[0]
       end
 

data/lib/rack/request_replication/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module RequestReplication
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/rack-request_replication.gemspec

@@ -6,7 +6,7 @@ require 'rack/request_replication/version'
 Gem::Specification.new do |spec|
   spec.name          = 'rack-request_replication'
   spec.version       = Rack::RequestReplication::VERSION
-  spec.authors       = ['Wouter de Vos']
+  spec.authors       = ['Wouter de Vos', 'Mark Mulder']
   spec.email         = ['wouter@springest.com']
   spec.summary       = %q{Request replication MiddleWare for Rack.}
   spec.description   = %q{Replicate or record HTTP requests to your Rack application and replay them elsewhere or at another time.}
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'rack', '>= 1.0.0'
   spec.add_runtime_dependency 'redis', '>= 1.0.0'
+  spec.add_runtime_dependency 'activesupport', '>= 2.1.0'
 end

data/spec/app/test_app.rb

@@ -23,15 +23,15 @@ class TestApp < Sinatra::Base
   end
 
   post '/' do
-    'POST OK'
+    request.params.to_s
   end
 
   put '/' do
-    'PUT OK'
+    request.params.to_s
   end
 
   patch '/' do
-    'PATCH OK'
+    request.params.to_s
   end
 
   delete '/' do
@@ -60,17 +60,17 @@ class DestApp < Sinatra::Base
   end
 
   post '/' do
-    $destination_responses << 'POST OK'
+    $destination_responses << request.params.to_s
     'Created!'
   end
 
   put '/' do
-    $destination_responses << 'PUT OK'
+    $destination_responses << request.params.to_s
     'Replaced!'
   end
 
   patch '/' do
-    $destination_responses << 'PATCH OK'
+    $destination_responses << request.params.to_s
     'Updated'
   end
 

data/spec/forwarder_spec.rb

@@ -38,21 +38,29 @@ describe Rack::RequestReplication::Forwarder do
   end
 
   describe 'a POST request' do
-    before { post '/', foo: 'bar' }
+    it 'posts correct parameters along parameters' do
+      post '/', foo: 'bar'
+      expect(destination_response).to eq "{\"foo\"=>\"bar\"}"
+    end
 
-    it { expect(last_response.body).to eq destination_response }
+    it "works with nested parameters" do
+      post '/', foo: { bar: 'buz' }
+      expect(destination_response).to eq "{\"foo\"=>{\"bar\"=>\"buz\"}}"
+    end
   end
 
   describe 'a PUT request' do
-    before { put '/', foo: 'bar' }
-
-    it { expect(last_response.body).to eq destination_response }
+    it 'posts correct parameters along parameters' do
+      put '/', foo: { bar: 'buz' }
+      expect(destination_response).to eq "{\"foo\"=>{\"bar\"=>\"buz\"}}"
+    end
   end
 
   describe 'a PATCH request' do
-    before { patch '/', foo: 'bar' }
-
-    it { expect(last_response.body).to eq destination_response }
+    it 'posts correct parameters along parameters' do
+      patch '/', foo: { bar: 'buz' }
+      expect(destination_response).to eq "{\"foo\"=>{\"bar\"=>\"buz\"}}"
+    end
   end
 
   describe 'a DELETE request' do

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rack-request_replication
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Wouter de Vos
+- Mark Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Replicate or record HTTP requests to your Rack application and replay
   them elsewhere or at another time.
 email: