Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #57 from oelmekki/rails-3.1

Rails 3.1 compatibility
  • Loading branch information...
commit 3b1959ec07f1a9c4164753fea5a5cb1079b88257 2 parents f48bedd + a047019
@lancejpollard authored
View
4 README.markdown
@@ -114,6 +114,8 @@ Because of the redirects involved in Oauth and OpenID, you MUST pass a block to
end
If you don't use the block, we will get a DoubleRender error. We need the block to jump out of the rendering while redirecting.
+
+Also, be sure to skip protect_from_forgery for actions using this. Even if logs say a GET request is issued, a POST route will need to bypass forgery protection in order to yield a result to the #save block when back from auth provider.
### 7. Add Parameters to Forms in your Views
@@ -231,4 +233,4 @@ Feel free to add to the wiki if you figure things out or make new distinctions.
### Todo
-- Add [Andrew Cove's](http://github.com/andrewacove) idea of a "Merge Code". So if user creates Facebook account logs out, and create Twitter account, a code they can use to pass to facebook account so it knows it's associated with Twitter.
+- Add [Andrew Cove's](http://github.com/andrewacove) idea of a "Merge Code". So if user creates Facebook account logs out, and create Twitter account, a code they can use to pass to facebook account so it knows it's associated with Twitter.
View
8 Rakefile
@@ -1,6 +1,6 @@
require 'rake'
-require "rake/rdoctask"
-require 'rake/gempackagetask'
+require "rdoc/task"
+require 'rubygems/package_task'
# http://docs.rubygems.org/read/chapter/20
spec = Gem::Specification.new do |s|
@@ -52,7 +52,7 @@ task :manifest do
end
end
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
pkg.gem_spec = spec
pkg.package_dir = "pkg"
end
@@ -82,4 +82,4 @@ task :test do
next if File.basename(file) =~ /test_helper/
system "ruby #{file}"
end
-end
+end
View
2  lib/authlogic_connect/common/variables.rb
@@ -70,7 +70,7 @@ def authenticate_via_protocol(block_given = false, options = {}, &block)
# returns boolean
def authentication_protocol(with, phase)
- returning(send("#{phase.to_s}_#{with.to_s}?")) do |ready|
+ send("#{phase.to_s}_#{with.to_s}?").tap do |ready|
send("#{phase.to_s}_#{with.to_s}") if ready
end if send("using_#{with.to_s}?")
end
Please sign in to comment.
Something went wrong with that request. Please try again.