Permalink
Browse files

Rollback to use the regexp result.

  • Loading branch information...
1 parent 19219cb commit b70b72b6b0d369c0c6f38b6986bae14d22542b77 @josevalim josevalim committed Nov 15, 2010
Showing with 28 additions and 28 deletions.
  1. +1 −1 Gemfile
  2. +25 −25 Gemfile.lock
  3. +2 −2 lib/devise/strategies/authenticatable.rb
View
@@ -2,7 +2,7 @@ source "http://rubygems.org"
gemspec
-gem "rails"
+gem "rails", "3.0.1"
gem "webrat", "0.7.1"
gem "mocha", :require => false
gem "oa-oauth", :require => "omniauth/oauth"
View
@@ -10,36 +10,36 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
+ actionmailer (3.0.1)
+ actionpack (= 3.0.1)
mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ actionpack (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4.1)
rack (~> 1.2.1)
rack-mount (~> 0.6.12)
rack-test (~> 0.5.4)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.1)
+ activesupport (= 3.0.1)
builder (~> 2.1.2)
i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ activerecord (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
arel (~> 1.0.0)
tzinfo (~> 0.3.23)
activerecord-jdbc-adapter (1.0.2-java)
activerecord-jdbcsqlite3-adapter (1.0.2-java)
activerecord-jdbc-adapter (= 1.0.2)
jdbc-sqlite3 (~> 3.6.0)
- activeresource (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
+ activeresource (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
+ activesupport (3.0.1)
addressable (2.2.2)
arel (1.0.1)
activesupport (~> 3.0.0)
@@ -104,17 +104,17 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.5.6)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
+ rails (3.0.1)
+ actionmailer (= 3.0.1)
+ actionpack (= 3.0.1)
+ activerecord (= 3.0.1)
+ activeresource (= 3.0.1)
+ activesupport (= 3.0.1)
bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
+ railties (= 3.0.1)
+ railties (3.0.1)
+ actionpack (= 3.0.1)
+ activesupport (= 3.0.1)
rake (>= 0.8.4)
thor (~> 0.14.0)
rake (0.8.7)
@@ -155,7 +155,7 @@ DEPENDENCIES
oa-oauth
oa-openid
orm_adapter (~> 0.0.2)
- rails
+ rails (= 3.0.1)
ruby-debug (>= 0.10.3)
sqlite3-ruby
warden (~> 1.0.2)
@@ -96,8 +96,8 @@ def valid_password?
# Helper to decode credentials from HTTP.
def decode_credentials
- return [] unless request.authorization && request.authorization =~ /^Basic (.*)/
- ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last).split(/:/, 2)
+ return [] unless request.authorization && request.authorization =~ /^Basic (.*)/m
+ ActiveSupport::Base64.decode64($1).split(/:/, 2)
end
# Sets the authentication hash and the password from params_auth_hash or http_auth_hash.

0 comments on commit b70b72b

Please sign in to comment.