ruby-openid 2.2.0 → 2.2.1

data/lib/openid/fetchers.rb

@@ -238,15 +238,15 @@ module OpenID
 
     private
     def setup_encoding(response)
-      return unless defined?(::Encoding::ASCII_8BIT)
-      charset = response.type_params["charset"]
-      return if charset.nil?
-      encoding = nil
+      return unless defined?(Encoding.default_external)
+      return unless charset = response.type_params["charset"]
+
       begin
         encoding = Encoding.find(charset)
       rescue ArgumentError
       end
-      encoding ||= Encoding::ASCII_8BIT
+      encoding ||= Encoding.default_external
+
       body = response.body
       if body.respond_to?(:force_encoding)
         body.force_encoding(encoding)

data/lib/openid/version.rb

@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.2.0"
-end
+  VERSION = "2.2.1"
+end

data/test/test_fetchers.rb

@@ -126,7 +126,28 @@ EOHTML
     }
   end
 
+  def _unencoded_page
+    lambda { |req, resp|
+      resp['Content-Type'] = "text/html"
+      body = "unencoded-body"
+      body.force_encoding("ASCII-8BIT") if body.respond_to?(:force_encoding)
+      resp.body = body
+    }
+  end
+
+  def _badly_encoded_page
+    lambda { |req, resp|
+      resp['Content-Type'] = "text/html; charset=wtf"
+      body = "badly-encoded-body"
+      body.force_encoding("ASCII-8BIT") if body.respond_to?(:force_encoding)
+      resp.body = body
+    }
+  end
+
   def setup
+    if defined?(Encoding.default_external)
+      @encoding_was = Encoding.default_external
+    end
     @fetcher = OpenID::StandardFetcher.new
     @logfile = StringIO.new
     @weblog = WEBrick::Log.new(logfile=@logfile)
@@ -152,6 +173,8 @@ EOHTML
       @server.mount_proc('/post', _require_post)
       @server.mount_proc('/redirect_loop', _redirect_loop)
       @server.mount_proc('/utf8_page', _utf8_page)
+      @server.mount_proc('/unencoded_page', _unencoded_page)
+      @server.mount_proc('/badly_encoded_page', _badly_encoded_page)
       @server.start
     }
     @uri = _uri_build
@@ -168,6 +191,9 @@ EOHTML
   end
 
   def teardown
+    if defined?(Encoding.default_external)
+      Encoding.default_external = @encoding_was
+    end
     @server.shutdown
     # Sleep a little because sometimes this blocks forever.
     @server_thread.join
@@ -234,6 +260,30 @@ EOHTML
     end
   end
 
+  def test_unencoded_page
+    if defined?(Encoding.default_external)
+      Encoding.default_external = Encoding::SHIFT_JIS
+    end
+    uri = _uri_build('/unencoded_page')
+    response = @fetcher.fetch(uri)
+    assert_equal("unencoded-body", response.body)
+    if defined?(Encoding.default_external)
+      assert_equal(Encoding::US_ASCII, response.body.encoding)
+    end
+  end
+
+  def test_badly_encoded_page
+    if defined?(Encoding.default_external)
+      Encoding.default_external = Encoding::SHIFT_JIS
+    end
+    uri = _uri_build('/badly_encoded_page')
+    response = @fetcher.fetch(uri)
+    assert_equal("badly-encoded-body", response.body)
+    if defined?(Encoding.default_external)
+      assert_equal(Encoding::SHIFT_JIS, response.body.encoding)
+    end
+  end
+
   def test_cases
     for path, expected_code, expected_url in @@cases
       uri = _uri_build(path)

data/test/test_idres.rb

@@ -63,7 +63,7 @@ module OpenID
           [["openid1", OPENID1_NS, OPENID1_FIELDS],
            ["openid1", OPENID11_NS, OPENID1_FIELDS],
            ["openid2", OPENID2_NS, OPENID2_FIELDS],
-          ].each do |ver, ns, all_fields|
+          ].each_with_index do |(ver, ns, all_fields), i|
             all_fields.each do |field|
               test = lambda do
                 fields = all_fields.dup
@@ -74,7 +74,7 @@ module OpenID
                   idres.send(:check_for_fields)
                 }
               end
-              define_method("test_#{ver}_check_missing_#{field}", test)
+              define_method("test_#{i}_#{ver}_check_missing_#{field}", test)
             end
           end
         end
@@ -84,7 +84,7 @@ module OpenID
           [["openid1", OPENID1_NS, OPENID1_FIELDS, OPENID1_SIGNED],
            ["openid1", OPENID11_NS, OPENID1_FIELDS, OPENID1_SIGNED],
            ["openid2", OPENID2_NS, OPENID2_FIELDS, OPENID2_SIGNED],
-          ].each do |ver, ns, all_fields, signed_fields|
+          ].each_with_index do |(ver, ns, all_fields, signed_fields), i|
             signed_fields.each do |signed_field|
               test = lambda do
                 fields = signed_fields.dup
@@ -97,7 +97,7 @@ module OpenID
                   idres.send(:check_for_fields)
                 }
               end
-              define_method("test_#{ver}_check_missing_signed_#{signed_field}", test)
+              define_method("test_#{i}_#{ver}_check_missing_signed_#{signed_field}", test)
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: openid
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: openid@janrain.com
@@ -218,7 +218,8 @@ files:
 - LICENSE
 - UPGRADE.md
 homepage: https://github.com/openid/ruby-openid
-licenses: []
+licenses:
+- Apache Software License
 post_install_message: 
 rdoc_options:
 - --main
@@ -233,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3380124184653495316
+      hash: -2604511254745544054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3380124184653495316
+      hash: -2604511254745544054
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23