curlyrest 0.1.33 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b176a2a74978da6565b6807a35669e4c70a10f8953bcb8f266d2b1bea90482
-  data.tar.gz: ee9999169292ce953f871021600a8838d2435d05b6305ec969de61dc93003edb
+  metadata.gz: f962af4bf3323d1e468ff1793f776c66c3526de3425aa8e9403c10becc4b2385
+  data.tar.gz: a433e2943f6fe2038b87ab52f40f6dd245d7cd2948f0639e008ed294b94faaf2
 SHA512:
-  metadata.gz: 020e9f8633037adcfeea3f3eed2503acc1591790dfd29cd12b4d32d52060ad34ba9d351e9f4a7e1c26a55e8b10c005f62c459546ed16b1b2906d46a8a336ec5b
-  data.tar.gz: de73017da194b2520ef8c28362eed07771ab721eb8f617d5508595a6047535e3cd2277ba64fed958881fb02f05f4448e148e7f990724139ae7e2afec60253d87
+  metadata.gz: 611560868a36fdee9124bfe15fe4569118888ceb3138de7c480f05709b74bc2979984ba3cefed16838a7e1bcc6568bac13499816b6a91a9404d3d2bf2b2d5318
+  data.tar.gz: 469c72ee4ac5b2a70aee8adc5bbf66fd62244af93da9b448867daeaaef43d26e30533994c6fba778e93131c29e9b0f2e150c931ba7d7d3370e493ce3980da866

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.idea/
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.rubocop.yml

@@ -1,11 +1,17 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 Metrics/BlockLength:
+  Max: 2000
   Exclude:
+    - 'spec/*.rb'
+    - 'spec/**/*.rb'
     - 'Rakefile'
     - '**/*.rake'
-    - 'spec/**/*.rb'
     - '*.gemspec'
 
 Metrics/MethodLength:

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gem 'simplecov', require: false, group: :test
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/curlyrest.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'curlyrest/version'
@@ -7,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = Curlyrest::VERSION
   spec.authors       = ['Keith Williams']
   spec.email         = ['keithrw@comcast.net']
-
+  spec.required_ruby_version = ['>= 2.5.5', '< 3.0']
   spec.summary       =
     'gem extending rest-client, allowing use/debug of curl for request'
   spec.description   =

data/lib/curlyrest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curlyrest/version'
 require 'rest-client'
 require 'byebug'
@@ -8,45 +10,42 @@ module Curlyrest
   class CurlResponse
     include Net::HTTPHeader
     attr_reader :code, :http_version, :message, :headers
-    attr_accessor :body, :inflate
+    attr_accessor :body
+
     def initialize(http_version, status, message = '')
       @message = message
       @http_version = http_version
       @code = status
       @body = ''
-      @inflate = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
       initialize_http_header nil
     end
-
-    def unzip_body(gzip)
-      @body = @inflate.inflate(gzip)
-    end
   end
 
   # class for parsing curl responses
   class CurlResponseParser
     attr_accessor :response
+
     def initialize(response)
       @state = :read_status
       @response = nil
-      @body = ''
+      @body_lines = []
+      @body = nil
       parse(response)
     end
 
+    def body
+      @body || @body_lines.join
+    end
+
     def parse(response)
       response.lines.each do |line|
         parse_line(line)
       end
-      ce = @response.to_hash.dig('content-encoding')
-      if ce&.include?('gzip')
-        @response.unzip_body(@body)
-      else
-        @response.body = @body
-      end
+      @response.body = body
     end
 
     def parse_status(line)
-      re = %r{^HTTP\/(\d+|\d+\.\d+)\s(\d+)\s*(.*)$}
+      re = %r{^HTTP/(\d+|\d+\.\d+)\s(\d+)\s*(.*)$}
       return unless re.match(line.chop)
 
       r = Regexp.last_match(2)
@@ -64,19 +63,19 @@ module Curlyrest
         return
       end
       /^([\w-]+):\s(.*)/ =~ line.chop
+      raise "invalid line while parsing headers: #{line}" unless Regexp.last_match
+
       @response.add_field(Regexp.last_match(1), Regexp.last_match(2))
     end
 
     def parse_line(line)
       case @state
       when :body
-        @body << line
+        @body_lines << line
       when :read_status
         parse_status(line)
       when :headers
         parse_headers(line)
-      else
-        puts "parser error on #{line}"
       end
     end
   end
@@ -84,6 +83,7 @@ module Curlyrest
   # class for transmitting curl requests
   class CurlTransmitter
     attr_accessor :options, :headers, :line, :timeout
+
     def initialize(uri, method, headers, payload)
       @payload = payload
       @method = method
@@ -105,14 +105,13 @@ module Curlyrest
       headers, options = opts_from_headers(headers)
       headers.delete('No-Restclient-Headers') ||
         headers.delete(:no_restclient_headers)
-      headers.delete('Accept-Encoding') ||
-        headers.delete('accept_encoding')
       [headers, options]
     end
 
     def curl_data(payload)
       return nil unless payload
       return "-d '#{payload}'" unless payload.include?('\'')
+
       File.write('/tmp/curl_quoted_binary', payload)
       '--data-binary @/tmp/curl_quoted_binary'
     end
@@ -124,19 +123,19 @@ module Curlyrest
     def curl_start
       timeout = options[:timeout]
       timeout_str = ''
-      timeout_str << " --max-time #{timeout}" unless timeout.nil?
-      "curl -isSL -X #{@method.upcase}#{timeout_str}"
+      timeout_str += " --max-time #{timeout}" if timeout
+      "curl -isSL -X #{@method.upcase}#{timeout_str} 2>&1"
     end
 
     def curl_headers(headers)
-      ret_headers = ' '
+      ret_headers = [' ']
       headers.each { |k, v| ret_headers << "-H '#{k}: #{v}' " }
-      ret_headers
+      ret_headers.join
     end
 
     def curl_command
       "#{curl_start}#{curl_proxy(@options[:proxy])}"\
-      "#{curl_headers(@headers)}'#{@uri}' #{curl_data(@payload&.to_s)}"
+        "#{curl_headers(@headers)}'#{@uri}' #{curl_data(@payload&.to_s)}"
     end
 
     def exec_curl
@@ -151,6 +150,7 @@ module Curlyrest
   def curl_transmit(uri, method, headers, payload)
     ct = CurlTransmitter.new(uri, method, headers, payload)
     r = ct.exec_curl
+
     CurlResponseParser.new(r).response
   end
 end

data/lib/curlyrest/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Curlyrest
-  VERSION = '0.1.33'.freeze
+  VERSION = '0.1.37'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curlyrest
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.37
 platform: ruby
 authors:
 - Keith Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -83,7 +83,6 @@ files:
 - README.md
 - Rakefile
 - curlyrest.gemspec
-- failing.txt
 - lib/curlyrest.rb
 - lib/curlyrest/version.rb
 homepage: https://github.com/keithrw54/curlyrest.git
@@ -98,14 +97,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.5
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: gem extending rest-client, allowing use/debug of curl for request

data/failing.txt

@@ -1,2 +0,0 @@
-curl -isS -X POST -x http://l5d.us1.dev.cloudhealthtech.com:4140 -H 'content_type: application/json' -H 'l5d-dtab: /hh=>/ng/kwilliams' -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IkRkcEFZdHAtWUIwdTNIbGxJOGczSkdUX2hkOTI5aERlRkpOUmR6REU3R1UifQ.eyJzdWIiOiJjcm46MjAxNzp1c2VyLzg5MjIxIiwib3JnIjoiY3JuOjIwMTc6b3JnYW5pemF0aW9uLzg5MzM1MzE5NzYyOSIsInJvbGUiOiJjcm46OnJvbGUvMyIsImlzcyI6ImNybjo6dG9rZW4tc2VydmljZS9wb2QiLCJhdWQiOiJjcm46OmFjY2Vzcy10b2tlbi9wb2QiLCJpYXQiOjE1NDM1ODYzMjQsImV4cCI6MTU0MzU4NzIyNCwianRpIjoiYjA1NmUwMWMtYTc0Ni00NjdjLWEwZmQtMzdlMGI1MmUyOGM5In0.EHjFcOSxfxuH9lFTq9RREP0NMofyAkAf0-czbvxZXvfe_7h6brnRFty6_TkGa3fXa3TK6rpWLrWLo2sIeEF2DW5UXYwXz0eMotObMjJVi30VtlYWQPJX1QpQgL97Wzxjb-OZ5buzBzXTWeV2vinDZPxjUhtqHz-TJHjU6jNSNBrDc6eofg_95rANzNjRXJp9JSd89mFq0qAcmQhtnQOAzvTouLViBcK0cwxzsK3ux4QLxS4_SKRGEdZ24tq2mlM8kNi2SB4T1qCX8hItrnCUaShOurB18SuxKdp6PjQmzyBVnnSPRqIgQJGqRSiGPCmHRuLmsm50lGSLnm95HzLP6ZYe6bxyQdFZp7_WIky7onV_EjkqaiPqeb8PqUIBYlYz-sI95vUs__hV8qe47LV7Yw9mB_d00hoDGruUN2XzMV4DLR-E4KMUnHrBD1mZK5gVOi7mx8nPhDYleFAl9d57oTWHMd-iT2NxSpE56Saq1peF2vKgV84nysWyCRf0XRyWsbwNbLL16mGJr56ZR6IbVKZ2tkHSBOiyJ2UIx-IfnAN2p1Y9GaKGsJoGPcRADy9p_ogbNIakH4j92T9RbXbAAjPluZBD9eVnwvejeiuoNMxZQwtV-D32l2jP8u6ZpRCQO2z5Hk0LKSZdxKsm0RQnT_T1n4G1GAxG5sab9zqbXLg' 'http://query-data/graphql' -d '{"query":"mutation ExecuteChql {executeChql (input: {chql: \"SELECT day, aws_regions, aws_charge_type, aws_billing_account, sum(cost) FROM costusage WHERE aws_regions = 'us-east-1' GROUP BY day, aws_regions, aws_charge_type, aws_billing_account ORDER BY aws_regions asc, aws_charge_type desc\"\n                              sources: [{crn: \"crn:2017:query-meta/dataset:AWS:CostUsageDaily\"\n                                alias: \"costusage\"}]\n                              clientMutationId: \"ignore\"}){ id }}"}'
-HT