mbleigh-twitter-auth 0.1.16 → 0.1.18

data/README.markdown

@@ -29,6 +29,15 @@ This will generate a migration as well as set up the stubs needed to use the Rai
 
 Finally, it will create a configuration file in `config/twitter_auth.yml` in which you should input your OAuth consumer key and secret (if using the OAuth strategy) as well as a custom callback for development (the `oauth_callback` option is where Twitter will send the browser after authentication is complete. If you leave it blank Twitter will send it to the URL set up when you registered your application).
 
+Sign in with Twitter
+--------------------
+
+Twitter recently implemented a convenience layer on top of OAuth called [Sign in with Twitter](http://apiwiki.twitter.com/Sign-in-with-Twitter). TwitterAuth makes use of this by default in newly generated applications by setting the `authorize_path` in `twitter_auth.yml`.
+
+If you already have an application utilizing TwitterAuth that you would like to utilize the new system, simply add this line to your `twitter_auth.yml` in each environment:
+
+    authorize_path: "/oauth/authenticate"
+
 Usage Basics
 ------------
 
@@ -84,7 +93,7 @@ Tips and Tricks
 Resources
 ---------
 
-* **Bug Reports:** See the [Lighthouse Project](http://mbleigh.lighthouseapp.com/projects/27783-twitterauth) to report any problems you have using TwitterAuth.
+* **Bug Reports:** See the [Issues Page](http://github.com/mbleigh/twitter-auth/issues) to report any problems you have using TwitterAuth.
 * **Blog Post:** The [original blog post about TwitterAuth](http://intridea.com/2009/3/23/twitter-auth-for-near-instant-twitter-apps) has a tutorial as well to get you started.
 * **GitHub Pages:** TwitterAuth has a [simple GitHub page](http://mbleigh.com/twitter-auth)
 

data/Rakefile

@@ -18,7 +18,7 @@ begin
     s.email = "michael@intridea.com"
     s.homepage = "http://github.com/mbleigh/twitter-auth"
     s.description = "TwitterAuth is a Rails plugin gem that provides Single Sign-On capabilities for Rails applications via Twitter. Both OAuth and HTTP Basic are supported."
-s.files =  FileList["[A-Z]*", "{bin,generators,lib,spec,config,app,rails}/**/*"]
+s.files =  FileList["[A-Z]*", "{bin,generators,lib,spec,config,app,rails}/**/*"] - FileList["**/*.log"]
     
     s.authors = ["Michael Bleigh"]
     s.add_dependency('oauth', '>= 0.3.1')

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 16
+:patch: 18

data/generators/twitter_auth/templates/twitter_auth.yml

@@ -4,6 +4,7 @@ development:
   oauth_consumer_key: devkey
   oauth_consumer_secret: devsecret
   base_url: "https://twitter.com"
+  authorize_path: "/oauth/authenticate"
   api_timeout: 10
   remember_for: 14 # days
   oauth_callback: "http://localhost:3000/oauth_callback"
@@ -12,13 +13,15 @@ test:
   oauth_consumer_key: testkey
   oauth_consumer_secret: testsecret
   base_url: "https://twitter.com"
+  authorize_path: "/oauth/authenticate"
   api_timeout: 10
   remember_for: 14 # days
   oauth_callback: "http://localhost:3000/oauth_callback"
 production:
   strategy: oauth
   oauth_consumer_key: prodkey
-  oauth_consumer_secret: prodsecret
+  oauth_consumer_secret: prodsecret 
+  authorize_path: "/oauth/authenticate"
   base_url: "https://twitter.com"
   api_timeout: 10
   remember_for: 14 # days

data/lib/twitter_auth.rb

@@ -56,10 +56,18 @@ module TwitterAuth
   
   # The OAuth consumer used by TwitterAuth for authentication. The consumer key and secret are set in your application's +config/twitter.yml+
   def self.consumer
+    options = {:site => TwitterAuth.base_url}
+    [ :authorize_path, 
+      :request_token_path,
+      :access_token_path,
+      :scheme ].each do |oauth_option|
+      options[oauth_option] = TwitterAuth.config[oauth_option.to_s] if TwitterAuth.config[oauth_option.to_s]
+    end
+
     OAuth::Consumer.new(
       config['oauth_consumer_key'],          
       config['oauth_consumer_secret'],
-      :site => TwitterAuth.base_url
+      options 
     )
   end
 
@@ -70,6 +78,10 @@ module TwitterAuth
     net.read_timeout = TwitterAuth.api_timeout
     net
   end
+
+  def self.authorize_path
+    config['authorize_path'] || '/oauth/authorize'
+  end
 end
 
 require 'twitter_auth/controller_extensions'

data/spec/twitter_auth_spec.rb

@@ -11,6 +11,12 @@ describe TwitterAuth do
       TwitterAuth.stub!(:config).and_return({'base_url' => 'https://example.com'})
       TwitterAuth.base_url.should == 'https://example.com'
     end
+
+    it 'should utilize oauth consumer settings' do
+      @config = TwitterAuth.config
+      TwitterAuth.stub!(:config).and_return(@config.merge('authorize_path' => '/somewhere_else'))
+      TwitterAuth.consumer.authorize_path.should == '/somewhere_else'
+    end
   end
 
   describe ".path_prefix" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-twitter-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-31 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency