http_wrapper 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa85c2016386aa01baeab80596dc32c5fe9a8487
-  data.tar.gz: fd6379cb93042cc78a5cfc4efbea1042a7377fbe
+SHA256:
+  metadata.gz: 6b8cafac3f93ee092cd47ba4c265369937d998919ac06172436764ec448bbe9a
+  data.tar.gz: 49bf3caf2c4791f3af3ed9b360f014ff674816687acc18c60cc53194eac85bd3
 SHA512:
-  metadata.gz: 8209c18ab5f5934bfe4eb8792346d9407706345e0a091a23cedc90dde41e4ef761f3c5f59d41168e5e4470d4fbc224d305ddcf4d09e9583f7dea74044088138c
-  data.tar.gz: b4dd32e4c65b49634447e29773332ea37628099e247cf2cb454d3059c7c1ea207be6f449baded1681b8fb678437a5363daf0817a3f2ef4a69f1296a24a5c7c90
+  metadata.gz: 81ad733418da9109bd1a38891325797b278572e5c889d05bbcc20239f6a33d03f72986ac4cd1c0ab7cf23dd5edc7ac3495f79f81721c04f77722b20a48d0c512
+  data.tar.gz: 145bb14e27b4725019b7289c8577b71b4c21eb770a41e9608ad7bfae6eb2b2a62dfe88c1b657047d18f2b6442210501e0be8279930d9b404efd753dc2b2048ee

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.0.0
+
+* dropped support for Ruby 1.9-2.2 and Rubinius
+* rubocop and rubocop-spec gems added for better code quality
+* simplecov gem added to track test coverage
+* code refactoring due to all the changes above
+
 ## v2.1.1
 
 * code refactoring

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
-gemspec
+gemspec

data/README.md

@@ -2,11 +2,10 @@
 
 Simple wrapper around standard Net::HTTP library
 
-[![Gem Version](https://badge.fury.io/rb/http_wrapper.png)](http://badge.fury.io/rb/http_wrapper)
-[![Build Status](https://travis-ci.org/svyatov/http_wrapper.png)](https://travis-ci.org/svyatov/http_wrapper)
-[![Dependency Status](https://gemnasium.com/svyatov/http_wrapper.png)](https://gemnasium.com/svyatov/http_wrapper)
-[![Code Climate](https://codeclimate.com/github/svyatov/http_wrapper.png)](https://codeclimate.com/github/svyatov/http_wrapper)
-[![Coverage Status](https://coveralls.io/repos/svyatov/http_wrapper/badge.png)](https://coveralls.io/r/svyatov/http_wrapper)
+[![Gem Version](https://badge.fury.io/rb/http_wrapper.svg)](https://badge.fury.io/rb/http_wrapper)
+[![Build Status](https://travis-ci.org/svyatov/http_wrapper.svg?branch=master)](https://travis-ci.org/svyatov/http_wrapper)
+[![Maintainability](https://api.codeclimate.com/v1/badges/41f8e8c507907ea20e2b/maintainability)](https://codeclimate.com/github/svyatov/http_wrapper/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/41f8e8c507907ea20e2b/test_coverage)](https://codeclimate.com/github/svyatov/http_wrapper/test_coverage)
 
 ---
 
@@ -15,7 +14,7 @@ Simple wrapper around standard Net::HTTP library
 Add this line to your Gemfile:
 
 ```ruby
-gem 'http_wrapper', '~> 2.1.1'
+gem 'http_wrapper', '~> 3.0'
 ```
 
 And then execute:
@@ -245,10 +244,7 @@ http.get sample_url, headers: { user_agent: 'custom user agent' }
 ```ruby
 uri = URI 'http://example.com'
 
-# Ruby 2.0.0
 request = Net::HTTP::Head.new uri
-# Ruby 1.9.3
-request = Net::HTTP::Head.new uri.request_uri
 
 http.execute request, uri
 ```
@@ -320,4 +316,4 @@ If any unknown options or parameters found, it raises the `UnknownKeyError` exce
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/Rakefile

@@ -1,12 +1,8 @@
-$LOAD_PATH.unshift File.expand_path('lib', File.dirname(__FILE__))
+# frozen_string_literal: true
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new do |task|
-  task.pattern = 'spec/**/*_spec.rb'
-  task.verbose = false
-end
+RSpec::Core::RakeTask.new(:spec)
 
+task default: :spec

data/lib/http_wrapper/constants.rb

@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
 class HTTPWrapper
-  module HEADER
-    CONTENT_TYPE = 'content-type'.freeze
-    USER_AGENT   = 'user-agent'.freeze
-    COOKIE       = 'cookie'.freeze
-    AJAX         = 'x-requested-with'.freeze
-  end
+  USER_AGENT = "HTTPWrapper/#{HTTPWrapper::VERSION}; Ruby/#{RUBY_VERSION}"
+
+  CONTENT_TYPE_HEADER_NAME = 'content-type'
+  USER_AGENT_HEADER_NAME   = 'user-agent'
+  COOKIE_HEADER_NAME       = 'cookie'
+  AJAX_HEADER_NAME         = 'x-requested-with'
 
-  module CONTENT_TYPE
-    DEFAULT   = 'text/html; charset=UTF-8'.freeze
-    JSON      = 'application/json; charset=UTF-8'.freeze
-    POST      = 'application/x-www-form-urlencoded'.freeze
-    MULTIPART = 'multipart/form-data'.freeze
-  end
+  DEFAULT_CONTENT_TYPE   = 'text/html; charset=UTF-8'
+  JSON_CONTENT_TYPE      = 'application/json; charset=UTF-8'
+  POST_CONTENT_TYPE      = 'application/x-www-form-urlencoded'
+  MULTIPART_CONTENT_TYPE = 'multipart/form-data'
 
-  USER_AGENT  = "HTTPWrapper/#{HTTPWrapper::VERSION}; Ruby/#{RUBY_VERSION}".freeze
-  AJAX_HEADER = { HEADER::AJAX => 'XMLHttpRequest'.freeze }.freeze
-  JSON_HEADER = { HEADER::CONTENT_TYPE => CONTENT_TYPE::JSON }.freeze
+  AJAX_HEADER = { AJAX_HEADER_NAME => 'XMLHttpRequest' }.freeze
+  JSON_HEADER = { CONTENT_TYPE_HEADER_NAME => JSON_CONTENT_TYPE }.freeze
   AJAX_JSON_HEADER = AJAX_HEADER.dup.merge!(JSON_HEADER).freeze
-end
+end

data/lib/http_wrapper/errors.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class HTTPWrapper
-  HTTPWrapperError      = Class.new StandardError
-  TooManyRedirectsError = Class.new HTTPWrapperError
-  UnknownKeyError       = Class.new HTTPWrapperError
-end
+  Error = Class.new StandardError
+  TooManyRedirectsError = Class.new Error
+  UnknownKeyError = Class.new Error
+end

data/lib/http_wrapper/http_wrapper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'net/https'
 
 class HTTPWrapper
-  KNOWN_OPTIONS_KEYS = [:timeout, :verify_cert, :logger, :max_redirects, :user_agent].freeze
+  KNOWN_OPTIONS_KEYS = %i[timeout verify_cert logger max_redirects user_agent].freeze
 
   attr_accessor :timeout, :verify_cert, :logger, :max_redirects, :user_agent
 
   def initialize(options = {})
-    Utils.validate_hash_keys options, KNOWN_OPTIONS_KEYS
+    Util.validate_hash_keys options, KNOWN_OPTIONS_KEYS
 
     @timeout       = options.fetch(:timeout) { 10 }
     @verify_cert   = options.fetch(:verify_cert) { true }
@@ -15,7 +17,7 @@ class HTTPWrapper
     @user_agent    = options.fetch(:user_agent) { USER_AGENT }
   end
 
-  [:get, :post, :put, :delete].each do |method_as_symbol|
+  %i[get post put delete].each do |method_as_symbol|
     define_method method_as_symbol do |url, params = {}|
       params[:user_agent] ||= @user_agent
       get_response Request.new(url, method_as_symbol, params)
@@ -23,9 +25,9 @@ class HTTPWrapper
 
     method_as_string = method_as_symbol.to_s
 
-    %w(ajax json ajax_json).each do |request_type|
+    %w[ajax json ajax_json].each do |request_type|
       define_method "#{method_as_string}_#{request_type}" do |url, params = {}|
-        (params[:headers] ||= {}).merge!(headers_specific_for request_type)
+        (params[:headers] ||= {}).merge!(headers_specific_for(request_type))
         public_send method_as_symbol, url, params
       end
     end
@@ -46,11 +48,11 @@ class HTTPWrapper
   private
 
   def get_response(request, redirects_limit = @max_redirects)
-    raise TooManyRedirectsError.new 'Too many redirects!' if redirects_limit == 0
+    raise TooManyRedirectsError, 'Too many redirects!' if redirects_limit == 0
 
     response = execute request.create, request.uri
 
-    if response.kind_of? Net::HTTPRedirection
+    if response.is_a? Net::HTTPRedirection
       request.uri = response['location']
       response = get_response request, redirects_limit - 1
     end
@@ -67,7 +69,7 @@ class HTTPWrapper
     connection.read_timeout = @timeout
     connection.open_timeout = @timeout
 
-    if uri.kind_of? URI::HTTPS
+    if uri.is_a? URI::HTTPS
       connection.use_ssl = true
       connection.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @verify_cert
     end
@@ -75,4 +77,4 @@ class HTTPWrapper
     connection.set_debug_output(@logger)
     connection
   end
-end
+end

data/lib/http_wrapper/request.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'uri/common'
 
 class HTTPWrapper
   class Request
-    KNOWN_PARAMS_KEYS = [:headers, :query, :cookie, :auth, :body, :user_agent, :content_type, :multipart].freeze
+    KNOWN_PARAMS_KEYS = %i[headers query cookie auth body user_agent content_type multipart].freeze
 
-    def initialize(url, method, params = {})
-      Utils.validate_hash_keys params, KNOWN_PARAMS_KEYS
+    def initialize(url, method, params = {}) # rubocop:disable Metrics/AbcSize
+      Util.validate_hash_keys params, KNOWN_PARAMS_KEYS
 
       self.uri = url
 
@@ -30,7 +32,7 @@ class HTTPWrapper
     attr_reader :uri
 
     def uri=(url)
-      url = "http://#{url}" unless url =~ /\Ahttps?:\/\//
+      url = "http://#{url}" unless url =~ %r{\Ahttps?://}
       @uri = URI.parse url
     end
 
@@ -43,16 +45,14 @@ class HTTPWrapper
 
     def normalize_headers(headers)
       normal_headers = {}
-      if headers
-        headers.each do |header, value|
-          normal_headers[normalize_header header] = value
-        end
+      headers&.each do |header, value|
+        normal_headers[normalize_header header] = value
       end
       normal_headers
     end
 
     def normalize_header(header)
-      header = header.to_s.gsub(/_/, '-') if header.is_a? Symbol
+      header = header.to_s.tr('_', '-') if header.is_a? Symbol
       header.downcase
     end
 
@@ -62,28 +62,27 @@ class HTTPWrapper
 
     def default_content_type_for(method)
       case method
-        when :post, :put then CONTENT_TYPE::POST
-        else CONTENT_TYPE::DEFAULT
+      when :post, :put then POST_CONTENT_TYPE
+      else DEFAULT_CONTENT_TYPE
       end
     end
 
     def initialize_headers
-      @headers[HEADER::USER_AGENT]   ||= @user_agent
-      @headers[HEADER::CONTENT_TYPE] ||= @content_type
-      @headers[HEADER::COOKIE]       ||= @cookie if @cookie
+      @headers[USER_AGENT_HEADER_NAME]   ||= @user_agent
+      @headers[CONTENT_TYPE_HEADER_NAME] ||= @content_type
+      @headers[COOKIE_HEADER_NAME]       ||= @cookie if @cookie
     end
 
     def merge_uri_query
-      return unless @query.size > 0
-      original_query = @uri.query ? Utils.query_to_hash(@uri.query) : {}
+      return if @query.empty?
+
+      original_query = @uri.query ? Util.query_to_hash(@uri.query) : {}
       merged_query = original_query.merge @query
-      @uri.query = Utils.hash_to_query merged_query
+      @uri.query = Util.hash_to_query merged_query
     end
 
     def create_method_specific_request
-      # Ruby v1.9.3 doesn't understand full URI object, it needs just path :(
-      uri = RUBY_VERSION =~ /\A2/ ? @uri : @uri.request_uri
-      @request = @method.new uri, @headers
+      @request = @method.new @uri, @headers
       set_body
       set_basic_auth
       @request
@@ -91,6 +90,7 @@ class HTTPWrapper
 
     def set_body
       return unless @request.request_body_permitted?
+
       if @multipart_data
         set_body_from_multipart_data
       else
@@ -100,22 +100,24 @@ class HTTPWrapper
 
     def set_body_from_multipart_data
       convert_body_data_to_multipart_data if @body_data
-      @request.set_form @multipart_data, CONTENT_TYPE::MULTIPART
+      @request.set_form @multipart_data, MULTIPART_CONTENT_TYPE
     end
 
     def convert_body_data_to_multipart_data
-      @body_data = Utils.query_to_hash(@body_data) unless @body_data.kind_of? Hash
-      @body_data.each{|key, value| @multipart_data << [key.to_s, value.to_s]}
+      @body_data = Util.query_to_hash(@body_data) unless @body_data.is_a? Hash
+      @body_data.each { |key, value| @multipart_data << [key.to_s, value.to_s] }
     end
 
     def set_body_from_body_data
       return unless @body_data
-      @request.body = @body_data.is_a?(Hash) ? Utils.hash_to_query(@body_data) : @body_data
+
+      @request.body = @body_data.is_a?(Hash) ? Util.hash_to_query(@body_data) : @body_data
     end
 
     def set_basic_auth
-      return unless @login
+      return unless @login && @password
+
       @request.basic_auth @login, @password
     end
   end
-end
+end

data/lib/http_wrapper/{utils.rb → util.rb}

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class HTTPWrapper
-  module Utils
+  module Util
     def self.validate_hash_keys(hash_to_check, known_keys_array)
       unknown_keys = hash_to_check.keys - known_keys_array
-      if unknown_keys.length > 0
-        raise UnknownKeyError.new "Unknown keys: #{unknown_keys.join(', ')}"
-      end
+      return if unknown_keys.empty?
+
+      raise UnknownKeyError, "Unknown keys: #{unknown_keys.join(', ')}"
     end
 
     def self.query_to_hash(query)
@@ -15,4 +17,4 @@ class HTTPWrapper
       URI.encode_www_form hash
     end
   end
-end
+end

data/lib/http_wrapper/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HTTPWrapper
-  VERSION = '2.1.1'.freeze
-end
+  VERSION = '3.0.0'
+end

data/lib/http_wrapper.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'http_wrapper/version'
 require 'http_wrapper/constants'
 require 'http_wrapper/errors'
-require 'http_wrapper/utils'
+require 'http_wrapper/util'
 require 'http_wrapper/request'
-require 'http_wrapper/http_wrapper'
+require 'http_wrapper/http_wrapper'

data/spec/http_wrapper_spec.rb

@@ -1,271 +1,269 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 require 'http_wrapper'
 
-describe HTTPWrapper do
+RSpec.describe HTTPWrapper do
+  subject(:http) { described_class.new }
+
   let(:basic_auth_login) { 'balogin' }
   let(:basic_auth_password) { 'bapassword' }
 
-  it 'should define all dynamic methods' do
-    [:get,           :post,           :put,           :delete,
-     :get_json,      :post_json,      :put_json,      :delete_json,
-     :get_ajax,      :post_ajax,      :put_ajax,      :delete_ajax,
-     :get_ajax_json, :post_ajax_json, :put_ajax_json, :delete_ajax_json,
-     :get_json_ajax, :post_json_ajax, :put_json_ajax, :delete_json_ajax].each do |method|
-      subject.should be_respond_to method
+  it 'defines all dynamic methods' do
+    %i[get post put delete
+       get_json post_json put_json delete_json
+       get_ajax post_ajax put_ajax delete_ajax
+       get_ajax_json post_ajax_json put_ajax_json delete_ajax_json
+       get_json_ajax post_json_ajax put_json_ajax delete_json_ajax].each do |method|
+      expect(http).to respond_to method
     end
   end
 
-  context 'HTTP' do
+  describe 'HTTP' do
     let(:sample_url) { 'http://example.com' }
-    let(:sample_url_with_basic_auth) { "http://#{basic_auth_login}:#{basic_auth_password}@example.com" }
 
-    context 'Options' do
-      it 'should raise UnknownParameterError if initial options key is unknown' do
+    describe 'Options' do
+      it 'raises UnknownParameterError if initial options key is unknown' do
         expect do
-          HTTPWrapper.new unknown_option: 'test', maybe_this_known: '?'
+          described_class.new unknown_option: 'test', maybe_this_known: '?'
         end.to raise_error HTTPWrapper::UnknownKeyError, 'Unknown keys: unknown_option, maybe_this_known'
       end
 
-      it 'should raise UnknownParameterError if params key is unknown' do
+      it 'raises UnknownParameterError if params key is unknown' do
         expect do
-          subject.get sample_url, unknown_param_key: 'test', another_param_key: 'wow'
+          http.get sample_url, unknown_param_key: 'test', another_param_key: 'wow'
         end.to raise_error HTTPWrapper::UnknownKeyError, 'Unknown keys: unknown_param_key, another_param_key'
       end
 
-      it 'should follow redirects no more then 10 times by default' do
+      it 'follows redirects no more then 10 times by default' do
         stub_redirects sample_url, 9
-        response = subject.get sample_url
-        response.code.should eql '200'
+        response = http.get sample_url
+        expect(response.code).to eq '200'
 
         stub_redirects sample_url, 10
-        expect { subject.get sample_url }.to raise_error HTTPWrapper::TooManyRedirectsError, 'Too many redirects!'
+        expect { http.get sample_url }.to raise_error HTTPWrapper::TooManyRedirectsError, 'Too many redirects!'
       end
 
-      it 'should follow redirects no more times then specified' do
-        subject.max_redirects = 5
+      it 'follows redirects no more times then specified' do
+        http.max_redirects = 5
 
         stub_redirects sample_url, 4
-        response = subject.get sample_url
-        response.code.should eql '200'
+        response = http.get sample_url
+        expect(response.code).to eq '200'
 
         stub_redirects sample_url, 5
-        expect { subject.get sample_url }.to raise_error HTTPWrapper::TooManyRedirectsError, 'Too many redirects!'
+        expect { http.get sample_url }.to raise_error HTTPWrapper::TooManyRedirectsError, 'Too many redirects!'
       end
 
-      it 'should use logger' do
+      it 'uses logger' do
         require 'logger'
         logger = Logger.new StringIO.new
-        logger.should_receive(:<<).at_least(:once)
-        subject.logger = logger
+        allow(logger).to receive(:<<)
+        http.logger = logger
 
         WebMock.allow_net_connect!
         begin
-          subject.get 'localhost'
-        rescue
+          http.get 'localhost'
+        rescue StandardError # rubocop:disable Lint/HandleExceptions
           # NOOP, rescue from "connection refused" and such
         end
         WebMock.disable_net_connect!
+
+        expect(logger).to have_received(:<<).at_least(:once)
       end
     end
 
-    context 'GET' do
-      it 'should add http uri scheme if missing' do
+    describe 'GET' do
+      it 'adds http uri scheme if missing' do
         stub_get sample_url
-        subject.get sample_url.gsub(/\Ahttp:\/\//, '')
+        http.get sample_url.gsub(%r{\Ahttp://}, '')
       end
 
-      it 'should hit provided url with default content type' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => HTTPWrapper::CONTENT_TYPE::DEFAULT} }
+      it 'hits provided url with default content type' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => HTTPWrapper::DEFAULT_CONTENT_TYPE } }
         stub_get sample_url, params
-        subject.get sample_url
+        http.get sample_url
       end
 
-      it 'should set content type if provided' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => 'Custom Content Type'} }
+      it 'sets content type if provided' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => 'Custom Content Type' } }
         stub_get sample_url, params
-        subject.get sample_url, params
-        subject.get sample_url, content_type: 'Custom Content Type'
-        subject.get sample_url, params.merge({content_type: 'Should Be Overwritten'})
+        http.get sample_url, params
+        http.get sample_url, content_type: 'Custom Content Type'
+        http.get sample_url, params.merge(content_type: 'Should Be Overwritten')
       end
 
-      it 'should set proper header for JSON requests' do
+      it 'sets proper header for JSON requests' do
         params = { headers: HTTPWrapper::JSON_HEADER }
         stub_get sample_url, params
-        subject.get_json sample_url
+        http.get_json sample_url
       end
 
-      it 'should set proper header for AJAX requests' do
+      it 'sets proper header for AJAX requests' do
         params = {
           headers: {
-            HTTPWrapper::HEADER::CONTENT_TYPE => HTTPWrapper::CONTENT_TYPE::DEFAULT
+            HTTPWrapper::CONTENT_TYPE_HEADER_NAME => HTTPWrapper::DEFAULT_CONTENT_TYPE
           }.merge(HTTPWrapper::AJAX_HEADER)
         }
         stub_get sample_url, params
-        subject.get_ajax sample_url
+        http.get_ajax sample_url
       end
 
-      it 'should set proper headers for AJAX-JSON requests' do
+      it 'sets proper headers for AJAX-JSON requests' do
         params = { headers: HTTPWrapper::AJAX_JSON_HEADER }
         stub_get sample_url, params
-        subject.get_ajax_json sample_url
+        http.get_ajax_json sample_url
       end
 
-      it 'should correctly escape query parameters' do
-        stub_get sample_url + '/?param1=&param2=A%26B&param3=C%20%26%20D'
-        subject.get sample_url, query: {param1: '', param2: 'A&B', param3: 'C & D'}
+      it 'correctlies escape query parameters' do
+        stub_get "#{sample_url}/?param1=&param2=A%26B&param3=C%20%26%20D"
+        http.get sample_url, query: { param1: '', param2: 'A&B', param3: 'C & D' }
       end
 
-      it 'should set default user agent' do
-        params = { headers: {HTTPWrapper::HEADER::USER_AGENT => HTTPWrapper::USER_AGENT} }
+      it 'sets default user agent' do
+        params = { headers: { HTTPWrapper::USER_AGENT_HEADER_NAME => HTTPWrapper::USER_AGENT } }
         stub_get sample_url, params
-        subject.get sample_url
+        http.get sample_url
       end
 
-      it 'should change user agent if provided' do
+      it 'changes user agent if provided' do
         custom_user_agent = 'Mozilla v1.2.3'
-        params = { headers: {HTTPWrapper::HEADER::USER_AGENT => custom_user_agent} }
+        params = { headers: { HTTPWrapper::USER_AGENT_HEADER_NAME => custom_user_agent } }
         stub_get sample_url, params
-        subject.get sample_url, params
+        http.get sample_url, params
 
-        subject.get sample_url, user_agent: custom_user_agent
+        http.get sample_url, user_agent: custom_user_agent
 
-        subject.user_agent = custom_user_agent
-        subject.get sample_url
+        http.user_agent = custom_user_agent
+        http.get sample_url
 
         expect do
-          subject.get sample_url, user_agent: 'abracadabra'
+          http.get sample_url, user_agent: 'abracadabra'
         end.to raise_error WebMock::NetConnectNotAllowedError
 
         expect do
-          subject.user_agent = 'another test'
-          subject.get sample_url
+          http.user_agent = 'another test'
+          http.get sample_url
         end.to raise_error WebMock::NetConnectNotAllowedError
       end
 
-      it 'should precedence header user agent before params' do
-        params = { headers: {HTTPWrapper::HEADER::USER_AGENT => 'TestUserAgent'} }
+      it 'precedences header user agent before params' do
+        params = { headers: { HTTPWrapper::USER_AGENT_HEADER_NAME => 'TestUserAgent' } }
         stub_get sample_url, params
 
-        subject.user_agent = 'Should Be Overwritten'
-        subject.get sample_url, params
+        http.user_agent = 'Should Be Overwritten'
+        http.get sample_url, params
       end
 
-      it 'should send cookie if provided' do
+      it 'sends cookie if provided' do
         cookie_value = 'some cookie'
-        params = { headers: {'Cookie' => cookie_value} }
+        params = { headers: { 'Cookie' => cookie_value } }
         stub_get sample_url, params
-        subject.get sample_url, cookie: cookie_value
-        subject.get sample_url, params
+        http.get sample_url, cookie: cookie_value
+        http.get sample_url, params
       end
 
-      it 'should use headers cookie if both (headers and parameters) cookies provided' do
-        params = { headers: {'Cookie' => 'Custom cookie'} }
+      it 'uses headers cookie if both (headers and parameters) cookies provided' do
+        params = { headers: { 'Cookie' => 'Custom cookie' } }
         stub_get sample_url, params
-        subject.get sample_url, params.merge({cookie: 'should not use this one'})
+        http.get sample_url, params.merge(cookie: 'should not use this one')
       end
 
-      it 'should hit provided url with basic auth' do
-        stub_get sample_url_with_basic_auth
-        subject.get sample_url, auth: {login: basic_auth_login, password: basic_auth_password}
+      it 'hits provided url with basic auth' do
+        stub_request(:get, sample_url).with(basic_auth: [basic_auth_login, basic_auth_password])
+        http.get sample_url, auth: { login: basic_auth_login, password: basic_auth_password }
       end
 
-      it 'should merge query parameters and params should take precedence' do
-        stub_get sample_url + '/?text=edf&time=16:44&user=test'
-        subject.get(sample_url + '/?user=test&text=abc', query: {time: '16:44', text: 'edf'})
+      it 'merges query parameters and params should take precedence' do
+        stub_get "#{sample_url}/?text=edf&time=16:44&user=test"
+        http.get "#{sample_url}/?user=test&text=abc", query: { time: '16:44', text: 'edf' }
       end
 
-      it 'should equally treat header as string and header as symbol' do
+      it 'equallies treat header as string and header as symbol' do
         custom_content_type = 'Some Content Type'
-        stub_get sample_url, { headers: {'Content-Type' => custom_content_type} }
-        subject.get sample_url, { headers: {content_type: custom_content_type} }
+        stub_get sample_url, headers: { 'Content-Type' => custom_content_type }
+        http.get sample_url, headers: { content_type: custom_content_type }
       end
     end
 
-    context 'POST' do
-      it 'should set content type if provided' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => 'Custom Content Type'} }
+    describe 'POST' do
+      it 'sets content type if provided' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => 'Custom Content Type' } }
         stub_post sample_url, params
-        subject.post sample_url, params
+        http.post sample_url, params
       end
 
-      it 'should return cookies after post' do
+      it 'returns cookies after post' do
         cookie_value = 'some cookie'
-        params = { body: {username: 'test', password: 'test'} }
-        stub_post(sample_url, params).to_return({headers: {'Set-Cookie' => cookie_value}})
-        cookie = subject.post_and_get_cookie sample_url, params
-        cookie.should eql cookie_value
+        params = { body: { username: 'test', password: 'test' } }
+        stub_post(sample_url, params).to_return(headers: { 'Set-Cookie' => cookie_value })
+        cookie = http.post_and_get_cookie sample_url, params
+        expect(cookie).to eq cookie_value
       end
 
-      it 'should hit provided url with default content type' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => HTTPWrapper::CONTENT_TYPE::POST } }
+      it 'hits provided url with default content type' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => HTTPWrapper::POST_CONTENT_TYPE } }
         stub_post sample_url, params
-        subject.post sample_url
+        http.post sample_url
       end
 
-      it 'should set all possible parameters correctly' do
-        stub_request(:post, 'http://user:passw@example.com/?a=b&c=d').
-            with(body: {
-            e: 'f',
-            g: 'k'
-        },
-                 headers: {
-                     'Content-Type' => 'Custom content type',
-                     'User-Agent' => 'Custom user agent',
-                     'Cookie' => 'cookie',
-                     'X-Requested-With' => 'XMLHttpRequest'
-                 })
-
-        subject.post sample_url, content_type: 'Custom content type',
-                     user_agent: 'Custom user agent',
-                     headers: {x_requested_with: 'XMLHttpRequest'},
-                     query: {a: 'b', c: 'd'},
-                     body: {e: 'f', g: 'k'},
-                     auth: {login: 'user', password: 'passw'},
-                     cookie: 'cookie'
+      it 'sets all possible parameters correctly' do
+        stub_request(:post, "#{sample_url}/?a=b&c=d")
+          .with(
+            body: 'e=f&g=k',
+            headers: {
+              'Content-Type' => 'Custom content type',
+              'User-Agent' => 'Custom user agent',
+              'Cookie' => 'cookie',
+              'X-Requested-With' => 'XMLHttpRequest'
+            },
+            basic_auth: %w[user passw]
+          )
+
+        http.post sample_url,
+                  content_type: 'Custom content type',
+                  user_agent: 'Custom user agent',
+                  headers: { x_requested_with: 'XMLHttpRequest' },
+                  query: { a: 'b', c: 'd' },
+                  body: { e: 'f', g: 'k' },
+                  auth: { login: 'user', password: 'passw' },
+                  cookie: 'cookie'
       end
     end
 
-    context 'PUT' do
-      it 'should hit provided url with default content type' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => HTTPWrapper::CONTENT_TYPE::POST } }
+    describe 'PUT' do
+      it 'hits provided url with default content type' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => HTTPWrapper::POST_CONTENT_TYPE } }
         stub_put sample_url, params
-        subject.put sample_url
+        http.put sample_url
       end
     end
 
-    context 'DELETE' do
-      it 'should hit provided url with default content type' do
-        params = { headers: {HTTPWrapper::HEADER::CONTENT_TYPE => HTTPWrapper::CONTENT_TYPE::DEFAULT } }
+    describe 'DELETE' do
+      it 'hits provided url with default content type' do
+        params = { headers: { HTTPWrapper::CONTENT_TYPE_HEADER_NAME => HTTPWrapper::DEFAULT_CONTENT_TYPE } }
         stub_delete sample_url, params
-        subject.delete sample_url
+        http.delete sample_url
       end
     end
 
-    context 'Custom request instance' do
-      it 'should perform request for custom Net::HTTP request instance' do
+    describe 'Custom request instance' do
+      it 'performs request for custom Net::HTTP request instance' do
         stub_request :head, sample_url
         uri = URI sample_url
-
-        if RUBY_VERSION =~ /\A2/
-          request = Net::HTTP::Head.new uri
-          subject.execute request, request.uri
-        else
-          # Ruby v1.9.3 doesn't understand full URI object, it needs just path :(
-          request = Net::HTTP::Head.new uri.request_uri
-          subject.execute request, uri
-        end
+        request = Net::HTTP::Head.new uri
+        http.execute request, request.uri
       end
     end
   end
 
-  context 'HTTPS' do
+  describe 'HTTPS' do
     let(:sample_url) { 'https://example.com' }
 
-    it 'should hit provided url with HTTPS protocol' do
+    it 'hits provided url with HTTPS protocol' do
       stub_get sample_url
-      subject.get sample_url
+      http.get sample_url
     end
   end
 end
-

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
-require 'rspec'
+# frozen_string_literal: true
+
+require 'bundler/setup'
 require 'webmock/rspec'
 
 if ENV['TRAVIS'] == 'true'
-  require 'coveralls'
-  Coveralls.wear!
+  require 'simplecov'
+  SimpleCov.start
 end
 
-$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
-
 module HTTPWrapperSpecHelpers
-  [:get, :post, :put, :delete].each do |type|
-    define_method("stub_#{type.to_s}") do |url, params = nil|
+  %i[get post put delete].each do |type|
+    define_method("stub_#{type}") do |url, params = nil|
       if params
         stub_request(type, url).with(params)
       else
@@ -20,7 +20,7 @@ module HTTPWrapperSpecHelpers
   end
 
   def stub_redirects(url, amount_of_redirects)
-    stub_get(url).to_return(status: 301, headers: {'Location' => url})
+    stub_get(url).to_return(status: 301, headers: { 'Location' => url })
                  .times(amount_of_redirects)
                  .then
                  .to_return(status: 200)
@@ -29,4 +29,11 @@ end
 
 RSpec.configure do |config|
   config.include HTTPWrapperSpecHelpers
-end
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_wrapper
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Leonid Svyatov
@@ -9,64 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2019-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.63.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.63.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.32'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.32'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: '3.5'
 description: Simple wrapper around standard Net::HTTP library with multipart/form-data
   file upload ability
 email: leonid@svyatov.ru
@@ -74,18 +116,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
-- CHANGELOG.md
 - Rakefile
+- lib/http_wrapper.rb
 - lib/http_wrapper/constants.rb
 - lib/http_wrapper/errors.rb
 - lib/http_wrapper/http_wrapper.rb
 - lib/http_wrapper/request.rb
-- lib/http_wrapper/utils.rb
+- lib/http_wrapper/util.rb
 - lib/http_wrapper/version.rb
-- lib/http_wrapper.rb
 - spec/http_wrapper_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/svyatov/http_wrapper
@@ -98,20 +140,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Simple wrapper around standard Net::HTTP library
 test_files:
-- spec/http_wrapper_spec.rb
 - spec/spec_helper.rb
+- spec/http_wrapper_spec.rb