symphonia 6.0.2 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d7848d1bca3b518accb57564e9c07c7b4650e5a02e5bd9c3bd33fbe60c5d72
-  data.tar.gz: '078af52f5b5c5efe3fd4ac6bf2935250e25a83e98bfc842f8878413d21ec86a9'
+  metadata.gz: ec631bd4ee68c93f0e8ca81f897621e1c4927c21880ca863e72b1306915787ff
+  data.tar.gz: 63fa772a030a929bf685126e2f382708b725db2de17ad44c4a06244d88804b43
 SHA512:
-  metadata.gz: 85b194d20074685cd3f206e06be37240876fd805892180e60c38060d366efeb48b662c1296f5b277042778c997588d363224697e2c545f475dc970caae447962
-  data.tar.gz: b23fad9e94c8d44c72feb31d42666f8bbdc610d9a598830d223a8784b32a1856464596af5ac651cc44a485bd7bf0ea341c5e310d4f9e5e86451209f4bb4fbdca
+  metadata.gz: 0b94823eb2f350440833ee4a5ee1395c1c9e38b1cf9a7980513c51ae471a71dbc4693c0730109bb94192bb2cc06135ca5cc3d6a8b95a63b0eba6bef0b2fc85fb
+  data.tar.gz: 6b55c817441d57c0a4adee96a5e958eeea04a0e1406107bfda627c893cf5a34114409d385168703da87346f9f5b2fd79351bae92976cb190cfd16ad3ae4f60c3

data/.rubocop.yml

@@ -1,36 +1,5 @@
-require:
-  - rubocop-rails
-  - rubocop-rspec
+inherit_gem:
+  symphonia_spec: .rubocop.yml
 
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-
-Layout/EmptyLinesAroundClassBody:
-  EnforcedStyle: empty_lines_special
-Layout/EmptyLinesAroundModuleBody:
-  EnforcedStyle: empty_lines_except_namespace
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented_relative_to_receiver
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Naming/VariableNumber:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/MutableConstant:
-  Enabled: false
-Style/NegatedIf:
-  Enabled: false
-Style/StringLiterals:
-  Enabled: false
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false

data/CHANGELOG.md

@@ -5,6 +5,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [6.0.5] - 2024-08-02
+### Fixed
+- missing tests files
+
+## [6.0.4] - 2024-08-02
+### Changed
+- update dependencies
+- rescue from `ActionController::InvalidAuthenticityToken` in `ApplicationController`
+
+## [6.0.3] - 2024-07-22
+### Fixed
+- disable Turbo on login form
+
+## [6.0.2] - 2023-10-18
+
 ## [6.0.1] - 2023-07-17
 ### Fixed
 - fix InvalidAuthenticityToken error for json request

data/app/controllers/symphonia/users_controller.rb

@@ -94,7 +94,7 @@ module Symphonia
       @user.unarchive!
 
       respond_to do |format|
-        format.html { redirect_to params[:back_url] || users_url }
+        format.html { redirect_to params[:back_url] || users_url, allow_other_host: false }
         format.xml { head :no_content }
       end
     end

data/app/views/symphonia/login/_form.html.erb

@@ -1,17 +1,17 @@
 <%= f.error_messages %>
 <%= hidden_field_tag(:back_url, back_url || session[:back_url]) %>
-<%= f.text_field :login, required: true, autofocus: true, autocomplete: "username" %>
 
+<%= f.text_field :login, required: true, autofocus: true, autocomplete: "username" %>
 <%= f.password_field :password, required: true, autocomplete: "current-password" %>
 
 <%= f.form_group :remember_me do %>
   <%= f.check_box :remember_me %>
 <% end %>
 
-  <%= f.submit t(:button_login), class: 'btn btn-primary btn-block' %>
-  <% if f.object.is_a?(Symphonia::UserSession) %>
-    <%= link_to(t(:label_reset_password), lost_password_account_path, remote: true, class: 'btn btn-link btn-sm ') %>
-    <% if Symphonia.config[:allow_registrations] %>
-      <%= link_to(t(:button_register), register_path, class: 'btn btn-link btn-sm ') %>
-    <% end %>
+<%= f.submit t(:button_login), class: "btn btn-primary btn-block" %>
+<% if f.object.is_a?(Symphonia::UserSession) %>
+  <%= link_to(t(:label_reset_password), lost_password_account_path, remote: true, class: "btn btn-link btn-sm") %>
+  <% if Symphonia.config[:allow_registrations] %>
+    <%= link_to(t(:button_register), register_path, class: "btn btn-link btn-sm") %>
   <% end %>
+<% end %>

data/app/views/symphonia/login/new.html.erb

@@ -2,8 +2,8 @@
   <div class="col-md-6 col-xs-12 mx-auto">
     <div class="card w-75 mx-auto">
       <div class="card-body">
-        <%= symphonia_form_for(@model_session, as: :login_session, html: { id: 'login-form' }) do |f| %>
-          <%= render('form', f: f) %>
+        <%= symphonia_form_for(@model_session, as: :login_session, html: { id: "login-form", data: { turbo: false } }) do |f| %>
+          <%= render("form", f: f) %>
         <% end %>
       </div>
     </div>

data/lib/symphonia/controller_extensions.rb

@@ -7,7 +7,6 @@ module Symphonia
     end
 
     included do
-
       before_action :current_user, :menu_item
       before_action :set_default_locale
 
@@ -18,13 +17,16 @@ module Symphonia
 
       rescue_from ::ActiveRecord::RecordNotFound, with: :render_404
       rescue_from Unauthorized, CanCan::AccessDenied, with: :render_403
+      rescue_from ActionController::InvalidAuthenticityToken do |_exception|
+        head :service_unavailable
+      end
 
       helper_method :current_user, :back_url
     end
 
     def back_url
       url = params[:back_url].presence
-      if url.nil? && (referer = request.env['HTTP_REFERER'].presence)
+      if url.nil? && (referer = request.env["HTTP_REFERER"].presence)
         url = CGI.unescape(referer.to_s)
       end
       url
@@ -48,7 +50,7 @@ module Symphonia
     def set_locale
       params_locale = params.fetch(:locale, nil).presence
       params_locale ||= session[:locale].presence
-      params_locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten
+      params_locale ||= request.env["HTTP_ACCEPT_LANGUAGE"].to_s.split(",").collect { |l| l.scan(/^[a-z]{2}/) }.flatten
       client_lang = Array(params_locale).compact
       client_lang.unshift current_user.language if current_user.language
       @client_lang = client_lang.detect { |l| I18n.available_locales.include?(l.to_sym) }
@@ -75,7 +77,7 @@ module Symphonia
             redirect_to symphonia.login_path, flash: { error: t(:text_login_require) }
           end
           format.json do
-            render json: { errors: 'You must be logged in to access this endpoint' }, status: :unauthorized
+            render json: { errors: "You must be logged in to access this endpoint" }, status: :unauthorized
           end
           format.any { head :unauthorized }
         end
@@ -89,29 +91,28 @@ module Symphonia
 
     def admin_require
       return unless login_require
+      return if current_user.admin?
 
-      unless current_user.admin?
-        render_403
-        false
-      end
+      render_403
+      false
     end
 
     alias require_admin admin_require
 
     def render_403
       respond_to do |format|
-        format.html { render template: 'common/403', message: :notice_not_authorized, status: :forbidden }
+        format.html { render template: "common/403", message: :notice_not_authorized, status: :forbidden }
         format.js do
           render plain: "alert('#{t :text_access_deny}')", message: :notice_not_authorized, status: :forbidden
         end
-        format.any { head 403, message: :notice_not_authorized }
+        format.any { head :forbidden, message: :notice_not_authorized }
       end
     end
 
     def render_404
       respond_to do |format|
-        format.html { render template: 'common/404', message: :notice_page_not_found, status: :not_found }
-        format.any { head 404, message: :not_found }
+        format.html { render template: "common/404", message: :notice_page_not_found, status: :not_found }
+        format.any { head :not_found, message: :not_found }
       end
     end
 
@@ -126,7 +127,7 @@ module Symphonia
     end
 
     def menu_item(item = nil)
-      @menu_item = (item || controller_name)
+      @menu_item = item || controller_name
     end
 
     def current_user_session
@@ -153,9 +154,9 @@ module Symphonia
       return true if current_user&.logged_in? && request.format&.json?
 
       current_user_session&.destroy
-      raise ActionController::InvalidAuthenticityToken
+      # raise ActionController::InvalidAuthenticityToken
 
-      # redirect_to main_app.root_url
+      super
     end
 
     def store_location

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = '6.0.2'
+  VERSION = "6.0.5"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.5
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement