curlyrest 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c791b7fd11f32fcb9586ac3efbe1d61c90034a4
-  data.tar.gz: d1012f06a4a2a0175a59b794f59f91b27d289708
+  metadata.gz: 54902872b74e49ac70c0bd17b7926201b3c2cad5
+  data.tar.gz: b2aac6b7a50b8e8486dda7371ada5595c33f28a6
 SHA512:
-  metadata.gz: 6cb1d4ee7bd9b154e8ddadd915cec6f691b223c20c68bdd691336d4e40c82bd19d0286aec073b31fb2f7e0447684dac454913168282b0660322bb6468188f54c
-  data.tar.gz: 4df68565566d8c126e1270bba6be462e24aa13a6ccac4cab31954db013fadc01441b8e7b8220e4003efc189ebc5740cda8a4d158ac3ab49238f6ed293b23e8b2
+  metadata.gz: 46e7d713f5b9734cded5088f7621cd3b8a0e7e83d52f1a898f3610acd74b3f013ea81c4a7de3f705e0e9d50f43cf14af260327655108573c10cd05ffbdbb3bf4
+  data.tar.gz: e82472c2182851627e2261abe82628f9140862c0a3f492636d54c36262df2443b40315bf81549c0aee9c2c245768845c4055af3d5744287d3cdbd47819d3deb9

data/.rubocop.yml

@@ -0,0 +1,24 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+    - '*.gemspec'
+
+Metrics/MethodLength:
+  Exclude: 
+    - 'bin/*'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+    - 'bin/*'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'bin/*'

data/.ruby-gemset

@@ -0,0 +1 @@
+curlyrest

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.4.1

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+gem 'simplecov', require: false, group: :test
 
 # Specify your gem's dependencies in curlyrest.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/curlyrest.gemspec

@@ -1,27 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'curlyrest/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "curlyrest"
+  spec.name          = 'curlyrest'
   spec.version       = Curlyrest::VERSION
-  spec.authors       = ["Keith Williams"]
-  spec.email         = ["keithrw@comcast.net"]
+  spec.authors       = ['Keith Williams']
+  spec.email         = ['keithrw@comcast.net']
 
-  spec.summary       = 'gem extending rest-client, allowing use/debug of curl for request'
-  spec.description   = 'gem extending rest-client, allowing use/debug of curl for request'
-  spec.homepage      = "https://github.com/keithrw54/curlyrest.git"
-  spec.license       = "MIT"
+  spec.summary       =
+    'gem extending rest-client, allowing use/debug of curl for request'
+  spec.description   =
+    'gem extending rest-client, allowing use/debug of curl for request'
+  spec.homepage      = 'https://github.com/keithrw54/curlyrest.git'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files         =
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rest-client", "~> 2.0"
-  spec.add_development_dependency "byebug", "~> 2.0"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'byebug', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rest-client', '~> 2.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/curlyrest/version.rb

@@ -1,3 +1,3 @@
 module Curlyrest
-  VERSION = "0.1.11"
+  VERSION = '0.1.12'.freeze
 end

data/lib/curlyrest.rb

@@ -1,8 +1,10 @@
-require "curlyrest/version"
+require 'curlyrest/version'
 require 'rest-client'
 require 'byebug'
 
+# module extending Rest-Client to optionally do via curl
 module Curlyrest
+  # class for a constructing a curl response
   class CurlResponse
     include Net::HTTPHeader
     attr_reader :code, :http_version, :message, :headers
@@ -15,98 +17,145 @@ module Curlyrest
       @inflate = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
       initialize_http_header nil
     end
-    def body=(value)
-      @body = value
-    end
+
     def unzip_body(gzip)
       @body = @inflate.inflate(gzip)
     end
   end
 
-  def parse_response(r)
-    t = :http_status
-    n = nil
-    body = ''
-    lines = r.lines
-    i = 0
-    while (i < lines.length)
-      case t
-      when :http_status
-        rem = /^HTTP\/(\d+\.\d+) (\d+) (.+)$/.match(lines[i])
-        if rem[2] == '100'
-          t = :wait_for_another_http
-        else
-          t = :headers
-          n = CurlResponse.new(rem[1], rem[2], rem[3].chop)
-        end
-      when :wait_for_another_http
-        t = :http_status if rem = /^HTTP\/(\d+\.\d+) (\d+) (.+)$/.match(lines[i+1])
-      when :headers
-        if /^[\r\n]+$/.match(lines[i])
-          t = :body
-        else
-          rem = /^([\w-]+):\s(.*)/.match(lines[i].chop)
-          n[rem[1]] = rem[2]
-        end 
-      when :body
-        body << lines[i]
+  # class for parsing curl responses
+  class CurlResponseParser
+    attr_accessor :response
+    def initialize(response)
+      @state = :read_status
+      @response = nil
+      @body = ''
+      parse(response)
+    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
-      i += 1
     end
-    if n.to_hash.keys && n.to_hash.keys.include?('content-encoding') &&
-      n.to_hash['content-encoding'].include?('gzip')
-        n.unzip_body(body)
-    else
-      n.body = (body)
+
+    def parse_status(line)
+      line.chop =~ %r{^HTTP\/(\d+\.\d+) (\d+) (.+)$}
+      return if Regexp.last_match(2) == 100
+      @state = :headers
+      @response = CurlResponse.new(Regexp.last_match(1),
+                                   Regexp.last_match(2),
+                                   Regexp.last_match(3))
     end
-    n
-  end
 
-  def curl_data(payload)
-    payload.to_s if payload
-  end
+    def parse_headers(line)
+      if /^\s*$/.match?(line)
+        @state = :body
+        return
+      end
+      line.chop =~ /^([\w-]+):\s(.*)/
+      @response[Regexp.last_match(1)] =
+        Regexp.last_match(2)
+    end
 
-  def curl_proxy(option)
-    option ? " -x #{option}" : ''
+    def parse_line(line)
+      case @state
+      when :body
+        @body << line
+      when :read_status
+        parse_status(line)
+      when :headers
+        parse_headers(line)
+      else
+        puts "parser error on #{line}"
+      end
+    end
   end
-  
-  def curl_headers(headers)
-    ret_headers = ' '
-    headers.each{|k,v| ret_headers << "-H '#{k}: #{v}' "}
-    ret_headers
+
+  # class for transmitting curl requests
+  class CurlTransmitter
+    attr_accessor :options, :headers, :line
+    def initialize(uri, method, headers, payload)
+      @payload = payload
+      @method = method
+      @uri = uri
+      @headers, @options = calc_options(headers)
+      @line = curl_command
+    end
+
+    def calc_options(headers, options = {})
+      options[:curl] =  headers.delete('Use-Curl') ||
+                        headers.delete(:use_curl)
+      options[:proxy] = headers.delete('Use-Proxy') ||
+                        headers.delete(:use_proxy)
+      headers.delete('No-Restclient-Headers') ||
+        headers.delete(:no_restclient_headers)
+      [headers, options]
+    end
+
+    def curl_data(payload)
+      payload.&to_s
+    end
+
+    def curl_proxy(option)
+      option ? " -x #{option}" : ''
+    end
+
+    def curl_headers(headers)
+      ret_headers = ' '
+      headers.each { |k, v| ret_headers << "-H '#{k}: #{v}' " }
+      ret_headers
+    end
+
+    def curl_command
+      @line = "curl -isS -X #{@method.upcase}#{curl_proxy(@options[:proxy])}"\
+              "#{curl_headers(@headers)}'#{@uri}' -d '#{curl_data(@payload)}'"
+    end
   end
 
-  def transmit(uri, method, headers, payload, &block)
-    curlyrest_option = headers.delete('Use-Curl') || headers.delete(:use_curl)
-    proxy_option = headers.delete('Use-Proxy') || headers.delete(:use_proxy)
-    headers.delete('No-Restclient-Headers') || headers.delete(:no_restclient_headers)
-    curl_line = "curl -isS -X #{method.upcase}#{curl_proxy(proxy_option)}#{curl_headers(headers)}'#{uri}' -d '#{curl_data(payload)}'"
-    puts curl_line if curlyrest_option == 'debug'
-    r = `#{curl_line}`
-    puts r if curlyrest_option == 'debug'
-    parse_response(r)
+  def transmit(uri, method, headers, payload)
+    ct = CurlTransmitter.new(uri, method, headers, payload)
+    puts ct.line if ct.options[:curl] == 'debug'
+    r = `#{ct.line}`
+    puts r if ct.options[:curl] == 'debug'
+    CurlResponseParser.new(r).response
   end
 end
 
 include Curlyrest
 
+# restclient monkeypatch
 module RestClient
+  # restClient request class
   class Request
-    def execute & block
-      # With 2.0.0+, net/http accepts URI objects in requests and handles wrapping
-      # IPv6 addresses in [] for use in the Host request header.
-      case processed_headers['Use-Curl']
-      when 'debug', 'true'
-        h = processed_headers['No-Restclient-Headers'] == 'true' ? headers : processed_headers
-        r = Curlyrest.transmit(uri, method, h, payload, &block)
-        RestClient::Response.create(r.body, r, self)
+    def execute(& block)
+      # With 2.0.0+, net/http accepts URI objects in requests and handles
+      # wrapping IPv6 addresses in [] for use in the Host request header.
+      if processed_headers['Use-Curl']
+        curl_execute(& block)
       else
-        transmit uri, 
-          net_http_request_class(method).new(uri, processed_headers),
-            payload, & block
+        transmit(uri, net_http_request_class(method)
+                        .new(uri, processed_headers),
+                 payload, & block)
       end
     ensure
-      payload.close if payload
+      payload&.close
+    end
+
+    def curl_execute(& block)
+      h = if processed_headers['No-Restclient-Headers'] == true
+            headers
+          else
+            processed_headers
+          end
+      r = Curlyrest.transmit(uri, method, h, payload, &block)
+      RestClient::Response.create(r.body, r, self)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curlyrest
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Keith Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: gem extending rest-client, allowing use/debug of curl for request
 email:
 - keithrw@comcast.net
@@ -89,6 +89,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md