aitch 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 12767d163caa4e9cc79b97ff3f8e2cea1c48a494
-  data.tar.gz: 38ef91d2cb1d478d890ee7215317e8b6205b2c47
+SHA256:
+  metadata.gz: 79fcbcbeb7a0487eb6071a17cdfe2a4ffceed98d1c1358a7e5a6613d916a0256
+  data.tar.gz: a302171234f54b7b6607a5c8a8eda1c8b32c3b35658e65323ccd5a5cd6403ed3
 SHA512:
-  metadata.gz: 5f61de59c13b8716f6deb85fdeb9b9aaa281afc98a9a27dac34c3dc8dd71f5a8390ac7d9c43e11ded32433b25e1f1a50e5ddef36d6588cb088c7ccd2f1233cf7
-  data.tar.gz: dfb08e263ebca21387c417d52bcaabb2316bc15dfc29b64fd94401e8c47bee8496e811b7384e01c1812283b1350f71af24bc0398b946aee01983c30e173343e5
+  metadata.gz: f144ceb163b3a9cd1a91649b67bc5771fb5f73dcd021846147aa7b5583eeb4a13aa2d694cd7f468ca292b14e3226f09be8b0c9dd17292bfc74bc3792eabc2707
+  data.tar.gz: 15974c7b5905d82798affa69f3494d6ca43b32e4f7ee4b175b350994d9627a0df04af3aa626cec9424ea31ae23da626ae212f446b79c571acb6cf39afc317d81

data/.rubocop.yml

@@ -0,0 +1,26 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+
+Layout/LineLength:
+  Exclude:
+    - test/**/*.rb
+
+Naming/AccessorMethodName:
+  Exclude:
+    - lib/aitch/request.rb
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false

data/.travis.yml

@@ -1,3 +1,4 @@
+---
 language: ruby
 script: "bundle exec rake"
 before_install: gem install bundler
@@ -5,11 +6,7 @@ cache: bundler
 sudo: false
 
 rvm:
-  - "2.3.0"
-  - "2.2"
-  - "2.1"
-  - "2.0"
-  - jruby-head
+  - "2.7"
 
 gemfile:
   - Gemfile

data/Gemfile

@@ -1,4 +1,4 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 gemspec
-
-gem "pry-meta", platforms: [:ruby_20, :ruby_21, :ruby_22, :ruby_23]

data/README.md

@@ -83,6 +83,17 @@ response = Aitch.get do
 end
 ```
 
+Finally, you can use keyword arguments:
+
+```ruby
+Aitch.get(
+  url: "http://example.org",
+  params: {a: 1, b: 2},
+  headers: {Authorization: "Token token=abc"},
+  options: {follow_redirect: false}
+)
+```
+
 ### Response
 
 The response object:

data/Rakefile

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rubocop/rake_task"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -8,4 +10,6 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
 end
 
-task default: :test
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/aitch.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/aitch/version"
 
 Gem::Specification.new do |spec|
@@ -10,19 +12,21 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://rubygems.org/gems/aitch"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.0"
-
-  spec.add_dependency "nokogiri", ">= 1.6.0"
+  spec.add_dependency "nokogiri"
 
-  spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-utils"
   spec.add_development_dependency "mocha"
+  spec.add_development_dependency "pry-meta"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

data/lib/aitch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "net/https"
 require "forwardable"
 require "json"
@@ -38,21 +39,19 @@ module Aitch
     extend Forwardable
 
     def_delegators :namespace,
-      :configuration, :config,
-      :get, :get!,
-      :post, :post!,
-      :put, :put!,
-      :patch, :patch!,
-      :options, :options!,
-      :trace, :trace!,
-      :head, :head!,
-      :delete, :delete!,
-      :execute, :execute!,
-      :configure
+                   :configuration, :config,
+                   :get, :get!,
+                   :post, :post!,
+                   :put, :put!,
+                   :patch, :patch!,
+                   :options, :options!,
+                   :trace, :trace!,
+                   :head, :head!,
+                   :delete, :delete!,
+                   :execute, :execute!,
+                   :configure
   end
 
-  private
-
   def self.namespace
     @namespace ||= Namespace.new
   end

data/lib/aitch/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Configuration
     # Set proxy.

data/lib/aitch/dsl.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Aitch
   class DSL
     %w[url options headers data].each do |name|
-      class_eval <<-RUBY
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
         attr_writer :#{name}
 
         def #{name}(*args)
@@ -12,8 +13,8 @@ module Aitch
       RUBY
     end
 
-    alias_method :params, :data
-    alias_method :body, :data
+    alias params data
+    alias body data
 
     def to_h
       {

data/lib/aitch/engines/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aitch
   module Engines
     module JSON

data/lib/aitch/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   InvalidURIError        = Class.new(StandardError)
   InvalidHTTPMethodError = Class.new(StandardError)

data/lib/aitch/ext/to_query.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "cgi"
 
 class Object
@@ -39,20 +40,21 @@ class Array
   # Calls <tt>to_param</tt> on all its elements and joins the result with
   # slashes. This is used by <tt>url_for</tt> in Action Pack.
   def to_param
-    collect { |e| e.to_param }.join '/'
+    collect(&:to_param).join "/"
   end
 
   # Converts an array into a string suitable for use as a URL query string,
   # using the given +key+ as the param name.
   #
-  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
+  #   ["Rails", "coding"].to_query("hobbies")
+  #   # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
   def to_query(key)
     prefix = "#{key}[]"
 
     if empty?
       nil.to_query(prefix)
     else
-      collect { |value| value.to_query(prefix) }.join '&'
+      collect {|value| value.to_query(prefix) }.join "&"
     end
   end
 end
@@ -78,8 +80,8 @@ class Hash
       unless (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
         value.to_query(namespace ? "#{namespace}[#{key}]" : key)
       end
-    end.compact.sort! * '&'
+    end.compact.sort! * "&"
   end
 
-  alias_method :to_param, :to_query
+  alias to_param to_query
 end

data/lib/aitch/location.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Location
     attr_reader :redirect_stack, :current_url
@@ -9,7 +10,7 @@ module Aitch
     end
 
     def location
-      return current_url unless current_url.match(%r[\A/])
+      return current_url unless current_url.match(%r{\A/})
 
       uri = find_uri_with_host
       url = ["#{uri.scheme}://#{uri.hostname}"]
@@ -20,8 +21,8 @@ module Aitch
 
     def find_uri_with_host
       redirect_stack.reverse
-        .map {|url| ::URI.parse(url) }
-        .find {|uri| uri.scheme }
+                    .map {|url| ::URI.parse(url) }
+                    .find(&:scheme)
     end
   end
 end

data/lib/aitch/namespace.rb

@@ -1,16 +1,30 @@
 # frozen_string_literal: true
+
 module Aitch
   class Namespace
-    def configure(&block)
+    def configure
       yield config
     end
 
     def config
       @config ||= Configuration.new
     end
-    alias_method :configuration, :config
+    alias configuration config
+
+    def execute(
+      request_method: nil,
+      url: nil,
+      params: nil,
+      data: nil,
+      body: nil,
+      headers: nil,
+      options: nil,
+      &block
+    )
+      data = data || params || body || {}
+      headers ||= {}
+      options ||= {}
 
-    def execute(request_method = nil, url = nil, data = {}, headers = {}, options = {}, &block)
       if block_given?
         dsl = DSL.new
         dsl.instance_eval(&block)
@@ -33,8 +47,11 @@ module Aitch
     end
 
     def execute!(*args, &block)
-      response = execute(*args, &block)
+      options = extract_args!(args)
+      response = execute(**options, &block)
+
       raise response.error if response.error?
+
       response
     end
 
@@ -47,14 +64,23 @@ module Aitch
       options
       trace
       head
-    ].each do |method_name|
-      define_method(method_name) do |url = nil, data = {}, headers = {}, options = {}, &block|
-        execute(method_name, url, data, headers, options, &block)
+    ].each do |request_method|
+      define_method(request_method) do |*args, &block|
+        options = extract_args!(args)
+        execute(**options.merge(request_method: request_method), &block)
       end
 
-      define_method("#{method_name}!") do |url = nil, data = {}, headers = {}, options = {}, &block|
-        execute!(method_name, url, data, headers, options, &block)
+      define_method("#{request_method}!") do |*args, &block|
+        options = extract_args!(args)
+
+        execute!(**options.merge(request_method: request_method), &block)
       end
     end
+
+    private def extract_args!(args)
+      return args.first if args.size == 1 && args.first.is_a?(Hash)
+
+      %i[url data headers options].zip(args).to_h
+    end
   end
 end

data/lib/aitch/redirect.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Redirect
     attr_reader :tries

data/lib/aitch/request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Request
     attr_accessor :request_method
@@ -8,6 +9,9 @@ module Aitch
     attr_accessor :options
     attr_accessor :redirects
 
+    alias params= data=
+    alias body= data=
+
     def initialize(options)
       self.headers = {}
       self.options = {}
@@ -35,7 +39,8 @@ module Aitch
     end
 
     def content_type
-      headers["Content-Type"] || options.fetch(:default_headers, {})["Content-Type"]
+      headers["Content-Type"] ||
+        options.fetch(:default_headers, {})["Content-Type"]
     end
 
     def request
@@ -63,23 +68,26 @@ module Aitch
     def http_method_class
       Net::HTTP.const_get(request_method.to_s.capitalize)
     rescue NameError
-      raise InvalidHTTPMethodError, "unexpected HTTP verb: #{request_method.inspect}"
+      raise InvalidHTTPMethodError,
+            "unexpected HTTP verb: #{request_method.inspect}"
     end
 
-    private
-    def set_body(request)
+    private def set_body(request)
       body_data = data
       body_data = data.to_h if data.respond_to?(:to_h)
-      body_data = ResponseParser::JSONParser.engine.dump(body_data) if content_type.to_s =~ /\bjson\b/
 
-      if body_data.kind_of?(Hash)
-        request.body = Utils.build_query(body_data)
-      else
-        request.body = body_data.to_s
+      if content_type.to_s =~ /\bjson\b/
+        body_data = ResponseParser::JSONParser.engine.dump(body_data)
       end
+
+      request.body = if body_data.is_a?(Hash)
+                       Utils.build_query(body_data)
+                     else
+                       body_data.to_s
+                     end
     end
 
-    def set_headers(request)
+    private def set_headers(request)
       all_headers = options.fetch(:default_headers, {}).merge(headers)
 
       all_headers.each do |name, value|
@@ -88,30 +96,31 @@ module Aitch
       end
     end
 
-    def set_credentials(request)
+    private def set_credentials(request)
       return unless options[:user] || options[:password]
+
       request.basic_auth(options[:user], options[:password])
     end
 
-    def set_https(client)
+    private def set_https(client)
       client.use_ssl = uri.scheme == "https"
       client.verify_mode = OpenSSL::SSL::VERIFY_PEER
     end
 
-    def set_timeout(client)
+    private def set_timeout(client)
       client.read_timeout = options[:timeout]
     end
 
-    def set_logger(client)
+    private def set_logger(client)
       logger = options[:logger]
       client.set_debug_output(logger) if logger
     end
 
-    def set_user_agent(request)
+    private def set_user_agent(request)
       request["User-Agent"] = options[:user_agent]
     end
 
-    def set_gzip(request)
+    private def set_gzip(request)
       request["Accept-Encoding"] = "gzip,deflate"
     end
 
@@ -119,7 +128,7 @@ module Aitch
       defined?(Net::ReadTimeout) ? Net::ReadTimeout : Timeout::Error
     end
 
-    def follow_redirect(response, redirected_from = [])
+    private def follow_redirect(response)
       return response unless response.redirect?
 
       redirect = Redirect.new(options)
@@ -143,18 +152,18 @@ module Aitch
       response
     end
 
-    def validate_response!(response)
+    private def validate_response!(response)
       return unless options[:expect]
 
       expected = [options[:expect]].flatten
       return if expected.include?(response.code)
 
       descriptions = expected
-                      .map {|code| Response.description_for_code(code) }
-                      .join(", ")
+                     .map {|code| Response.description_for_code(code) }
+                     .join(", ")
 
       raise StatusCodeError,
-        "Expected(#{descriptions}) <=> Actual(#{response.description})"
+            "Expected(#{descriptions}) <=> Actual(#{response.description})"
     end
   end
 end

data/lib/aitch/response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Response
     extend Forwardable
@@ -17,7 +18,9 @@ module Aitch
     end
 
     ERRORS.each do |status_code, exception|
-      method_name = Utils.underscore(exception.name.split("::").last).gsub("_error", "")
+      method_name = Utils
+                    .underscore(exception.name.split("::").last)
+                    .gsub("_error", "")
 
       define_method "#{method_name}?" do
         code == status_code
@@ -35,7 +38,7 @@ module Aitch
     def success?
       code >= 200 && code <= 399
     end
-    alias_method :ok?, :success?
+    alias ok? success?
 
     def redirect?
       code >= 300 && code <= 399
@@ -75,10 +78,11 @@ module Aitch
 
     def method_missing(name, *args, &block)
       return headers[name.to_s] if headers.key?(name.to_s)
+
       super
     end
 
-    def respond_to_missing?(name, include_private = false)
+    def respond_to_missing?(name, _include_private = false)
       headers.key?(name.to_s)
     end
 
@@ -90,6 +94,6 @@ module Aitch
       "#<#{self.class} #{description} (#{content_type})>"
     end
 
-    alias_method :to_s, :inspect
+    alias to_s inspect
   end
 end

data/lib/aitch/response/body.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Response
     class Body

data/lib/aitch/response/description.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Response
     DESCRIPTION = {
@@ -56,7 +57,7 @@ module Aitch
       504 => "Gateway Time Out",
       505 => "Version Not Supported",
       507 => "Insufficient Storage",
-      511 => "Network Authentication Required",
-    }
+      511 => "Network Authentication Required"
+    }.freeze
   end
 end

data/lib/aitch/response/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class Response
     ERRORS = {
@@ -35,6 +36,6 @@ module Aitch
       505 => VersionNotSupportedError,
       507 => InsufficientStorageError,
       511 => NetworkAuthenticationRequiredError
-    }
+    }.freeze
   end
 end

data/lib/aitch/response_parser.rb

@@ -1,24 +1,27 @@
 # frozen_string_literal: true
+
 module Aitch
   module ResponseParser
-    PARSERS = []
+    def self.parsers
+      @parsers ||= []
+    end
 
     def self.prepend(name, parser)
       unregister(name)
-      PARSERS.unshift parser
+      parsers.unshift parser
     end
 
     def self.append(name, parser)
       unregister(name)
-      PARSERS << parser
+      parsers << parser
     end
 
     def self.unregister(name)
-      PARSERS.delete_if {|parser| parser.type == name }
+      parsers.delete_if {|parser| parser.type == name }
     end
 
     def self.find(content_type)
-      PARSERS.find {|parser| parser.match?(content_type) }
+      parsers.find {|parser| parser.match?(content_type) }
     end
 
     append :json, JSONParser

data/lib/aitch/response_parser/default_parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   module ResponseParser
     module DefaultParser
@@ -6,7 +7,7 @@ module Aitch
         :default
       end
 
-      def self.match?(content_type)
+      def self.match?(_content_type)
         true
       end
 

data/lib/aitch/response_parser/html_parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   module ResponseParser
     module HTMLParser

data/lib/aitch/response_parser/json_parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   module ResponseParser
     module JSONParser

data/lib/aitch/response_parser/xml_parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   module ResponseParser
     module XMLParser

data/lib/aitch/uri.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
   class URI
     extend Forwardable
@@ -12,8 +13,8 @@ module Aitch
 
       begin
         @uri = ::URI.parse(url)
-      rescue ::URI::InvalidURIError => error
-        raise InvalidURIError, error
+      rescue ::URI::InvalidURIError => e
+        raise InvalidURIError, e
       end
     end
 
@@ -35,7 +36,9 @@ module Aitch
 
     def query
       query = [@uri.query]
-      query << ::URI.encode_www_form(@data.to_a) if !request_has_body? && @data.respond_to?(:to_a)
+      if !request_has_body? && @data.respond_to?(:to_a)
+        query << ::URI.encode_www_form(@data.to_a)
+      end
       query = query.compact.reject(&:empty?).join("&")
 
       "?#{query}" unless query == ""

data/lib/aitch/utils.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
+
 module Aitch
-  module Utils extend self
+  module Utils
+    extend self
     def underscore(string)
       string = string.gsub(/(?<=.)(URI|[A-Z])/) do |char|
         "_#{char}"

data/lib/aitch/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Aitch
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/test/aitch/aitch_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class AitchTest < Minitest::Test

data/test/aitch/configuration_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ConfigurationTest < Minitest::Test
@@ -16,7 +17,7 @@ class ConfigurationTest < Minitest::Test
   end
 
   test "sets default headers" do
-    assert_equal Hash.new, Aitch::Configuration.new.default_headers
+    assert_equal({}, Aitch::Configuration.new.default_headers)
   end
 
   test "configures aitch" do

data/test/aitch/dsl_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class DslTest < Minitest::Test

data/test/aitch/execute_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ExecuteTest < Minitest::Test

data/test/aitch/namespace_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class NamespaceTest < Minitest::Test
@@ -7,6 +8,6 @@ class NamespaceTest < Minitest::Test
     ns.config.user_agent = "MyLib/1.0.0"
 
     assert_equal "MyLib/1.0.0", ns.config.user_agent
-    assert_match %r[^Aitch], Aitch.config.user_agent
+    assert_match(/^Aitch/, Aitch.config.user_agent)
   end
 end

data/test/aitch/request/client_https_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ClientHttpsTest < Minitest::Test

data/test/aitch/request/follow_redirect_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class FollowRedirectTest < Minitest::Test
@@ -25,9 +26,9 @@ class FollowRedirectTest < Minitest::Test
     register_uri(:get, "http://example.org/", location: "http://example.com/", status: 301)
     register_uri(:get, "http://example.com/", location: "https://example.com/", status: 301)
 
-    assert_raises(Aitch::TooManyRedirectsError) {
+    assert_raises(Aitch::TooManyRedirectsError) do
       Aitch.get("http://example.org/")
-    }
+    end
   end
 
   test "returns only redirection urls" do
@@ -50,7 +51,7 @@ class FollowRedirectTest < Minitest::Test
     register_uri(:post, "http://example.org/hi", status: 307, location: "/hello")
     register_uri(:post, "http://example.org/hello", status: 200)
 
-    response = Aitch.post("http://example.org/", {a: 1}, {Range: "1..100"})
+    response = Aitch.post("http://example.org/", {a: 1}, Range: "1..100")
 
     assert_equal "http://example.org/hello", response.url
     assert_equal 200, response.code

data/test/aitch/request/json_request_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class JsonRequestTest < Minitest::Test

data/test/aitch/request/request_class_test.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class RequestClassTest < Minitest::Test
   test "raises with invalid method" do
-    error = assert_raises(Aitch::InvalidHTTPMethodError) {
+    error = assert_raises(Aitch::InvalidHTTPMethodError) do
       build_request(request_method: "invalid").request
-    }
+    end
 
     assert_equal %[unexpected HTTP verb: "invalid"], error.message
   end

data/test/aitch/request/status_code_validation_test.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class StatusCodeValidationTest < Minitest::Test
   test "raises exception when status code isn't valid" do
     register_uri(:get, "http://example.org/", status: 404)
 
-    error = assert_raises(Aitch::StatusCodeError) {
+    error = assert_raises(Aitch::StatusCodeError) do
       Aitch.get("http://example.org/", {}, {}, expect: [200])
-    }
+    end
 
     assert_equal "Expected(200 OK) <=> Actual(404 Not Found)", error.message
   end

data/test/aitch/request_test.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class RequestTest < Minitest::Test
   test "sets content type" do
-    request = build_request(content_type: 'application/json')
-    assert_equal 'application/json', request.content_type
+    request = build_request(content_type: "application/json")
+    assert_equal "application/json", request.content_type
   end
 
   test "raises with invalid uri" do
@@ -25,9 +26,11 @@ class RequestTest < Minitest::Test
   end
 
   test "sets user agent" do
-    requester = build_request
+    requester = build_request(headers: {"User-Agent" => "CUSTOM"})
     request = requester.request
-    assert_equal requester.options[:user_agent], request["User-Agent"]
+
+    assert_equal "CUSTOM", requester.headers["User-Agent"]
+    assert_equal "CUSTOM", request["User-Agent"]
   end
 
   test "requests gzip encoding" do
@@ -50,6 +53,11 @@ class RequestTest < Minitest::Test
     assert_equal "some body", request.body
   end
 
+  test "sets request body from params key" do
+    request = build_request(request_method: "post", params: "some body").request
+    assert_equal "some body", request.body
+  end
+
   test "sets json body from object" do
     request = build_request(
       request_method: "post",
@@ -66,7 +74,7 @@ class RequestTest < Minitest::Test
     request = build_request(
       request_method: "post",
       data: {a: 1},
-      options: {json_parser: JSON, default_headers: {'Content-Type' => 'application/json'}}
+      options: {json_parser: JSON, default_headers: {"Content-Type" => "application/json"}}
     ).request
 
     expected = {a: 1}.to_json
@@ -121,7 +129,7 @@ class RequestTest < Minitest::Test
   test "performs request when using dsl" do
     register_uri(:post, /.+/)
 
-    response = Aitch.post do
+    Aitch.post do
       url "http://example.org/some/path"
       params a: 1, b: 2
       headers Rendering: "0.1"
@@ -134,4 +142,21 @@ class RequestTest < Minitest::Test
     assert_equal "0.1", last_request.headers["Rendering"]
     assert_equal "user:pass", Base64.decode64(last_request.headers["Authorization"].split(" ").last)
   end
+
+  test "performs request when using kwargs" do
+    register_uri(:post, /.+/)
+
+    Aitch.post(
+      url: "http://example.org/some/path",
+      data: {a: 1, b: 2},
+      headers: {Rendering: "0.1"},
+      options: {user: "user", password: "pass"}
+    )
+
+    assert_equal "/some/path", last_request.uri.request_uri
+    assert_equal :post, last_request.method
+    assert_equal "a=1&b=2", last_request.body
+    assert_equal "0.1", last_request.headers["Rendering"]
+    assert_equal "user:pass", Base64.decode64(last_request.headers["Authorization"].split(" ").last)
+  end
 end

data/test/aitch/response/custom_response_parser_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 require "csv"
 

data/test/aitch/response/errors_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ErrorsTest < Minitest::Test

data/test/aitch/response/html_response_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class HtmlResponseTest < Minitest::Test

data/test/aitch/response/json_response_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class JsonResponseTest < Minitest::Test
@@ -13,6 +14,6 @@ class JsonResponseTest < Minitest::Test
     register_uri(:get, "http://example.org/", body: "[1,2,3]", content_type: "application/json")
     response = Aitch.get("http://example.org/")
 
-    assert_equal [1,2,3], response.data
+    assert_equal [1, 2, 3], response.data
   end
 end

data/test/aitch/response/raw_response_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class RawResponseTest < Minitest::Test

data/test/aitch/response/status_3xx_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class Status3xxTest < Minitest::Test

data/test/aitch/response/status_4xx_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class Status4xxTest < Minitest::Test

data/test/aitch/response/status_5xx_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class Status5xxTest < Minitest::Test

data/test/aitch/response/xml_response_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class XmlResponseTest < Minitest::Test

data/test/aitch/response_parser/html_parser_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class HtmlParserTest < Minitest::Test

data/test/aitch/response_parser/json_parser_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class JsonParserTest < Minitest::Test

data/test/aitch/response_parser/xml_parser_test.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+
 require "test_helper"
 
 class XmlParserTest < Minitest::Test

data/test/aitch/response_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ResponseTest < Minitest::Test
@@ -27,7 +28,6 @@ class ResponseTest < Minitest::Test
   end
 
   test "deflates response" do
-    stdio = StringIO.new
     deflated = Zlib::Deflate.deflate("Hello")
 
     register_uri(:get, "http://example.org/", body: deflated, content_encoding: "deflate")

data/test/aitch/uri_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class UriTest < Minitest::Test
@@ -27,7 +28,7 @@ class UriTest < Minitest::Test
   end
 
   test "ignores data when request has body" do
-    assert_equal nil, Aitch::URI.new("http://example.org/", {c: 3}, true).query
+    assert_nil Aitch::URI.new("http://example.org/", {c: 3}, true).query
   end
 
   test "returns request uri" do

data/test/aitch/utils/symbolize_keys_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class SymbolizeKeysTest < Minitest::Test

data/test/aitch/utils/underscore_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class UnderscoreTest < Minitest::Test

data/test/support/helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Minitest
   class Test
     def add_hash_entry(source, target, from, to)
@@ -6,13 +7,13 @@ module Minitest
     end
 
     def register_uri(http_method, url, options = {})
-      body = options.fetch(:body, '')
+      body = options.fetch(:body, "")
       status = options.fetch(:status, 200)
       headers = options.fetch(:headers, {})
 
-      add_hash_entry(options, headers, :location, 'Location')
-      add_hash_entry(options, headers, :content_type, 'Content-Type')
-      add_hash_entry(options, headers, :content_encoding, 'Content-Encoding')
+      add_hash_entry(options, headers, :location, "Location")
+      add_hash_entry(options, headers, :content_type, "Content-Type")
+      add_hash_entry(options, headers, :content_encoding, "Content-Encoding")
 
       stub_request(http_method, url)
         .to_return(status: status, body: body, headers: headers)

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+
+require "simplecov"
+SimpleCov.start
 
 require "bundler/setup"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aitch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rubocop-fnando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -187,15 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple HTTP client