symphonia 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a195060e6fa12677b383245afdaa0d7cefb75e463031b21aca473c2b2eabc6d
-  data.tar.gz: ca98109a38542883af2f24a0eadbfb9363861b09fa98a146437c405ba4872338
+  metadata.gz: 68c44e1f10ceb644917147a7e5cd28caa1a6054a8bffed6e85fa7e76a90d9956
+  data.tar.gz: dfaa2c7d6d6e0c6960a59722998542af1e16ca644fdeefbe6ffcc5be5087ef96
 SHA512:
-  metadata.gz: 4b5a099d7ab9e70cbe8526a9e2a765220c3d137472a08dfcbedebaef43745c96f78dc90512335adf4da26b1e910052231c9fa49fcff11dc8eeda122bb8ef1554
-  data.tar.gz: 6f300e80b0373f6f19298f6a1c33a4e059be86e7f1110eeebe74f32e90a04960a3ab2edbadf2d5d54624fbc3b4b38c6734b02abd7f6e857d06c11c6648a49b03
+  metadata.gz: 0f9b8fca0586ade8130cf789e367b5724a38f7cf44597f48b15819098034a53b3e2d42007d05a13fd73e70e91922e3cd681fffef284abc70a67b1fef868586ca
+  data.tar.gz: '08bc13b2b16c0001c9389238771b2dfc0c1c97400fecad96540f6fdadcd9ac343a2c918bcd8699b8c7bf11fe9c862b0826ae6be62628fbec54518b9b6480ff95'

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines_special
@@ -12,15 +13,13 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-#Metrics/LineLength:
-#  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 
-#Style/BracesAroundHashParameters:
-#  EnforcedStyle: context_dependent
 Style/Documentation:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/MutableConstant:
   Enabled: false
 Style/NegatedIf:

data/CHANGELOG.md

@@ -6,10 +6,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Removed
-- openapi (it seems to be uneccessary)
+- development dependency in gemspec replaced by `symphonia_spec` gem
+- GenericColumn in Query
+- AdminModule class/table = its not used, its not working
+### Changed
+- Rails 6.1 support
+- Query#to_params boolean argument to named
+- update generators
+- use native JSON columns instead of serializations
+### Added
+- Gemfile.lock
+
+## [3.4.0] - 2021-03-22
+### Changed
+- upgrade authlogic to 6.4.1 (rails6.1 compatible)
+
+## [3.3.4] - 2020-12-28
+### Fixed
+- default responses (render_40x) works for any format
+## [3.3.3] - 2020-10-24
+### Changed
+- prefill login from email
+- allow login edit for legacy accounts
+## [3.3.2] - 2020-10-17
+### Added
+- `render_super` for templates
+### Changed
+- lost password check
+## [3.3.1] - 2020-09-28
+### Removed
+- openapi (it seems to be unnecessarily)
 - paperclip support
+- the_sortable_tree
 ### Changed
-- upgrade authlogic to 6.1.0
+- upgrade authlogic to 6.2.0
 ## [3.2.4] - 2020-05-10
 ### Added
 - sidekiq-cron gem
@@ -80,7 +110,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - do not require password for SSO users
 - hide password field from form of SSO users
 ## [3.0.0] - 2019-07-06
-### Added
+### Added
 - external_id on user
 ### Changed
 - users/show only for logged users

data/README.md

@@ -14,3 +14,19 @@ after `bundle install` run post-installation: `rails g symphonia:setup`
 > Setup prepare `config/initializers/settings.rb`, create `spec/spec_helper.rb`, add stylesheets and javascripts references and copy basic layout.
 
 
+## Upgrade to v4.0
+1. update Gemfile:
+```ruby
+gem 'rails', '~> 6.1'
+gem 'symphonia', '~> 4.0'
+source "https://gems.luk4s.cz" do
+  gem 'symphonia_spec', group: %i[development test]
+end
+```
+And `bundle update`
+2. upgrade rails:
+   https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+```bash
+export THOR_MERGE=vimdiff
+rails app:update
+```

data/app/controllers/symphonia/accounts_controller.rb

@@ -100,6 +100,8 @@ module Symphonia
 
     end
 
+    # @!group Reset lost password
+
     def reset_password
       @user = find_account_by_token(params.require(:id))
       return render_404 if @user.nil?
@@ -109,28 +111,28 @@ module Symphonia
       end
 
       if @user.changed? && @user.save
-        return redirect_to(user_current_path, notice: t(:text_updated))
+        logger.info "#{@user.id} has changed password"
+        return redirect_to(login_path, notice: t(:text_password_reset_success))
       end
     end
 
     def lost_password
       @user = find_account_by_mail(params[:email]) if params[:email]
-      if @user
-        if @user.active?
-          @user.reset_perishable_token!
-          Notifier.reset_password_user(@user).deliver_later
+      if @user&.active?
+        @user.reset_perishable_token!
+        activation_url = url_for(action: "reset_password", id: @user.perishable_token, only_path: false)
+        Notifier.reset_password_user(@user, activation_url).deliver_later
+      end
+      respond_to do |format|
+        format.html do
           redirect_to login_path, notice: t(:text_reset_password_resend)
-        else
-          redirect_to login_path, flash: { error: t("authlogic.error_messages.not_active") }
-        end
-      else
-        respond_to do |format|
-          format.html
-          format.js
         end
+        format.js
       end
     end
 
+    # @!endgroup
+
     private
 
     def prepare_user

data/app/controllers/symphonia/admin_controller.rb

@@ -3,9 +3,6 @@ module Symphonia
     before_action :login_require
 
     def index
-      @admin_modules = AdminModule.where(user_id: [nil, current_user.id]).order(:position).all
-      @modules_count = @admin_modules.count
-
       respond_to do |format|
         format.html
       end
@@ -19,4 +16,4 @@ module Symphonia
 
   end
 
-end
+end

data/app/helpers/symphonia/application_helper.rb

@@ -242,6 +242,23 @@ module Symphonia
       fa_icon(fa, (text && { text: content_tag(:span, text, class: 'd-none d-sm-inline') } || {}).merge(options))
     end
 
+    # Render original template from engine
+    #   Useful for override part of engine view
+    #
+    # @example render_super "login/new"
+    # @param [String] template_name
+    # @param [Class<Symphonia::Engine>] engine
+    # @param [String] format
+    def render_super(template_name, engine: Symphonia::Engine, format: "html")
+      resolver = lookup_context.view_paths.paths.find do |resolver|
+        resolver.path == engine.root.join("app", "views").to_s
+      end
+      template = resolver.find_all(template_name, engine.engine_name, false, { locale: ["."], formats: [format], variants: [], handlers: [:erb] }, nil, {}).first
+      return "" unless template
+
+      render template: template
+    end
+
     def render_symphonia_dialog(*args, &block)
       ActiveSupport::Deprecation.warn "Use `render_modal` instead"
       options = args.extract_options!
@@ -356,67 +373,6 @@ module Symphonia
       end
 
     end
-
-    # Example of use
-    # <%=
-    # table_header_tag_for(User) do |t|
-    #  t.th :login
-    #  t.th :email
-    # end
-    # %>
-    # options:
-    # => column : DB full name of column
-    #
-    # def table_header_tag_for(model, &block)
-    #   tags = TableHeaderTag.new(model, self)
-    #   yield tags
-    #   tags.to_html
-    # end
-    #
-    # class TableHeaderTag
-    #
-    #   attr_reader :view, :model
-    #
-    #   def initialize(model, view)
-    #     @model = model
-    #     @tags = Array.new
-    #     @view = view
-    #   end
-    #
-    #   def th(*args)
-    #     options = args.extract_options!
-    #     attribute = args.first
-    #     label = args[1]
-    #     raise ArgumentError if attribute.nil?
-    #
-    #     sort_options = options.delete(:sort_options) || {}
-    #     html_options = options.delete(:html_options) || {}
-    #
-    #     label ||= @model.send(:human_attribute_name, attribute, options[:i18n] || {})
-    #     @tags << @view.content_tag(:th, html_options) do
-    #       if options[:sort] === false
-    #         label
-    #       else
-    #         sort_options[:column] ||= options.delete(:column)
-    #         sort_options[:column] ||= "#{@model.send(:table_name)}.#{attribute}"
-    #         # @view.sortable_column(label, sort_options) # TODO: Rails 5 error
-    #         label
-    #       end
-    #     end
-    #
-    #   end
-    #
-    #   def to_html
-    #     @tags.join("\n").html_safe
-    #   end
-    #
-    # end
-
-    # def render_share_buttons(url, name, options = {})
-    #   options[:icon_css] ||= ''
-    #   render(partial: 'common/share_links', locals: options.merge({ url: url, name: name }))
-    # end
   end
 end
 
-#ApplicationHelper.send :include, Symphonia::ApplicationHelperExtension

data/app/mailers/symphonia/notifier.rb

@@ -21,8 +21,9 @@ module Symphonia
       mail({ to: @user.mail, subject: 'Váš účet je aktivován' })
     end
 
-    def reset_password_user(user)
+    def reset_password_user(user, url)
       @user = user
+      @url = url
       mail({ to: @user.mail, subject: t(:subject_reset_password_mail) })
     end
 

data/app/models/symphonia/user.rb

@@ -21,7 +21,6 @@ module Symphonia
     acts_as_authentic do |config|
       config.crypto_provider = ::Authlogic::CryptoProviders::SCrypt
     end
-    validates :email, uniqueness: { case_sensitive: false }
     validates :password,
               confirmation: { if: :require_password? },
               length: {
@@ -51,9 +50,6 @@ module Symphonia
     before_save do |model|
       Rails.cache.delete_matched('user_allowed_to*') if model.role_id_changed?
     end
-    before_validation do |model|
-      model.login ||= model.email
-    end
 
     def allowed_to?(action)
       return true if admin?

data/app/views/layouts/symphonia/application.pdf.erb

@@ -10,6 +10,5 @@
     <section id="main" class="container-fluid">
       <%= yield %>
     </section>
-
   </body>
 </html>

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

@@ -1,4 +1,9 @@
 <div class="row justify-content-center">
+  <% if f.object.login != f.object.email %>
+    <div class="col-lg-8">
+      <%= f.text_field :login, required: true %>
+    </div>
+  <% end %>
   <div class="col-lg-8">
     <%= f.email_field :email, required: true %>
   </div>

data/app/views/symphonia/accounts/lost_password.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag symphonia.lost_password_account_path do %>
+<%= form_tag url_for({action: 'lost_password'}) do %>
 <div class="form-group required">
   <%= label_tag(:email, t(:'attributes.mail'), required: true, class: 'sr-only') %>
   <%= email_field_tag(:email, nil, autofocus: true, placeholder: t(:'attributes.mail'), required: true, size: 35, class: 'form-control') %>

data/app/views/symphonia/accounts/reset_password.html.erb

@@ -3,11 +3,11 @@
     <div class="card w-75 mx-auto">
       <div class="card-body">
         <h4 class="card-title"><%= t(:label_reset_password) %></h4>
-        <%= symphonia_form_tag(url: symphonia.reset_password_path(params[:id]), method: 'put') do |f| %>
+        <%= symphonia_form_tag(url: url_for(action: "reset_password", id: params[:id]), method: 'put') do |f| %>
           <%= f.error_messages %>
           <%= f.password_field(:password, label: t(:'attributes.password'), required: true, wrapper_class: 'required') -%>
 
-          <%= f.submit(t(:button_submit), class: 'btn btn-primary btn-block') -%>
+          <%= f.submit(t(:button_save), class: 'btn btn-primary btn-block') -%>
         <% end %>
       </div>
     </div>

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

@@ -1,15 +1,5 @@
 <%= title 'Administrace' %>
-<% @admin_modules.each_with_index do |admin_module, _index| %>
-  <div class="col-lg-<%= @modules_count == 1 ? '12' : '6' %>" id="<%= dom_id(admin_module) %>">
-    <h3><%= t(admin_module.title, scope: [:admin_module, :titles], default: admin_module.title) %></h3>
-    <% if admin_module.body_path.is_a?(Symbol) %>
-      <%= render(partial: "admin_modules/#{admin_module.body_path}", locals: { admin_module: admin_module }) -%>
-    <% else %>
-      <%= format_text(admin_module.body_path) -%>
-    <% end -%>
-  </div>
-<% end -%>
 
 <%= content_for :meta_tags do %>
     <meta name="turbolinks-root" content="/admin">
-<% end %>
+<% end %>

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

@@ -8,7 +8,6 @@
   <%= f.check_box :remember_me %>
 <% end %>
 
-<%= f.form_group class: 'text-center' do %>
   <%= 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 ') %>
@@ -16,4 +15,3 @@
       <%= link_to(t(:button_register), register_path, class: 'btn btn-link btn-sm ') %>
     <% end %>
   <% end %>
-<% end %>

data/app/views/symphonia/notifier/reset_password_user.html.erb

@@ -2,6 +2,5 @@
   <%= t(:text_html_reset_password, :scope => :mailer) %>
 </p>
 <p>
-  <% activation_url = symphonia.reset_password_url(id: @user.perishable_token) %>
-  <%= link_to(activation_url, activation_url) %>
+  <%= link_to(@url, @url) %>
 </p>

data/app/views/symphonia/notifier/reset_password_user.text.erb

@@ -1,3 +1,3 @@
 <%= t(:'mailer.text_html_reset_password') %>
 
-<%=symphonia.reset_password_url(id: @user.perishable_token) %>
+<%= @url -%>

data/config/locales/cs.yml

@@ -153,6 +153,8 @@ cs:
   text_error_query_not_init: Filtry nejsou nastaveny. Registruj query!
   text_error_there_is_no_filters_available: Nejsou zaregistrované žádné validní filtry.
   text_error_login_required: Přihlašte se prosím
+  text_password_reset_success: "Nové heslo uloženo. Přihlašte se prosím"
+
 
   title_toggle_multiselect: Přepnout multiselect
   title_login: Přihlášení

data/db/migrate/20130714140501_create_roles.rb

@@ -1,10 +1,11 @@
-class CreateRoles < ActiveRecord::Migration[5.1]
+class CreateRoles < ActiveRecord::Migration[6.1]
+
   def up
     create_table :roles do |t|
-      t.string  :name, :null => false
-      t.text    :description, :null => true
+      t.string :name, null: false
+      t.text :description, null: true
 
-      t.text    :permissions
+      t.text :permissions
 
       t.timestamps
     end
@@ -13,4 +14,5 @@ class CreateRoles < ActiveRecord::Migration[5.1]
   def down
     drop_table :roles
   end
+
 end

data/db/migrate/20200428180001_add_uuid_to_users.rb

@@ -1,6 +1,8 @@
 class AddUuidToUsers < ActiveRecord::Migration[6.0]
+
   def change
-    uuid_type = connection.adapter_name =~ /PostgreSQL/i ? :uuid : :string
-    add_column :users, :uuid, uuid_type
+    # uuid_type = connection.adapter_name =~ /PostgreSQL/i ? :uuid : :string
+    add_column :users, :uuid, :uuid
   end
+
 end

data/db/migrate/20210509141420_roles_change_permissions_to_json.rb

@@ -0,0 +1,18 @@
+class RolesChangePermissionsToJson < ActiveRecord::Migration[6.1]
+
+  def up
+    say_with_time "Convert 'roles.permissions' YAML to JSON" do
+      i = 0
+      Symphonia::Role.where.not(permissions: nil).each do |role|
+        yaml = product.read_attribute_before_type_cast :permissions
+        next unless yaml.start_with? "---"
+
+        role.update_columns permissions: YAML.safe_load(yaml)
+        i += 1
+      end
+
+      i
+    end
+  end
+
+end