snapuser 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8099c1c9b21a13dc33d528f10f69badedddd463
-  data.tar.gz: 43a55ea4fa6c7957bbf76ebb611691e72f756150
+  metadata.gz: 8b68c03b024e5cb5dfa5eb265b3a91956bba8f31
+  data.tar.gz: 42d487e79165055c859670013c03aa2b7ecd7e4f
 SHA512:
-  metadata.gz: 7bd47bda42d7cf0d2ec1e16aec2b5dd8ed0b59130fa6f6fd177217f3694818de7d99db6aee007a61a7aadaf023843036b0ead69248dba08f47319c38184e9f96
-  data.tar.gz: f0cda7e7137c3f5c449be8d1f088f45c18a888e7baa9695589f399ebb077205c18c93063f9fb206abaa30dc49f6d3052984587710942e6ee09f814ecdad5b1d2
+  metadata.gz: 84c708628437a8e2b5cc27999964e7c0163062f84987ddb3c97950b6dd168f013757ef462d79d61d0b17db0e765ab91786ca655b79679c04a3d4a01318b15de1
+  data.tar.gz: 3d6ad9a363bea08144061f512649fcd4553cf00ab6b94df11ddfc3039beb29b0ed1fda70d8f46f56fbaa6bd4a7ba9355787d0517a6b28f58e716819c86013f12

data/app/controllers/admin/users_controller.rb

@@ -1,5 +1,5 @@
 class Admin::UsersController < ApplicationController
-	before_action { |c| c.authorize_level(1) }
+	before_action { |c| c.authorize_level(Snapuser.superuser_level) }
 	layout 'admin'
 
 	def index
@@ -14,7 +14,7 @@ class Admin::UsersController < ApplicationController
 	def create
 		@user = User.new(user_params)
 		if @user.save
-			redirect_to admin_users_path, success: t('user.admin.new.success')
+			redirect_to admin_users_path, success: t('snapuser.admin.new.success')
 		else
 			render 'new'
 		end
@@ -27,7 +27,7 @@ class Admin::UsersController < ApplicationController
 	def update
 		@user = User.find(params[:id])
 		if @user.update_attributes(user_params)
-			redirect_to admin_users_path, success: t('user.admin.edit.success')
+			redirect_to admin_users_path, success: t('snapuser.admin.edit.success')
 		else
 			render 'edit'
 		end
@@ -35,7 +35,7 @@ class Admin::UsersController < ApplicationController
 
 	def destroy
 		User.find(params[:id]).destroy
-		redirect_to admin_activities_path, success: t('user.admin.destroy.success')
+		redirect_to admin_activities_path, success: t('snapuser.admin.destroy.success')
 	end
 
 	private

data/app/controllers/sessions_controller.rb

@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-	before_action :connected?, except: :destroy
+	before_action :redirect_if_connected, except: :destroy
 
 	def new
 	end
@@ -7,22 +7,22 @@ class SessionsController < ApplicationController
 	def create
 		@user = User.where("lower(name) = ?", params[:session][:name].strip.downcase).first
 		if @user && @user.authenticate(params[:session][:password])
-			params[:session][:remember_me] == '1' ? sign_in_permanent(@user) : sign_in(@user)
-			redirect_back_or profile_path, success: t('session.new.success')
+			sign_in(@user, permanent: params[:session][:remember_me] == "1")
+			redirect_back_or profile_path, success: t('snapuser.session.success')
 		else
-			flash.now[:error] = t('session.new.error')
+			flash.now[:error] = t('snapuser.session.error')
 			render 'new'
 		end
 	end
 
 	def destroy
 		sign_out
-		redirect_to root_path, success: t('session.destroy.success')
+		redirect_to root_path, success: t('snapuser.session.destroy.success')
 	end
 
 	private
 
-	def connected?
+	def redirect_if_connected
 		redirect_to profile_path unless current_user.nil?
 	end
 

data/app/controllers/users_controller.rb

@@ -1,11 +1,7 @@
 class UsersController < ApplicationController
-  before_action except: [:profile] { |c| c.authorize_level(2) }
-  before_action only: [:profile] { |c| c.authorize_level(4) }
+  before_action { |c| c.authorize_level(Snapuser.can_edit) }
   layout 'admin'
 
-  def profile
-  end
-
   def edit
     @user = current_user
   end
@@ -14,7 +10,7 @@ class UsersController < ApplicationController
     @user = current_user
     if @user.update_attributes(user_params)
       sign_in @user
-      redirect_to profile_path, success: t('user.edit.success')
+      redirect_to profile_path, success: t('snapuser.edit.success')
     else
       render 'new'
     end

data/app/helpers/sessions_helper.rb

@@ -6,21 +6,10 @@ module SessionsHelper
 	# 	- a user to sign in
 	# * *Returns*	:
 	#
-	def sign_in(user)
-		cookies[:remember_token] = user.remember_token
-		self.current_user = user
-	end
-
-	# Sign in a user with a cookie (remove after 2 months)
-	# 
-	# * *Args*		:
-	# 	- a user to sign in
-	# * *Returns*	:
-	#
-	def sign_in_permanent(user)
-		cookies[:remember_token] = { value: user.remember_token, expires: Time.now + 2592000 }
-		self.current_user = user
-	end
+	def sign_in(user, permanent: false)
+    cookies[:remember_token] = { value: user.remember_token, expires: (Time.now + 2592000 if permanent) }
+    self.current_user = user
+  end
 
 	def current_user=(user)
 		@current_user = user
@@ -70,15 +59,19 @@ module SessionsHelper
     session.delete(:return_to)
   end
 
-  def authorize_level?(level = 3)
+  def authorize_level?(level)
     current_user && current_user.level <= level
   end
 
-  def authorize_level(level = 3)
+  def authorize_level(level)
     unless authorize_level?(level)
       store_location
-      redirect_to login_path, error: "Pas autorisé"
+      redirect_to login_path, error: t("snapuser.errors.unauthorized")
     end
   end
 
+  def require_login
+    redirect_to login_path, error: t("snapuser.errors.unconnected") unless signed_in?
+  end
+
 end

data/app/views/admin/users/edit.html.erb

@@ -1,3 +1,3 @@
-<h1><%= t('user.admin.edit.title') %></h1>
+<h1><%= t('snapuser.admin.edit.title') %></h1>
 
 <%= render 'form' %>

data/app/views/admin/users/index.html.erb

@@ -1,5 +1,3 @@
-<h1><%= t('user.admin.index') %></h1>
+<h1><%= t('snapuser.admin.index.title') %></h1>
 
-<div id="admin_table">
-	<%= @table.present %>
-</div>
+<%= @table.present %>

data/app/views/admin/users/new.html.erb

@@ -1,3 +1,3 @@
-<h1><%= t('user.admin.new.title') %></h1>
+<h1><%= t('snapuser.admin.new.title') %></h1>
 
 <%= render 'form' %>

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

@@ -1,5 +1,3 @@
-<% content_for :id, "login" %>
-
 <%= form_for :session, url: sessions_path do |f| %>
 
 	<%= f.label :name %>

data/app/views/users/edit.html.erb

@@ -1,3 +1,3 @@
-<h1><%= t('user.edit.title') %></h1>
+<h1><%= t('snapuser.edit.title') %></h1>
 
 <%= render 'form' %>

data/config/locales/fr.yml

@@ -0,0 +1,40 @@
+fr:
+  snapuser:
+    admin:
+      index:
+        title: "Les utilisateurs"
+      edit:
+        title: "Editer un utilisateur"
+        success: "Utilisateur enregistré"
+      new:
+        title: "Ajouter un utilisateur"
+        success: "Utilisateur crée"
+    edit:
+      title: "Editer mon compte"
+      success: "Compte mis à jour"
+    destroy:
+      success: "Utilisateur supprimé"
+    errors:
+      unauthorized: "Non autorisé"
+      unconnected: "Veuillez vous connecter"
+    session:
+      success: "Connecté !"
+      error: "Mot de passe ou/et nom d'utilisateur invalide !"
+      destroy:
+        success: "Déconnecté !"
+  activerecord:
+    attributes:
+      user:
+        name: "Nom d'utilisateur"
+        password: "Mot de passe"
+        password_confirmation: "Confirmation du mot de passe"
+  helpers:
+    submit:
+      user:
+        create: "S'inscrire"
+        update: "Mettre à jour"
+    label:
+      session:
+        name: "Nom d'utilisateur"
+        remember_me: "Se souvenir de moi"
+        password: "Mot de passe"

data/config/routes.rb

@@ -1,7 +1,5 @@
 Rails.application.routes.draw do
 
-  get 'profile', to: "users#profile"
-
   patch 'user/update', to: "users#update"
   get 'user/edit', to: "users#edit"
   

data/lib/snapuser.rb

@@ -2,6 +2,8 @@ require "snapuser/engine"
 
 module Snapuser
   @@levels = {"superadmin" => "1", "admin" => "2"}
+  @@superuser_level = 1
+  @@can_edit = 2
 
-  mattr_accessor :levels
-end
+  mattr_accessor :levels, :can_edit, :superuser_level
+end

data/lib/snapuser/version.rb

@@ -1,3 +1,3 @@
 module Snapuser
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/tasks/snapuser_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :snapuser do
-#   # Task goes here
-# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapuser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - khcr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,7 +87,7 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/edit.html.erb
-- app/views/users/profile.html.erb
+- config/locales/fr.yml
 - config/routes.rb
 - db/migrate/20150415193853_create_users.rb
 - lib/snapuser.rb

data/app/views/users/profile.html.erb

@@ -1,20 +0,0 @@
-<% content_for :id, "profil" %>
-
-<h1><%= t('user.index') %></h1>
-
-<%= link_to t('user.edit.title'), user_edit_path if authorize_level?(2) %>
-
-<div class="links">
-	<%= link_to_active "Home", root_path %>
-	<%= link_to_active t('user.index'), profile_path %>
-	<%= link_to_active t('layout.header.messages'), messages_path %>
-	<%= link_to_active t('layout.header.admin.files'), admin_files_path if authorize_level?(3) %>
-	<%= link_to_active t('layout.header.admin.pages'), admin_pages_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.events'), admin_events_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.activities'), admin_activities_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.galleries'), admin_galleries_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.messages'), admin_messages_path if authorize_level?(4) %>
-	<%= link_to_active t('layout.header.admin.newsletter_emails'), admin_newsletter_emails_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.downloads'), admin_downloads_path if authorize_level?(2) %>
-	<%= link_to_active t('layout.header.admin.users'), admin_users_path if authorize_level?(1) %>
-</div>