authpwn_rails 0.10.8 → 0.10.9

data/.travis.yml

@@ -2,5 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-2.0
-  - jruby
+  - rbx-head

data/VERSION

@@ -1 +1 @@
-0.10.8
+0.10.9

data/authpwn_rails.gemspec

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

data/lib/authpwn_rails/generators/templates/session/new.html.erb

@@ -1,6 +1,9 @@
 <% if flash[:notice] %>
 <p class="notice"><%= flash[:notice] %></p>
 <% end %>
+<% if flash[:alert] %>
+<p class="alert"><%= flash[:alert] %></p>
+<% end %>
 
 <% if @redirect_url %>
 <p>

data/lib/authpwn_rails/generators/templates/session/password_change.html.erb

@@ -3,6 +3,10 @@
 <% if flash[:notice] %>
 <p class="notice"><%= flash[:notice] %></p>
 <% end %>
+<% if flash[:alert] %>
+<p class="alert"><%= flash[:alert] %></p>
+<% end %>
+
 
 <%= form_for @credential, :url => change_password_session_path,
                           :as => :credential, :method => :post do |f| %>

data/lib/authpwn_rails/session_controller.rb

@@ -71,12 +71,12 @@ module SessionController
                             :csrf => form_authenticity_token }
         end
       else
-        notice = bounce_notice_text auth
+        error_text = bounce_notice_text auth
         format.html do
-          redirect_to new_session_url, :flash => { :notice => notice,
+          redirect_to new_session_url, :flash => { :alert => error_text,
               :auth_redirect_url => @redirect_url }
         end
-        format.json { render :json => { :error => auth, :text => notice } }
+        format.json { render :json => { :error => auth, :text => error_text } }
       end
     end
   end
@@ -94,14 +94,14 @@ module SessionController
     respond_to do |format|
       if user
         format.html do
-          redirect_to new_session_url, :notice =>
+          redirect_to new_session_url, :alert =>
               'Please check your e-mail for instructions'
         end
         format.json { render :json => { } }
       else
-        notice = 'Invalid e-mail'
+        error_text = 'Invalid e-mail'
         format.html do
-          redirect_to new_session_url, :notice => notice
+          redirect_to new_session_url, :alert => error_text
         end
         format.json do
           render :json => { :error => :not_found, :text => notice }
@@ -119,13 +119,13 @@ module SessionController
     end
         
     if auth.is_a? Symbol
-      notice = bounce_notice_text auth
-      respond_to do |format|        
+      error_text = bounce_notice_text auth
+      respond_to do |format|
         format.html do
-          redirect_to new_session_url, :flash => { :notice => notice,
+          redirect_to new_session_url, :flash => { :alert => error_text,
               :auth_redirect_url => session_url }
         end
-        format.json { render :json => { :error => auth, :text => notice } }
+        format.json { render :json => { :error => auth, :text => error_text } }
       end
     else
       self.current_user = auth
@@ -190,7 +190,7 @@ module SessionController
         success = @credential.update_attributes params[:credential]
       else
         success = false
-        flash[:notice] = 'Incorrect old password. Please try again.'
+        flash[:alert] = 'Incorrect old password. Please try again.'
       end
     else
       @credential = Credentials::Password.new params[:credential]

data/test/session_controller_api_test.rb

@@ -105,7 +105,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_redirected_to new_session_url
     assert_nil assigns(:current_user), 'instance variable'
     assert_nil session_current_user, 'session'
-    assert_match(/Invalid/, flash[:notice])
+    assert_match(/Invalid/, flash[:alert])
   end
   
   test "create does not log in blocked accounts" do
@@ -115,7 +115,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_redirected_to new_session_url
     assert_nil assigns(:current_user), 'instance variable'
     assert_nil session_current_user, 'session'
-    assert_match(/ blocked/, flash[:notice])
+    assert_match(/ blocked/, flash[:alert])
   end
 
   test "create by json does not log in with bad password" do
@@ -147,7 +147,7 @@ class SessionControllerApiTest < ActionController::TestCase
     post :create, :email => @email_credential.email, :password => 'fail',
                   :redirect_url => url
     assert_redirected_to new_session_url
-    assert_not_nil flash[:notice]
+    assert_match(/Invalid /, flash[:alert])
     assert_equal url, flash[:auth_redirect_url]
   end
 
@@ -156,7 +156,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_redirected_to new_session_url
     assert_nil assigns(:current_user), 'instance variable'
     assert_nil session_current_user, 'session'
-    assert_not_nil flash[:notice]
+    assert_match(/Invalid /, flash[:alert])
   end
 
   test "token logs in with good token" do
@@ -191,7 +191,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_redirected_to new_session_url
     assert_nil assigns(:current_user), 'instance variable'
     assert_nil session_current_user, 'session'
-    assert_match(/Invalid/, flash[:notice])
+    assert_match(/Invalid/, flash[:alert])
   end
   
   test "token does not log in blocked accounts" do
@@ -203,7 +203,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_redirected_to new_session_url
     assert_nil assigns(:current_user), 'instance variable'
     assert_nil session_current_user, 'session'
-    assert_match(/ blocked/, flash[:notice])
+    assert_match(/ blocked/, flash[:alert])
   end
 
   test "token by json does not log in with random token" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
-  requirement: &23571660 !ruby/object:Gem::Requirement
+  requirement: &22640120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *23571660
+  version_requirements: *22640120
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23570400 !ruby/object:Gem::Requirement
+  requirement: &22638700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *23570400
+  version_requirements: *22638700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23569240 !ruby/object:Gem::Requirement
+  requirement: &22638040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23569240
+  version_requirements: *22638040
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &23568460 !ruby/object:Gem::Requirement
+  requirement: &22637400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *23568460
+  version_requirements: *22637400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23585100 !ruby/object:Gem::Requirement
+  requirement: &22636660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *23585100
+  version_requirements: *22636660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23136560 !ruby/object:Gem::Requirement
+  requirement: &22636020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23136560
+  version_requirements: *22636020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &21228600 !ruby/object:Gem::Requirement
+  requirement: &22635420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21228600
+  version_requirements: *22635420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20774920 !ruby/object:Gem::Requirement
+  requirement: &22634800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *20774920
+  version_requirements: *22634800
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3364552790739807555
+      hash: -4411019045775612342
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: