alchemy-devise 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c558baf798de77b122ba7e53c5facb2e57a5a72ae351f2b0d967104fe945c04
-  data.tar.gz: e27c4781ec9348d8bdcbc77abeed7584e64fe8facfbd943b133fb5e362bf1701
+  metadata.gz: 6217ebc5ce12c866ae9b27e1d80a181c302e96f0accced11e0ef9a3df2fdc4be
+  data.tar.gz: c05e0c5d4a260926f293073c00d440b9968dba46a10ea0326f4068ee19065bff
 SHA512:
-  metadata.gz: 789bc60a8330c5690a4641ecdb558e4268bec99f6e92cdded7e9a0edd25f478201974ef9091b9571bff777ae3a76cd093dfbf0069ba8e58c1c7e0dd0c9b5c619
-  data.tar.gz: a469f6d79fdb3bde9edeff1e2d077006e46a1c998b78d4f3515ead33fe462fdcadc0069de50a6f07e4c70aefc3584dd45d4d2ec89e2b0c7a4691a5521614f631
+  metadata.gz: 0dc57c2c68c836f3ce8f7f1e8c029dc8a8e6ff5ade4a052e1d0b99dcd1cd901d08215b22d046da3d089a950a8b18c5b0d69a95d665ae70803d559bb3040ccdcd
+  data.tar.gz: 033e220a727c0727975b90df7c589b2ecb4a9aefd8bc90e37046ce63be666cebf47a5583780fad2afab4ceffb12aa953aae4c134a4d6aee05a92fa955abbc6d5

data/README.md

@@ -1,4 +1,4 @@
-## Devise based authentication for AlchemyCMS 4.2
+## Devise based authentication for AlchemyCMS
 
 [![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=master)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
 
@@ -12,7 +12,7 @@ Just put the gem into your projects `Gemfile`.
 
 ```ruby
 # Gemfile
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.2-stable'
+gem 'alchemy-devise'
 ```
 
 and run `bundle install`.

data/Rakefile

@@ -33,7 +33,9 @@ namespace :alchemy do
       system <<-BASH
 cd spec/dummy
 export RAILS_ENV=test
-bin/rake db:create db:environment:set db:migrate
+bin/rake railties:install:migrations
+bin/rake db:drop db:create db:migrate
+bin/rails g alchemy:install --force
 bin/rails g alchemy:devise:install --force
 cd -
 BASH

data/app/controllers/alchemy/admin/passwords_controller.rb

@@ -3,11 +3,13 @@ module Alchemy
     class PasswordsController < ::Devise::PasswordsController
       include Alchemy::Admin::Locale
 
-      before_action { enforce_ssl if ssl_required? && !request.ssl? }
+      if Alchemy.gem_version <= Gem::Version.new("4.9")
+        before_action { enforce_ssl if ssl_required? && !request.ssl? }
+      end
 
-      helper 'Alchemy::Admin::Base'
+      helper "Alchemy::Admin::Base"
 
-      layout 'alchemy/admin'
+      layout "alchemy/admin"
 
       private
 
@@ -16,7 +18,7 @@ module Alchemy
         alchemy.admin_login_path
       end
 
-      def admin_edit_password_url(resource, options={})
+      def admin_edit_password_url(_resource, options = {})
         alchemy.admin_edit_password_url(options)
       end
 
@@ -27,7 +29,6 @@ module Alchemy
           alchemy.root_path
         end
       end
-
     end
   end
 end

data/app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require_dependency "alchemy/version"
+
 module Alchemy
   module Admin
     class UserSessionsController < ::Devise::SessionsController
@@ -5,15 +9,16 @@ module Alchemy
 
       protect_from_forgery prepend: true
 
-      before_action except: 'destroy' do
-        enforce_ssl if ssl_required? && !request.ssl?
+      if Alchemy.gem_version <= Gem::Version.new("4.9")
+        before_action except: "destroy" do
+          enforce_ssl if ssl_required? && !request.ssl?
+        end
       end
-
       before_action :check_user_count, :only => :new
 
-      helper 'Alchemy::Admin::Base'
+      helper "Alchemy::Admin::Base"
 
-      layout 'alchemy/admin'
+      layout "alchemy/admin"
 
       def create
         authenticate_user!
@@ -23,10 +28,10 @@ module Alchemy
             redirect_path = admin_dashboard_path
           else
             # We have to strip double slashes from beginning of path, because of strange rails/rack bug.
-            redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, '/')
+            redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, "/")
           end
           redirect_to redirect_path,
-            notice: t(:signed_in, scope: 'devise.sessions')
+            notice: t(:signed_in, scope: "devise.sessions")
         else
           super
         end

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "4.5.0"
+    VERSION = "4.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -211,7 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.
 test_files: []
+...