excon-addressable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756d84584c38d848ee4e1331c47838d51dc47f31
-  data.tar.gz: 33156a1fef3e240325a506f6cd65f0157bbc4c85
+  metadata.gz: 2fb78674bba0eea1c3c0375e89057353d0a0ab2c
+  data.tar.gz: 7d7fbe6b86458feeb6d4df55607060c2d2741205
 SHA512:
-  metadata.gz: eaf013eec260603b681e7633f107563492d75fa1036601923196e763c2d36c76ab5cea668d2b2e43de76165e7246eb57ca2ca5c86baae18c7932d1dea77b2ffc
-  data.tar.gz: bab491e6ac390c5e2997058e671f1d389dd48b5e5df44dbae8f0067fbc3e9a8235fbbe352e604c684cce180d1534ad16031dfe312112f4dfe1425b9b2907e067
+  metadata.gz: 5ea5018b4786f5c980043e760d0a4fc2ee358de76d6fa188168aae6625eab58d82159d43b92294c737bcbb5d8b584a0a9d3ea9bfd8be3bdfc475b72a6bd32bc5
+  data.tar.gz: 350853bfb125a5b8fb56b737b78fd67a8ce5bb6908eccf3092bce45aee830c58b5a492beb8b1ff9c846c16fe123d637d7197bd5d015a23aeb347fa1970e20d16

data/.gitignore

@@ -1,3 +1,4 @@
 /.bundle/
+/.wercker/
 /Gemfile.lock
 /pkg/

data/.rubocop.yml

@@ -0,0 +1,7 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - '.wercker/**/*'
+
+Metrics/LineLength:
+  Max: 100

data/.wercker.yml

@@ -0,0 +1,7 @@
+box: ruby:2.3
+build:
+  steps:
+  - bundle-install
+  - script:
+    name: tests
+    code: bundle exec rake

data/Gemfile

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

data/README.md

@@ -1,4 +1,4 @@
-# Excon::Addressable
+# Excon::Addressable [![wercker status](https://app.wercker.com/status/3868c162aa140566b830f517c45d528a/s/master "wercker status")](https://app.wercker.com/project/bykey/3868c162aa140566b830f517c45d528a)
 
 Sets [Addressable][] as the default URI parser. Supports parsing [templated uris][].
 

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'

data/excon-addressable.gemspec

@@ -1,4 +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'

data/lib/excon/addressable/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Excon
   module Addressable
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'
   end
 end

data/lib/excon/addressable.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require 'addressable/uri'
-require 'addressable/template'
+require 'addressable'
 require 'excon'
 require 'excon/addressable/version'
 
@@ -12,8 +11,8 @@ module Excon
   #
   module Addressable
     def new(url, params = {})
-      if (variables = params.delete(:expand))
-        url = ::Addressable::Template.new(url).expand(variables)
+      if (template = ::Addressable::Template.new(url)) && template.variables.any?
+        url = template.expand(params.delete(:expand).to_h)
       end
 
       super

data/test/excon/addressable_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../test_helper'
 
 module Excon
@@ -18,6 +19,12 @@ module Excon
       assert_equal 200, conn.get.status
     end
 
+    def test_templated_uri_with_optional_query_parameters
+      conn = Excon.new('http://www.example.com/{?uid}')
+
+      assert_equal '/', conn.data[:path]
+    end
+
     def teardown
       Excon.stubs.clear
     end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# 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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jean
@@ -117,6 +117,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".wercker.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt