excon 0.27.0 → 0.27.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.27.0)
+    excon (0.27.1)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,8 @@
+0.27.1 10/09/2013
+=================
+
+improve warning messages for valid keys
+
 0.27.0 10/04/2013
 =================
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.27.0'
-  s.date              = '2013-10-04'
+  s.version           = '0.27.1'
+  s.date              = '2013-10-09'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon.rb

@@ -85,7 +85,7 @@ module Excon
 
     # Status of mocking
     def mock
-      display_warning("Excon#mock is deprecated, pass Excon.defaults[:mock] instead (#{caller.first}")
+      display_warning("Excon#mock is deprecated, use Excon.defaults[:mock] instead (#{caller.first})")
       self.defaults[:mock]
     end
 
@@ -93,7 +93,7 @@ module Excon
     # false is the default and works as expected
     # true returns a value from stubs or raises
     def mock=(new_mock)
-      display_warning("Excon#mock is deprecated, pass Excon.defaults[:mock]= instead (#{caller.first})")
+      display_warning("Excon#mock is deprecated, use Excon.defaults[:mock]= instead (#{caller.first})")
       self.defaults[:mock] = new_mock
     end
 
@@ -112,14 +112,14 @@ module Excon
 
     # @return [true, false] Whether or not to verify the peer's SSL certificate / chain
     def ssl_verify_peer
-      display_warning("Excon#ssl_verify_peer= is deprecated, use Excon.defaults[:ssl_verify_peer]= instead (#{caller.first})")
+      display_warning("Excon#ssl_verify_peer is deprecated, use Excon.defaults[:ssl_verify_peer] instead (#{caller.first})")
       self.defaults[:ssl_verify_peer]
     end
 
     # Change the status of ssl peer verification
     # @see Excon#ssl_verify_peer (attr_reader)
     def ssl_verify_peer=(new_ssl_verify_peer)
-      display_warning("Excon#ssl_verify_peer is deprecated, use Excon.defaults[:ssl_verify_peer] instead (#{caller.first})")
+      display_warning("Excon#ssl_verify_peer= is deprecated, use Excon.defaults[:ssl_verify_peer]= instead (#{caller.first})")
       self.defaults[:ssl_verify_peer] = new_ssl_verify_peer
     end
 

data/lib/excon/connection.rb

@@ -8,16 +8,16 @@ module Excon
       @data
     end
     def connection=(new_params)
-      Excon.display_warning("Excon::Connection#connection= is deprecated use Excon::Connection#data= instead (#{caller.first})")
+      Excon.display_warning("Excon::Connection#connection= is deprecated. Use of this method may cause unexpected results. (#{caller.first})")
       @data = new_params
     end
 
     def params
-      display_waring("Excon::Connection#params is deprecated use Excon::Connection#data instead (#{caller.first})")
+      Excon.display_warning("Excon::Connection#params is deprecated use Excon::Connection#data instead (#{caller.first})")
       @data
     end
     def params=(new_params)
-      Excon.display_warning("Excon::Connection#params= is deprecated use Excon::Connection#data= instead (#{caller.first})")
+      Excon.display_warning("Excon::Connection#params= is deprecated. Use of this method may cause unexpected results. (#{caller.first})")
       @data = new_params
     end
 
@@ -26,7 +26,7 @@ module Excon
       @data[:proxy]
     end
     def proxy=(new_proxy)
-      Excon.display_warning("Excon::Connection#proxy= is deprecated use Excon::Connection#data[:proxy]= instead (#{caller.first})")
+      Excon.display_warning("Excon::Connection#proxy= is deprecated. Use of this method may cause unexpected results. (#{caller.first})")
       @data[:proxy] = new_proxy
     end
 
@@ -46,7 +46,7 @@ module Excon
     #     @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
     #     @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
     def initialize(params = {})
-      validate_params!(params, VALID_CONNECTION_KEYS)
+      validate_params!(:connection, params)
       @data = Excon.defaults.dup
       # merge does not deep-dup, so make sure headers is not the original
       @data[:headers] = @data[:headers].dup
@@ -228,7 +228,7 @@ module Excon
     #     @option params [String] :path appears after 'scheme://host:port/'
     #     @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
     def request(params={}, &block)
-      validate_params!(params, VALID_REQUEST_KEYS)
+      validate_params!(:request, params)
       # @data has defaults, merge in new params to override
       datum = @data.merge(params)
       datum[:headers] = @data[:headers].merge(datum[:headers] || {})
@@ -314,7 +314,7 @@ module Excon
     end
 
     def retry_limit
-      Excon.display_warning("Excon::Connection#retry_limit is deprecated, pass :retry_limit to the initializer (#{caller.first})")
+      Excon.display_warning("Excon::Connection#retry_limit is deprecated, use Excon::Connection#data[:retry_limit]. (#{caller.first})")
       @data[:retry_limit] ||= DEFAULT_RETRY_LIMIT
     end
 
@@ -354,10 +354,16 @@ module Excon
       end
     end
 
-    def validate_params!(params, valid_keys)
+    def validate_params!(validation, params)
+      valid_keys = case validation
+      when :connection
+        VALID_CONNECTION_KEYS
+      when :request
+        VALID_REQUEST_KEYS
+      end
       invalid_keys = params.keys - valid_keys
       unless invalid_keys.empty?
-        Excon.display_warning("The following keys are invalid: #{invalid_keys.map(&:inspect).join(', ')}")
+        Excon.display_warning("Invalid Excon #{validation} keys: #{invalid_keys.map(&:inspect).join(', ')}\n#{ caller.join("\n") }")
         invalid_keys.each {|key| params.delete(key) }
       end
     end

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.27.0'
+  VERSION = '0.27.1'
 
   CR_NL = "\r\n"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1969698144445099887
+      hash: -3897142581279740651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: