marcopolo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc67f4a1453ec6bb4f6eee5c4416c72f8b9b9e1
-  data.tar.gz: f1f2349517951a120298d76dcf9e40b0db217161
+  metadata.gz: 3d7b9c6170d11433cef35c60dc59c7381d465796
+  data.tar.gz: 79e60dc711051916638470ae3605c6d0a836acf5
 SHA512:
-  metadata.gz: bee378b9d266328c4be7a3a196e0b44b3d3b31c5795caf1674bc1d2862188badfd90267954cf624ee8921a5f04447e71781d5847449c575960edbcfc231eef4c
-  data.tar.gz: 61b0b157dafd8cca699c0f49ded943f9087f464e53a9d1764201c793804ad9442062f3d4dddf3c2465f04758d2db0d3fa37be07d87f1b6663e10d32d0ae4db5f
+  metadata.gz: 5181e779ffab1fd41bc20f93e3815351c05c79b97a8024a6f661b7aada28ee832a9732382a50ec12e42246ab9283641a0a6503ce29264ec2e1ab410cb3e9cc69
+  data.tar.gz: 3dd424e72bfae1f83c6e6fa6746407becc7a56cba6d2cd57fa68847a3886a3720b2cfe02f2245d561c05a70897b074db3b0869112ad8536c782dae4ba3925923

data/README.md

@@ -31,7 +31,7 @@ You may want to filter out noisy requests, such as health checks. Create a proc
 
     Marcopolo.options[:filter] = Proc.new do |request|
       # exclude all options requests
-      request.request_method != 'OPTIONS']
+      request.request_method != 'OPTIONS'
     end
 
 ## TODO

data/lib/marcopolo/middleware.rb

@@ -7,22 +7,22 @@ module Marcopolo
     def call(env)
       @request = Rack::Request.new(env)
 
-      @status, @headers, @response = @app.call(env)
+      allow = Marcopolo.allow(@request)
 
-      if Marcopolo.allow(@request)
-        begin
-          rawlog(env)
-        rescue => e
-          Marcopolo.log "Failed to log request: #{e.message}"
-        end
+      if allow
+        rawlog_request(env)
       else
         Marcopolo.log "Filtering request: #{@request.request_method} #{@request.url}"
       end
 
+      @status, @headers, @response = @app.call(env)
+
+      rawlog_response(env) if allow
+
       return [@status, @headers, @response]
     end
 
-    def rawlog(env)
+    def rawlog_request(env)
       req_headers = env.select {|k,v| k.start_with? 'HTTP_'}
         .collect {|pair| [pair[0].sub(/^HTTP_/, '').split('_').map(&:titleize).join('-'), pair[1]]}
         .sort
@@ -42,7 +42,9 @@ module Marcopolo
       })
 
       Marcopolo.log req_hash.to_a.map {|o| o.join(': ') }.join("\n") + "\n"
+    end
 
+    def rawlog_response(env)
       resp_hash = {
         "RESPONSE" => "",
         "Response Status" => @status,

data/lib/marcopolo/rails.rb

@@ -1,7 +1,7 @@
 module Marcopolo
   class Marco < Rails::Railtie
     initializer "marcopolo.configure_rails_initialization" do |app|
-      app.middleware.insert_before ActionDispatch::ParamsParser, "Marcopolo::Middleware"
+      app.middleware.insert_before Rack::Runtime, "Marcopolo::Middleware"
     end
   end
 end

data/lib/marcopolo/version.rb

@@ -1,3 +1,3 @@
 module Marcopolo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marcopolo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Hammond