faraday-encoding 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89fdc80352bd6ee60754f19ea6fbf6b213e43198
-  data.tar.gz: 116f0cdfc9c4135a391ca9a2c955a7d5d20ecd07
+  metadata.gz: ce866285eb0008b4318248afe64b338b11754bf2
+  data.tar.gz: 08415d4be0469ad92d72cd863c4ca13a4fd768b5
 SHA512:
-  metadata.gz: be550d9f77dd7c161b00b1debda2c369c8da41e708af5e4edc06f71341ae2825aa7094a4ada3e1988c6186a7566ced1849ab636972273d57a010f1f15f0bf160
-  data.tar.gz: 6bc1bf936d5a0ac790c1d2da440168e07637b16ac71ea86df030859e5773798426c0d181e3dcf23663fa90319a1ef976aef6f55ff2cad3ddf98e2d6ec6998331
+  metadata.gz: 3f7a3707dd92a8ae3716c74a7d5fa89d0caffbc0cff0394445caec745b925acbf17ff629d09d3f49185c07b1d31adf856a59e04985827d45152aeabce41c06ad
+  data.tar.gz: d9df280956bf0d164d6d03f577667b7d405f3a4f588d472ad0c0fa0547a3fc54035c6c2766d4c2cf65b93605ce0a45e1d7c6f73bebdf4a409a7cfdb9f557ea8b

data/faraday-encoding.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "faraday-encoding"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Takayuki Matsubara"]
   spec.email         = ["takayuki.1229@m3.com"]
   spec.summary       = %q{A Faraday Middleware sets body encoding when specified by server.}
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'faraday_middleware', '~> 0.10'
 
   spec.add_runtime_dependency "faraday"
 end

data/lib/faraday/encoding.rb

@@ -11,7 +11,9 @@ module Faraday
     def call(environment)
       @app.call(environment).on_complete do |env|
         @env = env
-        env[:body].force_encoding(content_charset) if content_charset
+        if encoding = content_charset
+          env[:body].force_encoding(encoding)
+        end
       end
     end
 
@@ -19,15 +21,13 @@ module Faraday
 
     # @return [Encoding|NilClass] returns Encoding or nil
     def content_charset
-      @content_charset ||= ::Encoding.find encoding_name rescue nil
+      ::Encoding.find encoding_name rescue nil
     end
 
     # @return [String] returns a string representing encoding name if it is find in the CONTENT TYPE header
     def encoding_name
-      @encoding_name ||= begin
-        if /charset=([^;|$]+)/.match(content_type)
-          mapped_encoding(Regexp.last_match(1))
-        end
+      if /charset=([^;|$]+)/.match(content_type)
+        mapped_encoding(Regexp.last_match(1))
       end
     end
 

data/spec/faraday/encoding_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Faraday::Encoding do
   let(:client) do
     Faraday.new do |connection|
+      connection.use FaradayMiddleware::FollowRedirects, limit: 10
       connection.response :encoding
       connection.adapter :test, stubs
     end
@@ -13,6 +14,9 @@ describe Faraday::Encoding do
       stub.get('/') do
         [response_status, response_headers, response_body]
       end
+      stub.get('/redirected') do
+        [redirected_status, redirected_headers, redirected_body]
+      end
     end
   end
 
@@ -64,4 +68,31 @@ describe Faraday::Encoding do
       end
     end
   end
+
+  context 'deal correctly with redirects that specify an encoding' do
+    # First request response with a redirect + a charset in the content-type header
+    let(:response_status) { 301 }
+    let(:response_headers) do
+      {
+        'content-type' => "text/plain; charset=utf-8",
+        'location' => '/redirected'
+      }
+    end
+    let(:response_body) { 'Redirected to /redirected' }
+
+    # The second request does not specify a charset in the content-type
+    let(:redirected_status) { 200 }
+    let(:redirected_headers) do
+      {
+        'content-type' => "text/html"
+      }
+    end
+    let(:redirected_body) do
+      'abc'.force_encoding(Encoding::ASCII_8BIT)
+    end
+    it 'does not memoize redirect encoding' do
+      response = client.get('/')
+      expect(response.body.encoding).to eq(Encoding::ASCII_8BIT)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "faraday-encoding"
+require "faraday_middleware"
 
 RSpec.configure do |config|
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-encoding
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takayuki Matsubara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement