authpwn_rails 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/authpwn_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authpwn_rails}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/lib/authpwn_rails/session.rb

@@ -115,12 +115,14 @@ module SessionControllerInstanceMethods
     respond_to do |format|
       if current_user
         format.html { redirect_to @redirect_url }
+        format.json { render :json => current_user }
       else
+        notice = 'Invalid e-mail or password'
         format.html do
           redirect_to new_session_url, :flash => {
-            :notice => 'Invalid e-mail or password',
-            :auth_redirect_url => @redirect_url }
+            :notice => notice, :auth_redirect_url => @redirect_url }
         end
+        format.json { render :json => { :error => notice} }
       end
     end
   end
@@ -128,7 +130,10 @@ module SessionControllerInstanceMethods
   # DELETE /session
   def destroy
     self.current_user = nil
-    redirect_to session_url
+    respond_to do |format|
+      format.html { redirect_to session_url }
+      format.json { head :ok }
+    end
   end
 
   # Hook for setting up the home view.

data/test/session_controller_api_test.rb

@@ -20,6 +20,14 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_equal User.count, assigns(:user_count),
                  'welcome controller method not called'
   end
+
+  test "show json renders empty object without a user" do
+    get :show, :format => 'json'
+    assert_response :ok
+    assert_equal({}, ActiveSupport::JSON.decode(response.body))
+    assert_equal User.count, assigns(:user_count),
+                 'welcome controller method not called'
+  end
   
   test "show renders home with a user" do
     set_session_current_user @user
@@ -29,6 +37,15 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_equal @user, assigns(:user), 'home controller method not called'
   end
   
+  test "show json renders user when logged in" do
+    set_session_current_user @user
+    get :show, :format => 'json'
+    assert_response :ok
+    data = ActiveSupport::JSON.decode response.body
+    assert_equal @user.email, data['user']['email']
+    assert_equal @user, assigns(:user), 'home controller method not called'
+  end
+  
   test "new redirects homes with a user" do
     set_session_current_user @user
     get :new
@@ -64,6 +81,16 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_equal @user, assigns(:current_user), 'instance variable'
     assert_equal @user, session_current_user, 'session'
   end
+
+  test "create by json logs in with good account details" do
+    post :create, :user => { :email => @user.email, :password => 'password' },
+                  :format => 'json'
+    assert_response :ok
+    data = ActiveSupport::JSON.decode response.body
+    assert_equal @user.email, data['user']['email']
+    assert_equal @user, assigns(:current_user), 'instance variable'
+    assert_equal @user, session_current_user, 'session'
+  end
   
   test "create redirects properly with good account details" do
     url = 'http://authpwn.redirect.url'
@@ -80,6 +107,16 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_not_nil flash[:notice]
   end
 
+  test "create by json does not log in with bad password" do
+    post :create, :user => { :email => @user.email, :password => 'fail' },
+                  :format => 'json'
+    assert_response :ok
+    data = ActiveSupport::JSON.decode response.body
+    assert_match(/invalid/i , data['error'])
+    assert_nil assigns(:current_user), 'instance variable'
+    assert_nil session_current_user, 'session'
+  end
+  
   test "create maintains redirect_url for bad logins" do
     url = 'http://authpwn.redirect.url'
     post :create, :user => { :email => @user.email, :password => 'fail' },
@@ -103,5 +140,13 @@ class SessionControllerApiTest < ActionController::TestCase
     
     assert_redirected_to session_url
     assert_nil assigns(:current_user)
-  end  
+  end
+  
+  test "logout by json" do
+    set_session_current_user @user
+    delete :destroy, :format => 'json'
+    
+    assert_response :ok
+    assert_nil assigns(:current_user)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authpwn_rails
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Victor Costan