faraday 0.8.6 → 0.8.7

data/Rakefile

@@ -80,34 +80,8 @@ task :release => :build do
 end
 
 desc "Build #{gem_file} into the pkg directory"
-task :build => :gemspec do
+task :build do
   FileUtils.mkdir_p 'pkg'
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end
-
-desc "Generate #{gemspec_file}"
-task :gemspec do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 
   class << self
     attr_accessor :root_path, :lib_path

data/lib/faraday/upload_io.rb

@@ -43,6 +43,14 @@ module Faraday
       (!got_result && length) ? nil : outbuf
     end
 
+    def close
+      @ios.each { |io| io.close }
+    end
+
+    def ensure_open_and_readable
+      # Rubinius compatibility
+    end
+
     private
 
     def current_io

data/lib/faraday/utils.rb

@@ -170,7 +170,7 @@ module Faraday
       end
     end
 
-    ESCAPE_RE = /[^\w .~-]+/
+    ESCAPE_RE = /[^a-zA-Z0-9 .~_-]/
 
     def escape(s)
       s.to_s.gsub(ESCAPE_RE) {

data/test/composite_read_io_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 require 'stringio'
 
-class CompositeReadIOTest < Test::Unit::TestCase
+class CompositeReadIOTest < Faraday::TestCase
   Part = Struct.new(:to_io) do
     def length() to_io.string.length end
   end
@@ -70,9 +70,13 @@ class CompositeReadIOTest < Test::Unit::TestCase
     assert_equal "ab", io.read(2)
   end
 
-  if IO.respond_to?(:copy_stream)
+  # JRuby enforces types to copy_stream to be String or IO
+  if IO.respond_to?(:copy_stream) && !jruby?
     def test_compatible_with_copy_stream
       target_io = StringIO.new
+      def target_io.ensure_open_and_writable
+        # Rubinius compatibility
+      end
       io = composite_io(part("abcd"), part("1234"))
 
       Faraday::Timer.timeout(1) do

data/test/request_middleware_test.rb

@@ -17,6 +17,20 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
   end
 
+  def with_utf8
+    if defined?(RUBY_VERSION) && RUBY_VERSION.match(/1.8.\d/)
+      begin
+        previous_kcode = $KCODE
+        $KCODE = "UTF8"
+        yield
+      ensure
+        $KCODE = previous_kcode
+      end
+    else
+      yield
+    end
+  end
+
   def test_does_nothing_without_payload
     response = @conn.post('/echo')
     assert_nil response.headers['Content-Type']
@@ -56,6 +70,16 @@ class RequestMiddlewareTest < Faraday::TestCase
     assert err.empty?
   end
 
+  def test_url_encoded_unicode_with_kcode_set
+    with_utf8 do
+      err = capture_warnings {
+        response = @conn.post('/echo', {:str => "eé cç aã aâ"})
+        assert_equal "str=e%C3%A9+c%C3%A7+a%C3%A3+a%C3%A2", response.body
+      }
+      assert err.empty?
+    end
+  end
+
   def test_url_encoded_nested_keys
     response = @conn.post('/echo', {'a'=>{'b'=>{'c'=>['d']}}})
     assert_equal "a%5Bb%5D%5Bc%5D%5B%5D=d", response.body

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
+  version: 0.8.7
   prerelease: 
-  version: 0.8.6
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    none: false
-  name: multipart-post
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: simplecov
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -128,17 +128,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -146,3 +146,4 @@ signing_key:
 specification_version: 2
 summary: HTTP/REST API client library.
 test_files: []
+has_rdoc: