proxy_rb 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6abcc8dc4e92962539f30a1449feae10f6c8940
-  data.tar.gz: 184e4d8e2206de5d44e86eee437fece58df3f02a
+  metadata.gz: e46872c1598f6d391255a8f82bd45af392b85a62
+  data.tar.gz: b6f0b8b2255df3f30b8fb1ae856dcc975b9066d8
 SHA512:
-  metadata.gz: 9096dd8f7b0373e477354e4cfaa22621a2775fe247dba45650b06b8a8e80bed93bb2da0965f7854b90af086851ce2af8fa6d83969ff503f2f6e0b07ff8209e3b
-  data.tar.gz: a4b629292fcaa35f0bbf0942ab5f42729e41b669a141b720b2e0bd10eb1e351dd46ef12ac3c1bdb299fd415d200f0599d34d56d1cd35585c6369204dbf520661
+  metadata.gz: 298bf3a4892cb3da76e5eec56da220208ff17dec2b1552080fa40d393507bb347b5d25d133ba88a0e7d301be9c0e65aa9309e4d78888340779c22934c2d4914b
+  data.tar.gz: 5c8ac7581a493ce157398615e738e66b164202926ace2cc1f332a98783500f383b43b9757d4a5f1e4bc7215a2c56b2205f370a55fe3a6b73e501de20ff105676

data/History.md

@@ -1,10 +1,8 @@
-#  UNRELEASED
+## [v0.10.6](https://github.com/fedux-org/proxy_rb/compare/v0.10.5...v0.10.6)
 
-Empty
+* Fix error message in matchers: The user name was missing
 
-# RELEASED
-
-## [v0.10.5](https://github.com/fedux-org/proxy_rb/compare/v0.10.5...v0.10.5)
+## [v0.10.5](https://github.com/fedux-org/proxy_rb/compare/v0.10.4...v0.10.5)
 
 * Fix for overwriting proxies
 * Better error messages for matchers

data/Rakefile

@@ -31,7 +31,7 @@ namespace :test do
 
   desc 'Run cucumber'
   task :cucumber do
-    sh 'bundle exec cucumber -p all'
+    sh 'bundle exec cucumber'
   end
 end
 

data/lib/proxy_rb/http_proxy.rb

@@ -48,7 +48,12 @@ module ProxyRb
     # @return [ProxyUrl]
     #   The proxy as url
     def full_url
-      ProxyUrl.build url.to_hash.merge(credentials.to_hash)
+      ProxyUrl.build(
+        url.to_hash.merge(
+          user: credentials.user_name,
+          password: credentials.password
+        )
+      )
     end
 
     # Convert proxy to string

data/lib/proxy_rb/main.rb

@@ -7,13 +7,13 @@ module ProxyRb
   @logger     = Logger.new($stderr)
 
   ANNOUNCERS = %i(
-      proxy
-      proxy_user
-      resource
-      resource_user
-      http_response_headers
-      status_code
-  )
+    proxy
+    proxy_user
+    resource
+    resource_user
+    http_response_headers
+    status_code
+  ).freeze
 
   class << self
     protected

data/lib/proxy_rb/matchers/be_forbidden.rb

@@ -12,11 +12,11 @@ RSpec::Matchers.define :be_forbidden do
 
     msg << %(expected that response of "#{resource}" has status code 403, but has #{actual.status_code}.)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end
@@ -26,11 +26,11 @@ RSpec::Matchers.define :be_forbidden do
 
     msg << %(expected that response of "#{resource}" does not have status code 403.)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end

data/lib/proxy_rb/matchers/be_successful.rb

@@ -12,11 +12,11 @@ RSpec::Matchers.define :be_successful do
 
     msg << %(expected that response of "#{resource}" has status code 2xx, but has #{actual.status_code}.)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end
@@ -26,11 +26,11 @@ RSpec::Matchers.define :be_successful do
 
     msg << %(expected that response of "#{resource}" does not have status code 2xx.)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end

data/lib/proxy_rb/matchers/have_mime_type.rb

@@ -10,11 +10,11 @@ RSpec::Matchers.define :have_mime_type do |expected|
 
     msg << %(expected that response of "#{resource}" has mime type "#{expected}", but has "#{actual}".)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end
@@ -24,11 +24,11 @@ RSpec::Matchers.define :have_mime_type do |expected|
 
     msg << %(expected that response of "#{resource}" does not have mime type "#{expected}".)
 
-    if proxy.nil? || proxy.empty?
-      msg << %(No proxy was used.)
-    else
-      msg << %(It was fetched via proxy "#{proxy.to_s}".)
-    end
+    msg << if proxy.nil? || proxy.empty?
+             %(No proxy was used.)
+           else
+             %(It was fetched via proxy "#{proxy}".)
+           end
 
     msg.join ' '
   end

data/lib/proxy_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Main Module
 module ProxyRb
-  VERSION = '0.10.5'
+  VERSION = '0.10.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_rb
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: This gem makes testing your proxy easy.