authpwn_rails 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/authpwn_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authpwn_rails}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-11-25}
+  s.date = %q{2011-03-04}
   s.description = %q{Works with Facebook.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/pwnall/authpwn_rails}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{User authentication for Rails 3 applications.}
   s.test_files = [
     "test/cookie_controller_test.rb",
@@ -76,7 +76,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/authpwn_rails/generators/templates/session_controller_test.rb

@@ -13,10 +13,24 @@ class SessionControllerTest < ActionController::TestCase
     assert_select 'a', 'Log out'
   end
   
+  test "user logged in JSON request" do
+    set_session_current_user @user
+    get :show, :format => 'json'
+    
+    assert_equal @user.email,
+        ActiveSupport::JSON.decode(response.body)['user']['email']
+  end
+  
   test "application welcome page" do
     get :show
     
     assert_equal User.count, assigns(:user_count)
     assert_select 'a', 'Log in'
   end
+
+  test "user not logged in with JSON request" do
+    get :show, :format => 'json'
+
+    assert_equal({}, ActiveSupport::JSON.decode(response.body))
+  end
 end

data/lib/authpwn_rails/session.rb

@@ -88,10 +88,20 @@ module SessionControllerInstanceMethods
     @user = current_user || User.new
     if @user.new_record?
       welcome
-      render :action => :welcome unless performed?
+      unless performed?
+        respond_to do |format|
+          format.html { render :action => :welcome }
+          format.json { render :json => {} }
+        end
+      end
     else      
       home
-      render :action => :home unless performed?
+      unless performed?
+        respond_to do |format|
+          format.html { render :action => :home }
+          format.json { render :json => @user }
+        end
+      end
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authpwn_rails
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: User authentication for Rails 3 applications.