Merge pull request #78 from tvdeyen/4.2-stable

4.2 stable

Author: tvdeyen

.travis.yml

@@ -3,9 +3,9 @@ dist: trusty
 sudo: false
 cache: bundler
 rvm:
-- 2.2.7
-- 2.3.5
-- 2.4.2
+- 2.4.5
+- 2.5.5
+- 2.6.2
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.2.0 (unreleased)
+
+- Do not store screen size at login [#78](https://github.com/AlchemyCMS/alchemy-devise/pull/78) ([tvdeyen](https://github.com/tvdeyen))
+- Security: Use at least Devise 4.6 [#78](https://github.com/AlchemyCMS/alchemy-devise/pull/78) ([tvdeyen](https://github.com/tvdeyen))
+- Fix dummy app rails version [#76](https://github.com/AlchemyCMS/alchemy-devise/pull/76) ([tvdeyen](https://github.com/tvdeyen))
+- Fix translation key on user admin page [#75](https://github.com/AlchemyCMS/alchemy-devise/pull/75) ([mamhoff](https://github.com/mamhoff))
+
+
 ## 4.1.0 (2018-09-22)
 
 - Only allow Alchemy > 4.1 [#72](https://github.com/AlchemyCMS/alchemy-devise/pull/72) ([tvdeyen](https://github.com/tvdeyen))

Gemfile

@@ -10,6 +10,7 @@ unless ENV['CI']
   gem 'pry'
   gem 'spring-commands-rspec'
   gem 'launchy'
+  gem 'github_fast_changelog', require: false
 end
 
 group :test do

README.md

@@ -1,10 +1,10 @@
-## Devise based authentication for Alchemy 4.1
+## Devise based authentication for AlchemyCMS 4.2
 
 [![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=master)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
 
 [![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master)
 
-**CAUTION: This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy-devise/versions/4.1.0), or the [latest stable branch (4.1-stable)](https://github.com/AlchemyCMS/alchemy-devise/tree/4.1-stable).**
+**CAUTION: This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy-devise/versions/4.1.0), or the [latest stable branch (4.2-stable)](https://github.com/AlchemyCMS/alchemy-devise/tree/4.2-stable).**
 
 AlchemyCMS has no authentication in its core. So it is possibly to bring your own authentication and use it to authorize users in AlchemyCMS. If you don't have your own authentication, you can use this gem.
 
@@ -17,7 +17,7 @@ Just put the gem into your projects `Gemfile`.
 gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
+**NOTE:** You normally want to use a stable branch, like `4.2-stable`.
 
 and run `bundle install`.
 

Rakefile

@@ -39,4 +39,24 @@ cd -
 BASH
     end
   end
+
+  namespace :changelog do
+    desc "Update changelog"
+    task :update do
+      original_file = './CHANGELOG.md'
+      new_file = original_file + '.new'
+      backup = original_file + '.old'
+      changes = `git rev-list #{ENV['PREVIOUS_VERSION']}...master | bundle exec github_fast_changelog AlchemyCMS/alchemy-devise`
+      File.open(new_file, 'w') do |fo|
+        fo.puts changes
+        File.foreach(original_file) do |li|
+          fo.puts li
+        end
+        fo.puts ""
+      end
+      File.rename(original_file, backup)
+      File.rename(new_file, original_file)
+      File.delete(backup)
+    end
+  end
 end

alchemy-devise.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"]
 
   s.add_dependency "alchemy_cms", [">= 4.1.0.beta", "< 4.99"]
-  s.add_dependency "devise",      [">= 4.0", "< 4.99"]
+  s.add_dependency "devise",      [">= 4.6.0", "< 4.99"]
 
   s.add_development_dependency "capybara"
   s.add_development_dependency "factory_bot_rails"

app/controllers/alchemy/admin/users_controller.rb

@@ -17,7 +17,7 @@ def index
         @query.sorts = 'login asc' if @query.sorts.empty?
         @users = @query.result
           .page(params[:page] || 1)
-          .per(per_page_value_for_screen_size)
+          .per(items_per_page)
       end
 
       def new

app/controllers/alchemy/user_sessions_controller.rb

@@ -20,7 +20,6 @@ def create
       authenticate_user!
 
       if user_signed_in?
-        store_screen_size
         if session[:redirect_path].blank?
           redirect_path = admin_dashboard_path
         else
@@ -49,10 +48,6 @@ def check_user_count
       end
     end
 
-    def store_screen_size
-      session[:screen_size] = params[:user_screensize]
-    end
-
     # Overwriting the default of Devise
     def after_sign_out_path_for(resource_or_scope)
       if request.referer.blank? || request.referer.to_s =~ /admin/

app/views/alchemy/user_sessions/new.html.erb

@@ -9,7 +9,6 @@
       </small>
     </div>
     <div class="submit">
-      <%= hidden_field_tag 'user_screensize' %>
       <button class="secondary"><%= Alchemy.t(:login) %></button>
     </div>
   <% end %>
@@ -19,9 +18,6 @@
 <script type="text/javascript" charset="utf-8">
   jQuery(function($) {
     $('#user_login').focus();
-    $('#user_screensize').val(function() {
-      return screen.width+'x'+screen.height;
-    });
   });
 </script>
 <%- end -%>

lib/alchemy/devise/test_support/factories.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
-  factory :alchemy_user, class: 'Alchemy::User' do
+  factory :alchemy_user, class: Alchemy::User do
     sequence(:login) { |n| "john_#{n}.doe" }
     sequence(:email) { |n| "john_#{n}@doe.com" }
-    firstname 'John'
-    lastname 'Doe'
-    password 's3cr3t'
-    password_confirmation 's3cr3t'
+    firstname { 'John' }
+    lastname { 'Doe' }
+    password { 's3cr3t' }
+    password_confirmation { 's3cr3t' }
 
     factory :alchemy_admin_user do
-      alchemy_roles 'admin'
+      alchemy_roles { 'admin' }
     end
 
     factory :alchemy_member_user do
-      alchemy_roles 'member'
+      alchemy_roles { 'member' }
     end
 
     factory :alchemy_author_user do
-      alchemy_roles 'author'
+      alchemy_roles { 'author' }
     end
 
     factory :alchemy_editor_user do
-      alchemy_roles 'editor'
+      alchemy_roles { 'editor' }
     end
   end
 end