rack-logstash-writer 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aba065b11c7d708bf89e3be92f03d5feed690783
-  data.tar.gz: 6ad0e76d87d43936de0f1863679edc881151d0d8
+  metadata.gz: 66afeb37c4348d48af51b1886a3cea76d33cd1b4
+  data.tar.gz: 159a1232bcd83a11645e972949051fb5caa4b3ef
 SHA512:
-  metadata.gz: 33f96ac175fd8d9cfb117dff41f96626a552150a22d1928dc08cf258a1a8f83271ad3afc12221e580bd5dafa7aaf952413f9b949f2c0f1643f8b8338d6835757
-  data.tar.gz: b12e45bb92ff0a3b04ca525938b006659cc4fd22bdbb342f68593f23b8484429af7ef96b67398c980fdd72e6dc89e350791ae745e96ae833aafb4427ab2d7f74
+  metadata.gz: e9adab0adf71ef461fb169b2b5759d67284647dca416ef6d2750438702d4e90c1716002bfa81189d1b760a2102ffe77c92e87c493503f55f3989b1715271c59f
+  data.tar.gz: 70bc7d2aae4990efd783cd0d8a74ddecdeed99db50589bebdd963643305001d1797c02cf62d2edcb562fabd1e86568dc044963578e754440d9c5789b1881593c

data/lib/rack/logstash-writer.rb

@@ -14,8 +14,14 @@ module Rack
         add_request_script?: false,
         curl_opts: {}
     }
-    CURL_DEFAULT_OPTS = {data_proc: proc(&:to_json), ignored_headers: [], verbose?: true}
     REQUIRED_OPTIONS = [:url]
+    CURL_DEFAULT_OPTS = {
+        data_key: 'rack.request.form_hash',
+        data_proc: proc(&:to_json),
+        ignored_headers: [],
+        verbose: true
+    }
+    COMMON_ENCODINGS = %w(compress deflate exi gzip pack200-gzip br)
 
     # Initialize a new Rack adapter, logstash writer
     # @param [Proc] app
@@ -102,7 +108,7 @@ module Rack
 
       # add curl if users enables it
       if @options[:add_curl_command?] || @options[:add_request_script?]
-        data[:curl] = gen_curl_by_rack_env(env, CURL_DEFAULT_OPTS.merge(@options[:curl_opts]))
+        data[:curl] = gen_curl_by_rack_env(env, response_headers, CURL_DEFAULT_OPTS.merge(@options[:curl_opts]))
       end
 
       # This just works for all body types (magic?)... see http://www.rubydoc.info/github/rack/rack/Rack/BodyProxy
@@ -159,15 +165,16 @@ module Rack
     # * @option [Proc] :data_proc: for processing the data prior for inserting it to query (by --data flag)
     # * @option [Array<String>] :ignored_headers: to prevent inclusion to the query (by --header flag)
     # * @option [Array<String>] :extra_arguments: string ot args to add to the query
-    # * @option [Boolean] :verbose?: add --verbose switch if true. default: true
+    # * @option [Boolean] :verbose: add --verbose switch if true. default: true
+    # * @option [Boolean] :compressed: add or exclude --compressed switch by force. default: chooses automatically.
     # @return [String] of curl unix-command that will imitate the request to server/service
-    def gen_curl_by_rack_env env, opts
+    def gen_curl_by_rack_env env, response_headers, opts
       command_acc = ["curl #{url(env)} "]
 
       command_acc << "--request #{env['REQUEST_METHOD']}"
 
       # form-data will be processed by the proc sent by the user
-      data = opts[:data_proc].call(env['rack.request.form_hash']) rescue env['rack.request.form_hash']
+      data = opts[:data_proc].call(env[opts[:data_key]]) rescue env['rack.request.form_hash']
       command_acc << "--data #{data.inspect}" if data && !data.empty?
 
       # add all headers to the query. do not add +ignore_headers+ specified by the user
@@ -182,6 +189,8 @@ module Rack
 
       # the curl script is intended for debugging, therefore --verbose switch is added (unless specified by caller)
       command_acc << '--verbose' if opts[:verbose]
+      encodings = response_headers['Content-Encoding'].to_s.split(',').map(&:strip) & COMMON_ENCODINGS
+      command_acc << '--compressed' if (opts[:compressed].nil? ? !encodings.empty? : opts[:compressed])
 
       # let user change the query as they desire
       command_acc += opts[:extra_arguments] if opts[:extra_arguments]
@@ -191,10 +200,11 @@ module Rack
     end
 
     # @param [Hash] env rack env
-    # @return [String] url-scheme://prefix.name.suffix:port/uri/uri/uri?query=query:query=query
+    # @return [String] url-scheme://prefix.name.suffix:port/uri/uri/uri?query=query:query=queryrevert master
     def url env
       url = "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{env['REQUEST_URI']}"
-      env['QUERY_STRING'] ? url << "?#{env['QUERY_STRING']}" : url
+      query_string = env['QUERY_STRING'].to_s.strip
+      !query_string.empty? ? url << "?#{query_string}" : url
     end
   end
 end

data/lib/rack/logstash-writer/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class LogstashWriter
-    VERSION = "1.2.0"
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstash-writer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - or garfunkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake