Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmwatson committed Apr 12, 2012
1 parent 0ddb1fc commit 8542df2
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Run the generator, supplying the name of the model (e.g. User)

Add your OAuth credentials to `config/initializers/devise_twitter.rb`

Devise::Twitter.setup do |config|
Devise::TwitterD.setup do |config|
config.consumer_key = <YOUR CONSUMER KEY HERE>
config.consumer_secret = <YOUR CONSUMER SECRET HERE>
config.scope = :user
Expand Down Expand Up @@ -59,8 +59,8 @@ Modify the generated routes (in `config/routes.rb`) to your liking

Application.routes.draw do
devise_for :user do
match '/user/sign_in/twitter' => Devise::Twitter::Rack::Signin
match '/user/connect/twitter' => Devise::Twitter::Rack::Connect
match '/user/sign_in/twitter' => Devise::TwitterD::Rack::Signin
match '/user/connect/twitter' => Devise::TwitterD::Rack::Connect
end
...

Expand Down
2 changes: 1 addition & 1 deletion devise-twitter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require File.expand_path("../lib/devise/twitter/version", __FILE__)

Gem::Specification.new do |s|
s.name = "devise-twitter"
s.version = Devise::Twitter::VERSION
s.version = Devise::TwitterD::VERSION
s.platform = Gem::Platform::RUBY
s.authors = ['Martin Schuerrer']
s.email = ['martin@schuerrer.org']
Expand Down
2 changes: 1 addition & 1 deletion lib/devise-twitter.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Devise
module Twitter
module TwitterD
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/devise/twitter.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Devise
module Twitter
module TwitterD
@@setup_done = false

mattr_accessor :consumer_key
Expand Down
2 changes: 1 addition & 1 deletion lib/devise/twitter/rack.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Devise
module Twitter
module TwitterD
module Rack
Signin = proc do |env|
warden = env['warden']
Expand Down
2 changes: 1 addition & 1 deletion lib/devise/twitter/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Devise
module Twitter
module TwitterD
VERSION = "0.1.2.pre"
end
end
2 changes: 1 addition & 1 deletion lib/generators/devise/templates/initializer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Devise::Twitter.setup do |config|
Devise::TwitterD.setup do |config|
config.consumer_key = <YOUR CONSUMER KEY>
config.consumer_secret = <YOUR CONSUMER SECRET>
config.scope = :<%= singular_name %>
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/devise/twitter_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def copy_initializer
def add_devise_twitter_routes
route <<-CONTENT
devise_for :#{singular_name} do
match '/#{singular_name}/sign_in/twitter' => Devise::Twitter::Rack::Signin
match '/#{singular_name}/connect/twitter' => Devise::Twitter::Rack::Connect
match '/#{singular_name}/sign_in/twitter' => Devise::TwitterD::Rack::Signin
match '/#{singular_name}/connect/twitter' => Devise::TwitterD::Rack::Connect
end
CONTENT
end
Expand Down

0 comments on commit 8542df2

Please sign in to comment.