chaltron 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de230dc89777b90b7e81ef42da838180a72bd0ba
-  data.tar.gz: 8743eb92b1f9d903d4a7e5b40659f41647bea35e
+  metadata.gz: 0696a63691d1bbfd419bafbcb7d6fd855883877e
+  data.tar.gz: f9d1face556bc53d83e95940e1d47d096dfc811d
 SHA512:
-  metadata.gz: 8d6f5040e582d1db6cae0ff8d4687ffb8975897a35b5f2cfacd39c118d5ab486a655479cda93ea24d86126537683ea058428a223e64eaef9d04c6986aaf14117
-  data.tar.gz: 4d6af95dddf706c9d68d3d148900bab57d4fb7b872bc2a5e56fc0c4cf91e5a0e44be8491ef38d46208464f8532be93e6ba631152a3f466369b2fed3508bf6c08
+  metadata.gz: ba7b28a73299bc22002520f091fa20b8a3976842349a33eb81f18e1c31cf96b92fab1f4480f266c0af45ffd0da78853b53c9f9cf49cb5c3377f1a73806803b62
+  data.tar.gz: 100ad752395e47abdaa43c13506e62d268cb3e5eac5ad16e8be221d2f19214426ed45e81d8019010ac2ea171a87a0ec8cd48838a55df8eb8c3c29adb4bb9dd8c

data/app/assets/javascripts/chaltron/datatables.js.coffee

@@ -59,7 +59,7 @@ class DataTableBuilder
 
       container.DataTable(settings)
 
-$(document).on 'page:change', ->
+$(document).on 'turbolinks:load', ->
   table = new DataTableBuilder
   table.go()
 

data/app/controllers/chaltron/sessions_controller.rb

@@ -1,6 +1,6 @@
 class Chaltron::SessionsController  < Devise::SessionsController
-  after_filter :after_login, only: :create
-  before_filter :before_logout, only: :destroy
+  after_action :after_login, only: :create
+  before_action :before_logout, only: :destroy
 
   default_log_category :login
 

data/app/controllers/chaltron/users_controller.rb

@@ -6,8 +6,7 @@ class Chaltron::UsersController < ApplicationController
   default_log_category :user_admin
 
   def index
-    @filters = params[:filters] || {}
-
+    @filters = filter_params
     # apply provider filter
     @users = @users.where(provider: nil) if @filters[:provider] == 'local'
     @users = @users.where(provider: :ldap) if @filters[:provider] == 'ldap'
@@ -45,7 +44,7 @@ class Chaltron::UsersController < ApplicationController
   end
 
   def self_update
-    user_params_with_pass = self_update_params.dup
+    user_params_with_pass = self_update_params.dup.to_h
     if params[:user][:password].present?
       user_params_with_pass.merge!(
         password: params[:user][:password],
@@ -85,4 +84,7 @@ class Chaltron::UsersController < ApplicationController
     params.require(:user).permit(:email, :fullname)
   end
 
+  def filter_params
+    params.fetch(:filters, {}).permit(:provider, :activity)
+  end
 end

data/app/views/chaltron/users/_side_filters.html.erb

@@ -1,18 +1,18 @@
 <% if ldap_enabled? %>
   <div class='list-group'>
-    <%= link_to users_url(filters: filters.merge(provider: nil)),
+    <%= link_to users_url(filters: filters.merge(provider: nil).to_h),
       class: (filters[:provider].blank? ? 'list-group-item active': 'list-group-item')  do %>
       <span class='badge pull-right'><%= User.count %></span>
       <%= t '.provider.all' %>
     <% end %>
 
-    <%= link_to users_url(filters: filters.merge(provider: 'local')),
+    <%= link_to users_url(filters: filters.merge(provider: 'local').to_h),
       class: (filters[:provider] == 'local' ? 'list-group-item active': 'list-group-item') do %>
       <span class='badge pull-right'><%= User.where(provider: nil).count %></span>
       <%= t '.provider.local' %>
     <% end %>
 
-    <%= link_to users_url(filters: filters.merge(provider: 'ldap')),
+    <%= link_to users_url(filters: filters.merge(provider: 'ldap').to_h),
       class: (filters[:provider] == 'ldap' ? 'list-group-item active': 'list-group-item') do %>
       <span class='badge pull-right'><%= User.where(provider: :ldap).count %></span>
       <%= t '.provider.ldap' %>
@@ -22,7 +22,7 @@
 <% end %>
 
 <div class='list-group'>
-  <%= link_to users_url(filters: filters.merge(activity: 'no_login')),
+  <%= link_to users_url(filters: filters.merge(activity: 'no_login').to_h),
     class: (filters[:activity] == 'no_login' ? 'list-group-item active': 'list-group-item')  do %>
       <span class='badge pull-right'><%= User.where(sign_in_count: 0).count %></span>
       <%= t '.activity.no_login' %>

data/app/views/devise/sessions/_new_ldap.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(user_omniauth_callback_path(:ldap), class: 'form-horizontal', role: 'form') do %>
+<%= form_tag(user_ldap_omniauth_callback_path, class: 'form-horizontal', role: 'form') do %>
   <div class='form-group'>
     <%= label_tag 'username', 'Username', class: 'col-sm-3   control-label' %>
     <div class='col-sm-9'>

data/config/initializers/devise.rb

@@ -142,7 +142,7 @@ Devise.setup do |config|
   # Email regex used to validate email formats. It simply asserts that
   # one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this

data/lib/chaltron/controllers/helpers.rb

@@ -50,7 +50,9 @@ module Chaltron
       #
       protected
       def configure_permitted_parameters
-        devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:login, :username, :email, :password, :remember_me) }
+        devise_parameter_sanitizer.permit(:sign_in) do |user|
+          user.permit(:login, :username, :email, :password, :remember_me)
+        end
       end
 
     end

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
@@ -346,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ready-to-go application with authentication, authorization, logging...
   with bootstrap flavor
 email:
@@ -482,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Move faster and break things - revisited for rails 4