watchdocs-rails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759c089b37d5306a90c488465c6f2ba497954820
-  data.tar.gz: cf29d40f4b26ca075296059b967e587dacd46378
+  metadata.gz: 7d1845d7f31d111819223a47123e0e1faf07bfb8
+  data.tar.gz: b39fc2397b69a677627adaf348c23146f555e1e9
 SHA512:
-  metadata.gz: da742003e254f774aba12748d588332536a22a2bc368568108b86c1c316470bc921f0d71701cf3a543c43ee2b1f912a7a321a7136cd8c6a6d9560262566a6acf
-  data.tar.gz: 919006c6c34e2301c7954d32c7379c4139030ae306685abfe486df334430be4338b3527e888e8e0cb5975dd8001d758fb2c48a4a7f0e29c906001a9e6cdf8846
+  metadata.gz: ee89cfdf079de10cfb05cc5d9812c992fe0aba7f741c7f233b2adcb92bd50b3bb601bc0c00e5f3a88cdefa315ef2bc09f8b15bda0448c1293c33f17b9ab0d657
+  data.tar.gz: d54d105671e5479961455a3154508c3129780a15f1f3618003a7f3155b045181996f0afe38d19d6fe54c90e599db232cd5eb8923ab0497d4c6a1a70567f1b78f

data/lib/watchdocs/rails.rb

@@ -1,6 +1,7 @@
 require 'watchdocs/rails/core_extensions'
 require 'watchdocs/rails/buffer'
 require 'watchdocs/rails/configuration'
+require 'watchdocs/rails/helpers'
 require 'watchdocs/rails/middleware'
 require 'watchdocs/rails/recordings'
 

data/lib/watchdocs/rails/helpers.rb

@@ -0,0 +1,3 @@
+require 'watchdocs/rails/helpers/headers_helper'
+require 'watchdocs/rails/helpers/body_helper'
+require 'watchdocs/rails/helpers/query_string_helper'

data/lib/watchdocs/rails/helpers/body_helper.rb

@@ -0,0 +1,38 @@
+module Watchdocs
+  module Rails
+    module Helpers
+      module BodyHelper
+        def body_string(body)
+          body_string = ''
+          body.each { |line| body_string += line } if body
+          body_string
+        end
+
+        def parse_response_body(body)
+          return if body.empty?
+          filter_data(JSON.parse(body))
+        rescue JSON::ParserError => e
+          log_and_return_empty "Invalid JSON data: #{e.message}, Body: #{body}"
+        rescue StandardError
+          log_and_return_empty "Response body format not supported. Body: #{body}"
+        end
+
+        def parse_request_body(body)
+          return if body.empty?
+          filter_data(JSON.parse(body))
+        rescue JSON::ParserError
+          begin
+            filter_data(Rack::Utils.parse_nested_query(body))
+          rescue StandardError
+            log_and_return_empty "Request body format not supported. Body: #{body}"
+          end
+        end
+
+        def log_and_return_empty(error)
+          $stderr.puts "Watchdocs Middleware Error: #{error}"
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/watchdocs/rails/helpers/headers_helper.rb

@@ -0,0 +1,19 @@
+module Watchdocs
+  module Rails
+    module Helpers
+      module HeadersHelper
+        def request_headers(env)
+          env.keys
+             .select { |k| k.start_with? 'HTTP_' }
+             .map { |k| format_header(k) }
+             .sort
+        end
+
+        def format_header(header)
+          header.sub(/^HTTP_/, '')
+                .tr('_', '-')
+        end
+      end
+    end
+  end
+end

data/lib/watchdocs/rails/helpers/query_string_helper.rb

@@ -0,0 +1,16 @@
+module Watchdocs
+  module Rails
+    module Helpers
+      module QueryStringHelper
+        def parse_query_string(params)
+          filter_data(
+            Rack::Utils.parse_nested_query(params)
+          )
+        rescue StandardError
+          $stderr.puts "Query String format not supported. String: #{params}"
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/watchdocs/rails/middleware.rb

@@ -1,6 +1,10 @@
 module Watchdocs
   module Rails
     class Middleware
+      include Rails::Helpers::HeadersHelper
+      include Rails::Helpers::BodyHelper
+      include Rails::Helpers::QueryStringHelper
+
       attr_reader :app, :report
 
       def initialize(app)
@@ -10,12 +14,16 @@ module Watchdocs
 
       def call(env)
         app.call(env).tap do |response|
-          if json_response?(response)
-            clear_report
-            catch_request(env)
-            catch_response(response)
-            match_endpoint_pattern
-            record_call
+          begin
+            if json_response?(response)
+              clear_report
+              catch_request(env)
+              catch_response(response)
+              match_endpoint_pattern
+              record_call
+            end
+          rescue StandardError => e
+            $stderr.puts "Watchdocs Middleware Error: #{e.message}"
           end
         end
       end
@@ -35,7 +43,7 @@ module Watchdocs
         @report[:request] = {
           method: env['REQUEST_METHOD'],
           url: env['PATH_INFO'],
-          query_string_params: Rack::Utils.parse_nested_query(env['QUERY_STRING']),
+          query_string_params: parse_query_string(env['QUERY_STRING']),
           body: parse_request_body(env['rack.input'].read),
           headers: request_headers(env)
         }
@@ -70,46 +78,8 @@ module Watchdocs
         ::Rails.env.test?
       end
 
-      def request_headers(env)
-        env.keys
-           .select { |k| k.start_with? 'HTTP_' }
-           .map { |k| format_header(k) }
-           .sort
-      end
-
-      def format_header(header)
-        header.sub(/^HTTP_/, '')
-              .tr('_', '-')
-      end
-
-      def body_string(body)
-        body_string = ''
-        body.each { |line| body_string += line } if body
-        body_string
-      end
-
-      def parse_response_body(body)
-        return if body.empty?
-        filter_body(JSON.parse(body))
-      rescue JSON::ParserError => e
-        { watchdocs_error: "Invalid JSON data: #{e.message}" }
-      rescue StandardError
-        { watchdocs_error: 'Response body format not supported' }
-      end
-
-      def parse_request_body(body)
-        return if body.empty?
-        filter_body(JSON.parse(body))
-      rescue JSON::ParserError
-        begin
-          filter_body(Rack::Utils.parse_nested_query(body))
-        rescue StandardError
-          { watchdocs_error: 'Request body format not supported' }
-        end
-      end
-
-      def filter_body(body)
-        body.is_a?(Enumerable) ? body.filter_data : body
+      def filter_data(data)
+        data.is_a?(Enumerable) ? data.filter_data : data
       end
     end
   end

data/lib/watchdocs/rails/version.rb

@@ -1,5 +1,5 @@
 module Watchdocs
   module Rails
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchdocs-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - mazikwyry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,10 @@ files:
 - lib/watchdocs/rails/core_extensions/enumerable.rb
 - lib/watchdocs/rails/core_extensions/hash.rb
 - lib/watchdocs/rails/core_extensions/object.rb
+- lib/watchdocs/rails/helpers.rb
+- lib/watchdocs/rails/helpers/body_helper.rb
+- lib/watchdocs/rails/helpers/headers_helper.rb
+- lib/watchdocs/rails/helpers/query_string_helper.rb
 - lib/watchdocs/rails/middleware.rb
 - lib/watchdocs/rails/recordings.rb
 - lib/watchdocs/rails/recordings/exporter.rb