excon-addressable 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f783d23a751f2dc5ac034dfd44b9a844d6d2b7e
-  data.tar.gz: 72b98745c8e1d4187d3028f15fc95a11d15b0912
+  metadata.gz: ed1374c19ccc1979e364969ea6262bf59deb2846
+  data.tar.gz: f461e8ba6d7648e9a1cc9d723e84c9a7f87a901e
 SHA512:
-  metadata.gz: fcee4d5a86b61d289ae9af021a5a7b980edfad4443e22dbe13c8f16f55adb3a218539590ffd34e605d62860f0ac7fab75a82172d908a79d52025b4988ef2be7e
-  data.tar.gz: 6b348aefebe8e64622ae9ac04d2d6fb8d45e73257be29fb183132fd1bab7d2e1aa6bbcd933b9d4bb9c0c25efd5cb9d6dfe8814edae2378510dd6aa5e47d83860
+  metadata.gz: 537126c71f20fbbca455843a6ed84d912332af53818214c99edb40659c6d4776ed5aa3639eb935017b816a97ae34e6d074a0febd3e09a104aa40002b44be3086
+  data.tar.gz: 97d46512f7f90a1805059f60440d8ad7faa15b908501223ac1f5cc4191bda123e925c67d91879f15ce40edf7f5af9dd48932bb40620e523b55ffeffda5e3a0e6

data/.wercker.yml

@@ -1,4 +1,4 @@
-box: ruby:2.3
+box: ruby:2.5
 build:
   steps:
   - bundle-install

data/Gemfile

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

data/Rakefile

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new do |t|
-  t.options = %w(--display-cop-names --extra-details --display-style-guide)
+  t.options = %w[--display-cop-names --extra-details --display-style-guide]
 end
 
 Rake::TestTask.new(:test) do |t|
@@ -13,4 +14,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task default: %i(test rubocop)
+task default: %i[test rubocop]

data/excon-addressable.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'excon/addressable/version'
@@ -7,22 +7,22 @@ require 'excon/addressable/version'
 Gem::Specification.new do |spec|
   spec.name          = 'excon-addressable'
   spec.version       = Excon::Addressable::VERSION
-  spec.authors       = %w(Jean Mertz)
-  spec.email         = %w(jean@mertz.fm)
+  spec.authors       = %w[Jean Mertz]
+  spec.email         = %w[jean@mertz.fm]
 
   spec.summary       = 'Excon, with Addressable baked in.'
   spec.description   = 'Excon, with Addressable baked in.'
   spec.homepage      = 'https://github.com/JeanMertz/excon-addressable'
   spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.require_paths = %w(lib)
+  spec.require_paths = %w[lib]
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rubocop', '~> 0.40'
-  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'minitest', '~> 5.11'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rubocop', '~> 0.52'
 
-  spec.add_dependency 'excon', '~> 0.49'
-  spec.add_dependency 'addressable', '~> 2.3'
+  spec.add_dependency 'addressable', '~> 2.5'
+  spec.add_dependency 'excon', '~> 0.60'
 end

data/lib/excon/addressable/parser.rb

@@ -7,6 +7,7 @@ module Excon
     # Parses a url using `Addressable`, setting the port to the inferred_port.
     #
     # @see : https://github.com/excon/excon/issues/384#issuecomment-42645517
+    # @see : https://github.com/excon/excon/issues/384#issuecomment-362618298
     #
     class Parser
       def self.parse(url)

data/lib/excon/addressable/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module Excon
   module Addressable
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/lib/excon/addressable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'addressable/template'
 require 'addressable/uri'
 require 'excon'
@@ -7,7 +8,15 @@ require 'excon/addressable/version'
 
 Excon.defaults[:uri_parser] = Excon::Addressable::Parser
 
+# Excon
+#
+# We inject the `expand` key to the allowed lists of keys to be used when
+# creating a request, or connection object. Excon does not enforce this yet, but
+# it does print a warning, so this makes things future-proof.
 module Excon
+  VALID_REQUEST_KEYS << :expand
+  VALID_CONNECTION_KEYS << :expand
+
   module Addressable
     # Middleware
     #
@@ -15,6 +24,11 @@ module Excon
     #
     class Middleware < Excon::Middleware::Base
       def request_call(datum)
+        # we need to convert a query hash (or string) to the proper format for
+        # Addressable to work with. We also need to remove the `?` character
+        # that Excon prepends to the final query string.
+        datum[:query] = Excon::Utils.query_string(datum)[1..-1]
+
         url = ::Addressable::URI.new(datum)
 
         if (template = ::Addressable::Template.new(url)) && template.variables.any?

data/test/excon/addressable_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../test_helper'
 
 module Excon
@@ -13,6 +14,7 @@ module Excon
       Excon.stub({ path: '/' }, body: 'index')
       Excon.stub({ path: '/hello' }, body: 'world')
       Excon.stub({ path: '/hello', query: 'message=world' }, body: 'hi!')
+      Excon.stub({ path: '/hello', query: 'a=b&c=d' }, body: 'earth')
       Excon.stub({ path: '/world' }, body: 'universe')
     end
 
@@ -50,6 +52,24 @@ module Excon
       assert_equal 'hi!', response.body
     end
 
+    def test_uri_with_full_uri
+      response = Excon.get('http://www.example.com/hello?message=world')
+
+      assert_equal 'hi!', response.body
+    end
+
+    def test_uri_with_query
+      response = Excon.get('http://www.example.com/hello', query: { message: 'world' })
+
+      assert_equal 'hi!', response.body
+    end
+
+    def test_uri_with_multiple_queries
+      response = Excon.get('https://www.example.com/hello', query: { a: 'b', c: 'd' })
+
+      assert_equal 'earth', response.body
+    end
+
     def teardown
       Excon.stubs.clear
     end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'excon/addressable'
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon-addressable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,98 +17,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.60'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.60'
 description: Excon, with Addressable baked in.
 email:
 - jean@mertz.fm
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Excon, with Addressable baked in.