rest-client 1.7.0 → 1.7.1

data/Rakefile

@@ -81,7 +81,7 @@ namespace :windows do
             if ok
               FileUtils.mkdir_p(pkg_dir)
               FileUtils.mv(File.join(base, gem_filename), pkg_dir)
-              Bundler.ui.confirm("rest-client #{RestClient::VERSION} " +
+              Bundler.ui.confirm("rest-client #{RestClient::VERSION} " \
                                  "built to pkg/#{gem_filename}")
             else
               abort "Command `gem build` failed: #{res}"
@@ -114,4 +114,3 @@ Rake::RDocTask.new do |t|
   t.rdoc_files.include('README.rdoc')
   t.rdoc_files.include('lib/*.rb')
 end
-

data/bin/restclient

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'rubygems'
 require 'restclient'
@@ -26,10 +26,10 @@ end
 
 config = YAML.load(File.read(ENV['HOME'] + "/.restclient")) rescue {}
 
-@url, @username, @password = if c = config[@url]
-  [c['url'], c['username'], c['password']]
+if (c = config[@url])
+  @url, @username, @password = [c['url'], c['username'], c['password']]
 else
-  [@url, * ARGV]
+  @url, @username, @password = [@url, * ARGV]
 end
 
 usage("invalid url '#{@url}") unless @url =~ /^https?/
@@ -58,7 +58,7 @@ end
 POSSIBLE_VERBS.each do |m|
   eval <<-end_eval
 def  #{m}(path, *args, &b)
-	r[path].#{m}(*args, &b)
+  r[path].#{m}(*args, &b)
 end
   end_eval
 end
@@ -79,11 +79,12 @@ end
 require 'irb'
 require 'irb/completion'
 
-if File.exists? ".irbrc"
+if File.exist? ".irbrc"
   ENV['IRBRC'] = ".irbrc"
 end
 
-if File.exists?(File.expand_path(rcfile = "~/.restclientrc"))
+rcfile = File.expand_path("~/.restclientrc")
+if File.exist?(rcfile)
   load(rcfile)
 end
 

data/history.md

@@ -1,3 +1,11 @@
+# 1.7.1
+
+- Relax mime-types dependency to continue supporting mime-types 1.x series.
+  There seem to be a large number of popular gems that have depended on
+  mime-types '~> 1.16' until very recently.
+- Improve urlencode performance
+- Clean up a number of style points
+
 # 1.7.0
 
 - This release drops support for Ruby 1.8.7 and breaks compatibility in a few

data/lib/restclient/abstract_response.rb

@@ -82,7 +82,7 @@ module RestClient
       Request.execute args, &block
     end
 
-    def AbstractResponse.beautify_headers(headers)
+    def self.beautify_headers(headers)
       headers.inject({}) do |out, (key, value)|
         out[key.gsub(/-/, '_').downcase.to_sym] = %w{ set-cookie }.include?(key.downcase) ? value : value.first
         out

data/lib/restclient/exceptions.rb

@@ -86,7 +86,7 @@ module RestClient
   # probably an HTML error page) is e.response.
   class Exception < RuntimeError
     attr_accessor :response
-    attr_writer   :message
+    attr_writer :message
 
     def initialize response = nil, initial_response_code = nil
       @response = response

data/lib/restclient/payload.rb

@@ -25,12 +25,12 @@ module RestClient
     def has_file?(params)
       params.any? do |_, v|
         case v
-          when Hash
-            has_file?(v)
-          when Array
-            has_file_array?(v)
-          else
-            v.respond_to?(:path) && v.respond_to?(:read)
+        when Hash
+          has_file?(v)
+        when Array
+          has_file_array?(v)
+        else
+          v.respond_to?(:path) && v.respond_to?(:read)
         end
       end
     end
@@ -38,12 +38,12 @@ module RestClient
     def has_file_array?(params)
       params.any? do |v|
         case v
-          when Hash
-            has_file?(v)
-          when Array
-            has_file_array?(v)
-          else
-            v.respond_to?(:path) && v.respond_to?(:read)
+        when Hash
+          has_file?(v)
+        when Array
+          has_file_array?(v)
+        else
+          v.respond_to?(:path) && v.respond_to?(:read)
         end
       end
     end
@@ -147,17 +147,15 @@ module RestClient
 
       # for UrlEncoded escape the keys
       def handle_key key
-        parser.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        Parser.escape(key.to_s, Escape)
       end
 
       def headers
         super.merge({'Content-Type' => 'application/x-www-form-urlencoded'})
       end
 
-      private
-        def parser
-          URI.const_defined?(:Parser) ? URI::Parser.new : URI
-        end
+      Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
+      Escape = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
     end
 
     class Multipart < Base
@@ -206,7 +204,7 @@ module RestClient
           s.write(" filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
           s.write("Content-Type: #{v.respond_to?(:content_type) ? v.content_type : mime_for(v.path)}#{EOL}")
           s.write(EOL)
-          while data = v.read(8124)
+          while (data = v.read(8124))
             s.write(data)
           end
         ensure

data/lib/restclient/request.rb

@@ -408,7 +408,7 @@ module RestClient
       net.start do |http|
         if @block_response
           net_http_do_request(http, req, payload ? payload.to_s : nil,
-                           & @block_response)
+                              &@block_response)
         else
           res = net_http_do_request(http, req, payload ? payload.to_s : nil) \
             { |http_response| fetch_body(http_response) }
@@ -511,20 +511,25 @@ module RestClient
     end
 
     def log_request
-      if RestClient.log
-        out = []
-        out << "RestClient.#{method} #{url.inspect}"
-        out << payload.short_inspect if payload
-        out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
-        RestClient.log << out.join(', ') + "\n"
-      end
+      return unless RestClient.log
+
+      out = []
+      out << "RestClient.#{method} #{url.inspect}"
+      out << payload.short_inspect if payload
+      out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
+      RestClient.log << out.join(', ') + "\n"
     end
 
     def log_response res
-      if RestClient.log
-        size = @raw_response ? File.size(@tf.path) : (res.body.nil? ? 0 : res.body.size)
-        RestClient.log << "# => #{res.code} #{res.class.to_s.gsub(/^Net::HTTP/, '')} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{size} bytes\n"
-      end
+      return unless RestClient.log
+
+      size = if @raw_response
+               File.size(@tf.path)
+             else
+               res.body.nil? ? 0 : res.body.size
+             end
+
+      RestClient.log << "# => #{res.code} #{res.class.to_s.gsub(/^Net::HTTP/, '')} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{size} bytes\n"
     end
 
     # Return a hash of headers whose keys are capitalized strings

data/lib/restclient/resource.rb

@@ -149,10 +149,9 @@ module RestClient
     #
     def [](suburl, &new_block)
       case
-        when block_given? then self.class.new(concat_urls(url, suburl), options, &new_block)
-        when block        then self.class.new(concat_urls(url, suburl), options, &block)
-      else
-        self.class.new(concat_urls(url, suburl), options)
+      when block_given? then self.class.new(concat_urls(url, suburl), options, &new_block)
+      when block        then self.class.new(concat_urls(url, suburl), options, &block)
+      else                   self.class.new(concat_urls(url, suburl), options)
       end
     end
 

data/lib/restclient/response.rb

@@ -12,7 +12,7 @@ module RestClient
       self
     end
 
-    def Response.create body, net_http_res, args
+    def self.create body, net_http_res, args
       result = body || ''
       result.extend Response
       result.net_http_res = net_http_res

data/lib/restclient/version.rb

@@ -1,5 +1,5 @@
 module RestClient
-  VERSION = '1.7.0' unless defined?(self::VERSION)
+  VERSION = '1.7.1' unless defined?(self::VERSION)
 
   def self.version
     VERSION

data/rest-client.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('pry-doc')
   s.add_development_dependency('rdoc', '>= 2.4.2', '< 5.0')
 
-  s.add_dependency('mime-types', '~> 2.0')
+  s.add_dependency('mime-types', '>= 1.16', '< 3.0')
   s.add_dependency('netrc', '~> 0.7')
 
   s.required_ruby_version = '>= 1.9.2'
 end
-

data/spec/spec_helper.rb

@@ -1,12 +1,2 @@
-def is_ruby_19?
-  RUBY_VERSION > '1.9'
-end
-
-begin
-  require "ruby-debug"
-rescue LoadError
-  # NOP, ignore
-end
-
 require 'webmock/rspec'
 require 'restclient'

data/spec/unit/request2_spec.rb

@@ -12,7 +12,7 @@ describe RestClient::Request do
 
   it "can use a block to process response" do
     response_value = nil
-    block = Proc.new do |http_response|
+    block = proc do |http_response|
       response_value = http_response.body
     end
     stub_request(:get, 'http://some/resource?a=b&c=d').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar'}).to_return(:body => 'foo', :status => 200)

data/spec/unit/resource_spec.rb

@@ -80,30 +80,27 @@ describe RestClient::Resource do
   end
 
   it "passes a given block to subresources" do
-    block = Proc.new{|r| r}
+    block = proc {|r| r}
     parent = RestClient::Resource.new('http://example.com', &block)
     parent['posts'].block.should eq block
   end
 
   it "the block should be overrideable" do
-    block1 = Proc.new{|r| r}
-    block2 = Proc.new{|r| r}
+    block1 = proc {|r| r}
+    block2 = proc {|r| }
     parent = RestClient::Resource.new('http://example.com', &block1)
     # parent['posts', &block2].block.should eq block2 # ruby 1.9 syntax
     parent.send(:[], 'posts', &block2).block.should eq block2
+    parent.send(:[], 'posts', &block2).block.should_not eq block1
   end
 
   it "the block should be overrideable in ruby 1.9 syntax" do
-    block = Proc.new{|r| r}
-    parent = RestClient::Resource.new('http://example.com', &block)
-    r19_syntax = %q{
-      parent['posts', &->(r){r}].block.should_not eq block
-    }
-    if is_ruby_19?
-      eval(r19_syntax)
-    else
-      parent.should_not be_nil
-    end
+    block1 = proc {|r| r}
+    block2 = ->(r) {}
+
+    parent = RestClient::Resource.new('http://example.com', &block1)
+    parent['posts', &block2].block.should eq block2
+    parent['posts', &block2].block.should_not eq block1
   end
 
   it "prints its url with to_s" do

data/spec/unit/response_spec.rb

@@ -35,9 +35,9 @@ describe RestClient::Response do
       response = RestClient::Response.create('abc', net_http_res, {})
       response.headers[:set_cookie].should eq ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
       response.cookies.should eq({
-              "main_page" => "main_page_no_rewrite",
-              "remember_me" => "",
-              "user" => "somebody"
+        "main_page" => "main_page_no_rewrite",
+        "remember_me" => "",
+        "user" => "somebody"
       })
     end
 
@@ -45,9 +45,9 @@ describe RestClient::Response do
       net_http_res = double('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT, remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT, user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
       response = RestClient::Response.create('abc', net_http_res, {})
       response.cookies.should eq({
-              "main_page" => "main_page_no_rewrite",
-              "remember_me" => "",
-              "user" => "somebody"
+        "main_page" => "main_page_no_rewrite",
+        "remember_me" => "",
+        "user" => "somebody"
       })
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -102,17 +102,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1437568158515358727
+      hash: -3494405744393893908
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2