lasso 0.1.0 → 0.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 James Daniels
+Copyright (c) 2010 James Daniels
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.rdoc → README.textile}

@@ -1,16 +1,34 @@
-= Lasso
+h1. Lasso
 
-== Identity herding with OAuth
+h2. Identity herding with OAuth
 
 Lasso makes it damn easy to add SSO to your Rails application. Just load in your configuration, add a couple associations, and you are set to hit the trail running, partner.
 
-== Gettings started
+h2. Flexibility
 
-I haven't made generators for anything but that's ok cause Lasso mostly works via decorators.
+Lasso works via decorators and attempts to have as few opinions about your setup as possible.
+
+* 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
+* 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.
 
-=== Schema
+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
+
+h2. Walk-through
+
+h3. Configuration
+
+Add this line to your environment.rb:
+
+  config.gem 'lasso'
+
+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:
 
@@ -22,7 +40,7 @@ You are going to want a model with a schema that at least looks like this, you c
     t.datetime "created_at", "updated_at", :null => false
   end
 
-=== Model
+h3. Model
 
 Go ahead and add your provider details to the model, like so:
 
@@ -45,18 +63,36 @@ Go ahead and add your provider details to the model, like so:
       end
     end
   end
+  
+You'll want to setup the association to your owner model too:
+
+  class User < ActiveRecord::Base
+    has_many :access_keys, :dependent => :destroy, :as => :owner
+    accepts_nested_attributes_for :access_keys
+  end
 
-=== Controller
+h3. Controller
 
 You are going to want a controller that is able to handle the requests:
 
   class OauthController < ApplicationController
-    ssl_required :create
-    processes_oauth_transactions_for :access_keys, 
-                                     :through  => lambda { current_user }, 
-                                     :callback => lambda { oauth_callback_url }
+    processes_oauth_transactions_for :access_keys,
+                                     :through  => lambda { current_user || User.new },
+                                     :callback => lambda { oauth_callback_url },
+                                     :conflict => :handle_existing_oauth,
+                                     :login    => :handle_oauth_login
+
+    def handle_oauth_login(user)
+      # TODO: Log in as the user
+    end
+
+    def handle_existing_oauth(user)
+      # TODO: Merge accounts or display an error
+    end
   end
-  
+
+And a controller to show the user their AccessKeys:
+
   class AccessKeysController < ApplicationController
     
     def index
@@ -67,7 +103,7 @@ You are going to want a controller that is able to handle the requests:
       @access_key = current_user.access_keys.find(params[:id])
     end
 
-    def delete
+    def destroy
       access_key = current_user.access_keys.find(params[:id])
       access_key.destroy
       redirect_to access_keys_path
@@ -75,22 +111,22 @@ You are going to want a controller that is able to handle the requests:
     
   end
 
-=== Routes
+h3. Routes
 
 And maybe some routes:
 
-  map.resources :access_keys, :only => [:index, :show, :delete]
+  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', :protocol => 'https'
+  map.oauth_callback  '/:service/oauth/callback', :controller => 'oauth', :action => 'create'
 
-=== Usage
+h3. Usage
 
 Now OAuth is as simple as adding a link:
 
   <%= link_to 'Integrate your account with your 37signals account', oauth_authorize_path(:service => '37signals') %>
 
-== Note on Patches/Pull Requests
+h3. Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -100,6 +136,6 @@ Now OAuth is as simple as adding a link:
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+h2. Copyright
 
 Copyright (c) 2010 James Daniels. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lasso.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lasso}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Daniels"]
@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.email = %q{james@marginleft.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.textile"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.textile",
      "Rakefile",
      "VERSION",
      "lasso.gemspec",

data/lib/lasso/controller/instance.rb

@@ -7,19 +7,30 @@ module Lasso
       end
 
       def create
-        @oauth = type.new(:service => params[:service])
-        #@oauth = oauth_settings[:through].call.send(oauth_model).new(:service => params[:service])
-        parse_response
         @owner = oauth_settings[:through].bind(self).call
-        nested = {"#{oauth_model}_attributes" => [@oauth.attributes]}
-        if @owner.update_attributes(nested)
-          redirect_to send("#{oauth_model.to_s.singularize}_path", @owner.send(oauth_model).last)
+        @oauth = type.new(:service => params[:service], :owner => @owner)
+        parse_response
+        if @oauth.duplicate
+          if @owner.nil? || @owner.new_record?
+            send(oauth_settings[:login], @oauth.duplicate.owner)
+          elsif @owner == @oauth.duplicate.owner
+            @oauth.duplicate.destroy
+            save_the_oauth
+          else
+            send(oauth_settings[:conflict], @oauth.duplicate.owner)
+          end
         else
-          render :text => @oauth.to_yaml
+          save_the_oauth
         end
       end
 
     protected
+    
+      def save_the_oauth
+        nested = {"#{oauth_model}_attributes" => [@oauth.attributes]}
+        @owner.update_attributes!(nested)
+        redirect_to send("#{oauth_model.to_s.singularize}_path", @owner.send(oauth_model).last)
+      end
 
       def type
         "OAuth#{version_one? && 'One' || 'Two'}#{oauth_model_constant}".constantize

data/lib/lasso/model/instance.rb

@@ -7,6 +7,9 @@ module Lasso
       def set_type
         self.type ||= "OAuth#{config(:oauth_version) == 1 && 'One' || 'Two'}#{self.class.to_s}"
       end
+      def duplicate
+        self.class.find(:first, :conditions => ['service = ? and token_a = ?', service, token_a])
+      end
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Daniels
@@ -65,12 +65,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.textile
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.textile
 - Rakefile
 - VERSION
 - lasso.gemspec