simple_user 0.1.3.3 → 0.1.3.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTUxMTJkZThjYWIyNjZlZmQwYjFkOGQ0ZmE0Y2NhM2ZiODM4YjI4Yw==
+    NDU3ODc3MmFjMDY1MWYxYmNmMDc3ZjVhMjUyMGI0ZTE2MTUyNTEwNg==
   data.tar.gz: !binary |-
-    NWIzMWNiMGUyNDk0ZDE1MWYwZjgzMzFmNmJmMDRmZWRmMTEwOWUyYg==
+    OTk2ZTIyOWNhMjFkNjU4NTJjMTdmYjcyMzQ0NDExZDJiNzZkNmY2NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIxNGJkN2I5MjcxOTkwMjNmYzRlM2VmN2U0ZDFjYjA3N2M0OGNjYjhhNGI2
-    N2ViMTc4MmUyMmY2NjZlYmIxOWVkYWJhMzNhZTk3Y2I5ZmMxMDk3MjkzNDU1
-    MzY2NWIzYmY4M2YxM2UwMzlhMGUwNDQ3Nzg5MzU5ZWRjMWRkNTY=
+    ZTBkYzJkOTNlZjFkN2ExYWM0NTFhYzQxYmEwMGZlMzNiZTA0M2QxZTJkZGI5
+    Njg2NDA5ZWI0ZTUyMDlmYTNlNWJiOGZkM2FjMmIzODIzNzQ0ZTRjMzRkOGM5
+    NDgxNDBmMDQzMDY4NWEyODg2YmU5ZmQzOGZiMjM1Y2E4OTEzNzM=
   data.tar.gz: !binary |-
-    ZGRmZmE4YzI4ZTNmM2RkZTcxYTM4NGY3NjdlOWE2MWIwNzQ3NTAwNjQwNDg1
-    YzRjZWFjMzg0OGZjNDczYzk0NDI5MmQ4Y2QzYTU4M2U3ODA5MGQyZjkzZjAx
-    ZmVjMTg2ZWYxMjA3NGRmZTQ4OWY4ODBkM2UzOGY2MTUyYjE3ZDU=
+    YmVkOTU2NWEzZmM4YTU5MmE0M2ZhOWI0MmNmMjc1NzdhMDNjNDdkNjFhNWYx
+    YmFlYjQ0ZjZjZWNlYTZiZGMzNDFmNTg1MTdhMmE0ZWE1NTljMjljYmVhYzI4
+    MjE4MjM4YThlYjVhNDU5YzkxNTc3YWM0ZDc2MWFkMzA4NzZlNGE=

data/README.rdoc

@@ -7,7 +7,7 @@ Make avaiable to your users for loggin with Devise or Facebook, and manage them
 
 == Installation
 
-1. Add to your gemfile: <tt>gem 'simple_user', :git => 'git://github.com/pablomarti/simple_user.git'</tt>
+1. Add to your gemfile: <tt>gem 'simple_user'</tt>
 
 2. Run <tt>bundle</tt>
 
@@ -19,7 +19,9 @@ Make avaiable to your users for loggin with Devise or Facebook, and manage them
 
 6. Add to your routes.rb: <tt>mount SimpleUser::Engine => "/simple_user", :as => "simple_user"</tt>
 
-7. Watch the test/dummy for an example of the links
+7. Add to your application.js: <tt>//= require simple_user/application</tt>
+
+8. Watch the test/dummy for an example of the links
 
 
 == TODO

data/app/controllers/simple_user/admin_users/sessions_controller.rb

@@ -9,8 +9,7 @@ module SimpleUser
           if resource.banned?
             sign_out resource
             flash.delete(:notice)
-            flash[:error] = "This account has been suspended."
-            root_path
+            flash[:error] = "This account has been suspended."          
           else
             ENV['ADMIN_PATH']
           end

data/app/controllers/simple_user/application_controller.rb

@@ -3,5 +3,11 @@ module SimpleUser
 		
 		layout ENV['APPLICATION_LAYOUT']
 
+		before_filter :set_user_return_to
+
+		def set_user_return_to
+			session[:return_to] = request.referer
+		end
+
 	end
 end

data/app/controllers/simple_user/auth_controller.rb

@@ -8,19 +8,30 @@ module SimpleUser
       if authentication
         flash[:notice] = "Signed in successfully."
         sign_in(:user, authentication.user)
-        redirect_to root_url
+        redirect_after_create     
       else
         user = User.build_new_auth(auth)
         if user.save(:validate => false)
           flash[:notice] = "Account created and signed in successfully."
           sign_in(:user, user)
-          redirect_to root_url
+          redirect_after_create
         else
           flash[:error] = "Error while creating the user account. Please try again."
-          redirect_to root_url
+          redirect_after_create
         end
       end
     end
 
+    def redirect_after_create
+      if ENV['REDIRECT_USER_AFTER_SIGNIN'] == 'false' || !defined? session[:return_to] || session[:return_to] == "/" ||  session[:return_to].nil?
+        session[:return_to] = "/"
+        redirect_to root_url
+      else
+        return_to = session[:return_to]
+        session[:return_to] = "/"
+        redirect_to return_to
+      end   
+    end
+
   end
 end

data/app/controllers/simple_user/users/sessions_controller.rb

@@ -1,6 +1,11 @@
 module SimpleUser
   class Users::SessionsController < Devise::SessionsController
 
+    def new
+       session[:return_to] = "/"
+       super
+    end
+
     def create
       self.resource = warden.authenticate!(auth_options)
       #self.resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#failure")
@@ -14,7 +19,6 @@ module SimpleUser
     #end
 
     protected
-
         def after_sign_in_path_for(resource)
           if resource.banned?
             sign_out resource
@@ -22,7 +26,14 @@ module SimpleUser
             flash[:error] = "This account has been suspended."
             root_path
           else
-            super
+            if ENV['REDIRECT_USER_AFTER_SIGNIN'] == 'false' || !defined? session[:return_to] || session[:return_to] == "/" ||  session[:return_to].nil?
+              session[:return_to] = "/"
+              super
+            else
+              return_to = session[:return_to]
+              session[:return_to] = "/"
+              return_to
+            end
           end
         end
 

data/app/models/simple_user/user.rb

@@ -80,6 +80,19 @@ module SimpleUser
       !active
     end
 
+    def social_picture(provider = "facebook", width = 160, height = 129)
+      auth = authentications.where(:provider => provider).first rescue nil
+
+      tmp_image = case provider
+            when "facebook"
+                auth.nil? ? "" : "http://graph.facebook.com/#{auth.uid}/picture?width=#{width}&height=#{height}"
+            else
+                ""
+      end
+
+      return tmp_image
+    end
+
     private
       def generate_random(str_length)
         charlist = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a

data/app/views/simple_user/users/sessions/new.html.erb

@@ -1,6 +1,10 @@
-<h2>Sign in</h2>
+<h2>Sign In</h2>
 
 <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <% if !flash[:alert].nil? %>
+  	<%= flash[:alert] %>
+  <% end %>
+
   <div class="form-inputs">
     <%= f.input :username, :required => true, :autofocus => true %>
     <%= f.input :password, :required => true %>

data/lib/generators/simple_user/install/templates/simple_user.yml

@@ -1,3 +1,4 @@
 APPLICATION_LAYOUT: 'application'
 ADMIN_LAYOUT: 'application'
-ADMIN_PATH: '/'
+ADMIN_PATH: '/'
+REDIRECT_USER_AFTER_SIGNIN: 'false'

data/lib/simple_user/version.rb

@@ -1,3 +1,3 @@
 module SimpleUser
-  VERSION = "0.1.3.3"
+  VERSION = "0.1.3.8"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -4,6 +4,11 @@ class ApplicationController < ActionController::Base
 
 	#before_filter :authenticate_user!
 	before_filter :banned?
+	before_filter :set_user_return_to
+
+	def set_user_return_to
+		session[:return_to] = request.referer
+	end
 
 	rescue_from CanCan::AccessDenied do |exception|
 		flash[:error] = "Access denied"

data/test/dummy/app/controllers/welcome_controller.rb

@@ -1,4 +1,9 @@
 class WelcomeController < ApplicationController
+  
   def index
   end
+
+  def test_redirect
+  end
+  
 end

data/test/dummy/app/views/simple_user/users/sessions/new.html.erb

@@ -1,6 +1,10 @@
-<h2>Sign in</h2>
+<h2>Sign In</h2>
 
 <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <% if !flash[:alert].nil? %>
+  	<%= flash[:alert] %>
+  <% end %>
+
   <div class="form-inputs">
     <%= f.input :username, :required => true, :autofocus => true %>
     <%= f.input :password, :required => true %>

data/test/dummy/app/views/welcome/test_redirect.html.erb

@@ -0,0 +1 @@
+<h1>TEST REDIRECTS</h1>

data/test/dummy/config/routes.rb

@@ -2,6 +2,8 @@ Rails.application.routes.draw do
 
   mount SimpleUser::Engine => "/simple_user", :as => "simple_user"
 
+  get 'welcome/test_redirect'
+  
   root :to => 'welcome#index'
 
 end

data/test/dummy/config/simple_user.yml

@@ -0,0 +1,4 @@
+APPLICATION_LAYOUT: 'application'
+ADMIN_LAYOUT: 'application'
+ADMIN_PATH: '/'
+REDIRECT_USER_AFTER_SIGNIN: 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_user
 version: !ruby/object:Gem::Version
-  version: 0.1.3.3
+  version: 0.1.3.8
 platform: ruby
 authors:
 - Pablo Marti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -244,6 +244,7 @@ files:
 - test/dummy/public/422.html
 - test/dummy/app/views/application/_menu_admin_users.html.erb
 - test/dummy/app/views/application/_menu_users.html.erb
+- test/dummy/app/views/welcome/test_redirect.html.erb
 - test/dummy/app/views/welcome/index.html.erb
 - test/dummy/app/views/simple_user/application/_menu_admin_users.html.erb
 - test/dummy/app/views/simple_user/application/_menu_users.html.erb
@@ -345,6 +346,7 @@ files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/simple_user.yml
 - test/dummy/config/database.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb
@@ -396,6 +398,7 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/app/views/application/_menu_admin_users.html.erb
 - test/dummy/app/views/application/_menu_users.html.erb
+- test/dummy/app/views/welcome/test_redirect.html.erb
 - test/dummy/app/views/welcome/index.html.erb
 - test/dummy/app/views/simple_user/application/_menu_admin_users.html.erb
 - test/dummy/app/views/simple_user/application/_menu_users.html.erb
@@ -497,6 +500,7 @@ test_files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/simple_user.yml
 - test/dummy/config/database.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb