lasso 0.2.0 → 0.3.0

data/README.textile

@@ -1,3 +1,5 @@
+!{float:right}http://www.jamesdaniels.net/b/lasso-logo.png!
+
 h1. Lasso
 
 h2. Identity herding with OAuth
@@ -11,11 +13,20 @@ Lasso works via decorators and attempts to have as few opinions about your setup
 * Can handle one-to-many associations with owners/tokens
 * Can handle multiple tokens from the same provider
 * Can handle any provider (OAuth 1 or 2) seamlessly by editing a simple configuration
+* Seamlessly handles the 6 permutations of authentication (see below)
 * Isn't hard coded to work with one authentication library
 * Works well with STI or multiple token classes/controllers
 
 Lasso creates OAuth tokens via nested attributes on whichever object you deem to be the owner of those keys (e.g, current_user, current_user.account, User.new) which makes it one-to-many and quite flexible.
 
+Cases that Lasso gives you hooks for:
+
+# New token + no user logged in = Registration
+# New token + user is logged in = Identity claim
+# Existing token + no user logged in = Log in
+# Existing token + owner logged in = Refresh secret/refresh keys
+# Existing token + someone else logged in = Pass to conflict handler
+
 h3. Gettings started
 
 I haven't made generators for anything, yet. Feel free to skim this README in addition to checking out the "Lasso/Authlogic example application that I've built.":http://github.com/jamesdaniels/lasso-example
@@ -32,6 +43,7 @@ h3. Schema
 
 You are going to want a model with a schema that at least looks like this, you can call it what you wish:
 
+<pre>
   create_table :access_keys, :force => true do |t|
     t.string   "token_a", "token_b", :limit => 999
     t.string   "service", "type", :null => false
@@ -39,11 +51,13 @@ You are going to want a model with a schema that at least looks like this, you c
     t.integer  "owner_id"
     t.datetime "created_at", "updated_at", :null => false
   end
+</pre>
 
 h3. Model
 
 Go ahead and add your provider details to the model, like so:
 
+<pre>
   class AccessKey < ActiveRecord::Base
     oauth do
       provider '37signals' do
@@ -63,18 +77,22 @@ Go ahead and add your provider details to the model, like so:
       end
     end
   end
-  
+</pre>
+    
 You'll want to setup the association to your owner model too:
 
+<pre>
   class User < ActiveRecord::Base
     has_many :access_keys, :dependent => :destroy, :as => :owner
     accepts_nested_attributes_for :access_keys
   end
-
+</pre>
+  
 h3. Controller
 
 You are going to want a controller that is able to handle the requests:
 
+<pre>
   class OauthController < ApplicationController
     processes_oauth_transactions_for :access_keys,
                                      :through  => lambda { current_user || User.new },
@@ -90,9 +108,11 @@ You are going to want a controller that is able to handle the requests:
       # TODO: Merge accounts or display an error
     end
   end
+</pre>
 
 And a controller to show the user their AccessKeys:
 
+<pre>
   class AccessKeysController < ApplicationController
     
     def index
@@ -110,21 +130,26 @@ And a controller to show the user their AccessKeys:
     end
     
   end
+</pre>
 
 h3. Routes
 
 And maybe some routes:
 
+<pre>
   map.resources :access_keys, :only => [:index, :show, :destroy]
   
   map.oauth_authorize '/:service/oauth/start',    :controller => 'oauth', :action => 'new'
   map.oauth_callback  '/:service/oauth/callback', :controller => 'oauth', :action => 'create'
+</pre>
 
 h3. Usage
 
 Now OAuth is as simple as adding a link:
 
+<pre>
   <%= link_to 'Integrate your account with your 37signals account', oauth_authorize_path(:service => '37signals') %>
+</pre>
 
 h3. Note on Patches/Pull Requests
  

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "james@marginleft.com"
     gem.homepage = "http://github.com/jamesdaniels/lasso"
     gem.authors = ["James Daniels"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "oauth2", ">= 0.0.10"
-    gem.add_dependency "oauth"
+    gem.add_development_dependency "rspec", "~> 1.2.9"
+    gem.add_dependency "oauth2", "~> 0.1.0"
+    gem.add_dependency "oauth", "~> 0.4.4"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lasso.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lasso}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Daniels"]
-  s.date = %q{2010-06-26}
+  s.date = %q{2010-11-12}
   s.description = %q{Identity herding with OAuth}
   s.email = %q{james@marginleft.com}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jamesdaniels/lasso}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Identity herding with OAuth}
   s.test_files = [
     "spec/controllers.rb",
@@ -59,19 +59,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.0.10"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<oauth2>, [">= 0.0.10"])
-      s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<oauth2>, ["~> 0.1.0"])
+      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<oauth2>, [">= 0.0.10"])
-    s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<oauth2>, ["~> 0.1.0"])
+    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
   end
 end
 

data/lib/lasso/controller/instance.rb

@@ -57,7 +57,7 @@ module Lasso
 
       def redirect
         if version_one?
-          @request_token = @oauth.consumer.get_request_token(:oauth_callback => oauth_settings[:callback].bind(self).call)
+          @request_token = @oauth.client.get_request_token(:oauth_callback => oauth_settings[:callback].bind(self).call)
           session[:request_token] = @request_token
           redirect_to @request_token.authorize_url
         else
@@ -66,4 +66,4 @@ module Lasso
       end
     end
   end
-end
+end

data/lib/lasso/model/oauth_one.rb

@@ -7,32 +7,14 @@ def define_oauth_one(parent)
 
       validates_presence_of :oauth_token, :oauth_token_secret
 
-      def consumer
-        @consumer ||= OAuth::Consumer.new(config(:key), config(:secret), :site => config(:site), :request_token_path => config(:request_token_path), :authorize_path => config(:authorize_path), :access_token_path => config(:access_token_path))
-      end
-
       def client
-        @client ||= case service
-          when 'linkedin'
-            LinkedIn::Client.new(config(:key), config(:secret))
-          when 'twitter'
-            Twitter::OAuth.new(config(:key), config(:secret))
-        end
+        @client ||= OAuth::Consumer.new(config(:key), config(:secret), :site => config(:site), :request_token_path => config(:request_token_path), :authorize_path => config(:authorize_path), :access_token_path => config(:access_token_path))
       end
 
       def access
-        unless @access
-          client.authorize_from_access(oauth_token, oauth_token_secret)
-          @access ||= case service
-            when 'linkedin'
-              client
-            when 'twitter'
-              Twitter::Base.new(client)
-          end
-        end
-        @access
+        @access ||= OAuth::AccessToken.new(client, oauth_token, oauth_token_secret)
       end
 
     end
 OAUTHONE
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lasso
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Daniels
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-26 00:00:00 -04:00
+date: 2010-11-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,26 +38,32 @@ dependencies:
   name: oauth2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 10
-        version: 0.0.10
+        version: 0.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: oauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id003
 description: Identity herding with OAuth
@@ -101,23 +110,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Identity herding with OAuth