Merge branch 'new-example' of github.com:twotoasters/RestKit into new-example

This commit is contained in:
daniel
2011-01-07 17:44:38 -05:00
4 changed files with 10 additions and 8 deletions

View File

@@ -30,6 +30,5 @@ gem 'ruby-debug'
# gem 'webrat'
# end
source "http://rubygems.org"
gem 'authlogic', :require => 'authlogic'
gem 'authlogic', '2.1.6', :require => 'authlogic'
gem 'paperclip'

View File

@@ -1,5 +1,4 @@
GEM
remote: http://rubygems.org/
remote: http://rubygems.org/
specs:
abstract (1.0.0)
@@ -82,7 +81,7 @@ PLATFORMS
ruby
DEPENDENCIES
authlogic
authlogic (= 2.1.6)
paperclip
rails (= 3.0.3)
ruby-debug

View File

@@ -6,7 +6,7 @@ class UsersController < ApplicationController
user_session = UserSession.new(params)
if user_session.save
user = user_session.user
render :json => {:login => user.login, :single_access_token => user.single_access_token}
render :json => {:login => user.login, :single_access_token => user.single_access_token, :user_id => user.id}
else
render :json => {:error => "Invalid Login"}
end
@@ -15,7 +15,7 @@ class UsersController < ApplicationController
def signup
user = User.new(params[:user])
if user.save
render :json => {:login => user.login, :single_access_token => user.single_access_token}
render :json => {:login => user.login, :single_access_token => user.single_access_token, :user_id => user.id}
else
render :json => {:errors => user.errors.full_messages}
end

View File

@@ -1,8 +1,12 @@
curl -d "user[login]=jeremy&user[password]=password&user[email]=jeremy@twotoasters.com&user[password_confirmation]=password" http://localhost:3000/signup
=> {"single_access_token":"LvQmmzh6je1XzhC9XASg","login":"jeremy"}
curl -d "user[login]=jeremy&user[password]=password&user[email]=jeremy@twotoasters.com&user[password_confirmation]=password" http://discussionboard.heroku.com/signup
=> {"single_access_token":"onzn83RGNV93AQWPIY7W","login":"jeremy"}
curl -d "login=jeremy&password=password" http://localhost:3000/signup
=> {"single_access_token":"LvQmmzh6je1XzhC9XASg","login":"jeremy"}
curl -d "login=jeremy&password=password" http://localhost:3000/login
{"single_access_token":"LvQmmzh6je1XzhC9XASg","user_id":1,"login":"jeremy"}
curl -d "login=jeremy&password=password" http://discussionboard.heroku.com/login
set the SingleAccessToken header to the token (LvQmmzh6je1XzhC9XASg)