symphonia 5.0.6 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8947cb70c08f93cb874449e18be3a0f79545f8756bf7f48861fc3974ca23c495
-  data.tar.gz: a5c91c6dff667e883e43c1c88a265e0408da0d37847637215c15ee943033764b
+  metadata.gz: e5e174021378849dc3fd8cbe38f9b407c140d93aadea592e7fd532385ecc02e6
+  data.tar.gz: 0ac31c792dbbf173f3fd765225bd315b60bf9c9ef7bdd7f9032fd30e06f998dc
 SHA512:
-  metadata.gz: 42254ebb4980586ae51c447fb44940932c49b67e7ffbdf36dc326062af40a8d0062dd6397bf670b9b790335d00e8a280f49ec295a2539aaaaa596ea527774f81
-  data.tar.gz: 27c87d67823e9351f92856298b9340c803617fad36e28d238d3ea05a6bddd6e057d0460b4d760cc0888d53fa8f54a42417eac6b42482e4cca7cc4ea21ce85684
+  metadata.gz: a87909e917f27627228a90ae3125c08334ab391542ebb1ae1e1cf0415c2935365c3ad8cec30e3f41ca7028c250aac42839533e8ee85c316f1f8ef8208ad0cf5d
+  data.tar.gz: ff8e4ddd13b3ba30ec4db1cfd2a2b789da0ee6a97d2787a77ca0fb5878e78bce744a282e9aa19b099a8813ea0e6551374488273899744b9906c7fd72858ecd5a

data/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.0] - 2023-07-11
+### Changed
+- Upgrade to Rails 7
+
 ## [5.0.6] - 2023-04-29
 ### Changed
 - modal `large` = "modal-xl"

data/app/assets/javascripts/symphonia/_core.js

@@ -9,13 +9,13 @@ Number.prototype.pad = function (size) {
   return s;
 };
 
-$(document).on('ajaxSend', function (event, request, settings) {
-  $('#ajax-indicator').fadeIn('fast');
-});
-
-$(document).on('ajaxComplete', function (event, request, settings) {
-  $('#ajax-indicator').fadeOut('fast');
-});
+// $(document).on('ajaxSend', function (event, request, settings) {
+//   $('#ajax-indicator').fadeIn('fast');
+// });
+//
+// $(document).on('ajaxComplete', function (event, request, settings) {
+//   $('#ajax-indicator').fadeOut('fast');
+// });
 window.Symphonia = {
   routes: {},
 

data/app/assets/javascripts/symphonia/application.js

@@ -95,35 +95,6 @@ $(document).on('click', 'input.symphonia-query-submit-button', function (event)
   });
   form.submit();
 });
-Symphonia.filters = {
-  search: function (el) {
-    if (!!el.value) {
-      if (el.dataset.remote) {
-        var data = {};
-        data[el.name] = el.value;
-        $.get(window.location.pathname, data, function (response) {
-          document.getElementById("main").innerHTML = response;
-        })
-      } else {
-        window.location.search = "?" + el.name + "=" + encodeURIComponent(el.value);
-      }
-
-    }
-  },
-  resetSearch: function (el) {
-    if (el.dataset.remote) {
-      $.get(window.location.pathname, {}, function (response) {
-        document.getElementById("main").innerHTML = response;
-      })
-    } else {
-      window.location.search = '';
-    }
-  },
-  removeRow: function (id) {
-    var el = document.getElementById(id);
-    el.remove();
-  }
-}
 function submitSymphoniaForm(formId) {
   console.debug('submitSymphoniaForm in window will remove');
   SymphoniaFilters.submit(formId);

data/app/assets/javascripts/symphonia/filters.js

@@ -41,4 +41,35 @@ SymphoniaFilter.prototype.dateFilterCallback = function(element) {
   } else {
     window.Symphonia.toggle(element.nextElementSibling, false)
   }
-};
+};
+
+window.Symphonia || (window.Symphonia = {});
+window.Symphonia.filters = {
+  search: function (el) {
+    if (!!el.value) {
+      if (el.dataset.remote) {
+        var data = {};
+        data[el.name] = el.value;
+        $.get(window.location.pathname, data, function (response) {
+          document.getElementById("main").innerHTML = response;
+        })
+      } else {
+        window.location.search = "?" + el.name + "=" + encodeURIComponent(el.value);
+      }
+
+    }
+  },
+  resetSearch: function (el) {
+    if (el.dataset.remote) {
+      $.get(window.location.pathname, {}, function (response) {
+        document.getElementById("main").innerHTML = response;
+      })
+    } else {
+      window.location.search = '';
+    }
+  },
+  removeRow: function (id) {
+    var el = document.getElementById(id);
+    el.remove();
+  }
+}

data/app/helpers/symphonia/application_helper.rb

@@ -271,7 +271,7 @@ module Symphonia
     # @param [String] template_name
     # @param [Class<Symphonia::Engine>] engine
     # @param [String] format
-    def render_super(template_name, engine: Symphonia::Engine, format: "html")
+    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

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

@@ -6,7 +6,7 @@
     <div class="card w-75 mx-auto">
       <div class="card-body">
         <%= symphonia_form_for(@user, url: account_register_path) do |f| %>
-          <div style="width:1px;height: 1px;visibility: hidden"><%= check_box_tag :terms, true %></div>
+          <div style="width:1px;height: 1px;visibility: hidden"><%= check_box_tag :terms %></div>
           <%= f.error_messages %>
           <%= f.text_field :name, required: true, autocomplete: "off", prepend: icon("user") %>
           <%= f.email_field :mail, required: true, autocomplete: "username", prepend: "@" %>

data/app/views/symphonia/common/_filters.html.erb

@@ -4,7 +4,7 @@
     <% if @query.search? %>
       <div class="col-sm-12">
         <div class="input-group input-group-sm">
-          <%= search_field_tag(:q, params[:q], class: 'form-control input-sm', id: 'symphonia_query_q', placeholder: t(:label_search), autofocus: params[:q].present? || nil, data: { remote: local_assigns[:remote] }, onchange: 'submitSymphoniaQueryQ(this)') %>
+          <%= search_field_tag(:q, params[:q], class: 'form-control input-sm', id: 'symphonia_query_q', placeholder: t(:label_search), autofocus: params[:q].present? || nil, data: { remote: local_assigns[:remote] }, onchange: 'Symphonia.filters.search(this);') %>
           <div class="input-group-append">
             <div class="input-group-text">
               <%= link_to(icon('search'), 'javascript:void(0)', { onclick: 'Symphonia.filters.search(document.getElementById("symphonia_query_q"))', title: t(:button_search) }) %>

data/lib/symphonia/bootstrap_link_render.rb

@@ -35,32 +35,22 @@ module Symphonia
       @options[:query] && @options[:query].to_params || {}
     end
 
-    def url(page)
-      @base_url_params ||= begin
-        url_params = merge_get_params(default_url_params)
-        url_params[:only_path] = true
-        merge_optional_params(url_params)
-      end
-
-      @template.url_for(@base_url_params.merge({:page => page}))
-    end
-
     def page_number(page)
       link_options = @options[:link_options] || {}
-
+      aria_label = @template.will_paginate_translate(:page_aria_label, :page => page.to_i) { "Page #{page}" }
       if page == current_page
-        tag(:span, page, class: 'page-link current_page')
+        tag(:span, page, :class => 'page-link current_page current', :"aria-label" => aria_label, :"aria-current" => 'page')
       else
         link_options.merge! class: 'page-link', rel: rel_value(page)
-        link(page, page, {:'data-remote' => @options[:remote]}.merge(link_options))
+        link(page, page, {:'data-remote' => @options[:remote], :"aria-label" => aria_label}.merge(link_options))
       end
     end
 
-    def previous_or_next_page(page, text, classname)
+    def previous_or_next_page(page, text, classname, aria_label = nil)
       if page
-        link(text, page, :'data-remote' => @options[:remote], class: "page-link #{classname}")
+        link(text, page, :'data-remote' => @options[:remote], :'aria-label' => aria_label, class: "page-link #{classname}")
       else
-        tag(:span, text, class: "page-link #{classname} disabled")
+        tag(:span, text, class: "page-link #{classname} disabled", :'aria-label' => aria_label)
       end
     end
 

data/lib/symphonia/engine.rb

@@ -1,5 +1,3 @@
-require 'symphonia/object'
-
 require 'authlogic'
 require 'cancancan'
 require 'scrypt'

data/lib/symphonia/model_attributes/attribute.rb

@@ -163,7 +163,7 @@ module Symphonia
     class BooleanAttribute < Attribute
 
       def format_value(view, value, _entity)
-        if value.to_boolean
+        if value.to_s == "true"
           view.icon('true', view.t(:true))
         else
           view.icon('false', view.t(:false))

data/lib/symphonia/model_filters/date_filter.rb

@@ -70,7 +70,7 @@ module Symphonia
             }) +
               # context.content_tag(:span, context.t('query_options.filter_date.to'), class: 'input-group-addon')+
               context.date_field_tag("#{form_field_name}_custom[from]", '', {
-                placeholder: _c.t('query_options.filter_date.from'),
+                placeholder: context.t('query_options.filter_date.from'),
                 class: 'form-control datepicker',
               })
           end

data/lib/symphonia/query.rb

@@ -40,7 +40,7 @@ module Symphonia
       @sort_col, @sort_dir = params[:sort]&.split(":")
       @sort_dir ||= params[:direction]
       self.entity_scope = entity.like(@q) if (@q = params[:q].presence)
-      setup_filters(params) if (@set_filter = params[:set_filter].to_boolean)
+      setup_filters(params) if (@set_filter = params[:set_filter].to_s == "1")
       setup_columns(params)
     end
 
@@ -167,9 +167,7 @@ module Symphonia
       if @q
         { q: @q }
       elsif @set_filter || force
-        filters.inject(set_filter: 1) do |(f, v), mem|
-          mem[f.send(:form_field_name).to_sym] = v
-        end
+        filters.each_with_object(set_filter: 1) { |var, mem| f, v = var; mem[f.send(:form_field_name).to_sym] = v; }
       else
         {}
       end

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = '5.0.6'
+  VERSION = '6.0.0'
 
 end

data/spec/spec_helper.rb

@@ -39,13 +39,11 @@ RSpec.configure do |config|
   config.include Authlogic::TestCase
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation, except: %w[ar_internal_metadata])
   end
 
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
-    Rails.application.config.action_mailer.delivery_method = :test
     Symphonia::User.current = nil
   end
 
@@ -61,7 +59,6 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    ActiveJob::Base.queue_adapter = :test
     DatabaseCleaner.start
   end
 

data/spec/views/filters/options.html.erb_spec.rb

@@ -5,10 +5,11 @@ RSpec.describe "symphonia/filters/options.html.erb" do
     q.model = DummyQueryEntity
     q
   end
+
   it "render" do
     assign(:query, query)
     params[:path] = "/"
-    render
+    render template: "symphonia/filters/options"
     expect(rendered).to include "form", "checked"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 6.0.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: '6.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -80,62 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: net-pop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: net-imap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +112,16 @@ dependencies:
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: sidekiq-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: sortable-table
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
 description: Basis of my applications
 email:
 - admin@luk4s.cz
@@ -382,7 +340,6 @@ files:
 - lib/symphonia/model_filters/integer_filter.rb
 - lib/symphonia/model_filters/select_filter.rb
 - lib/symphonia/model_filters/string_filter.rb
-- lib/symphonia/object.rb
 - lib/symphonia/query.rb
 - lib/symphonia/query_columns.rb
 - lib/symphonia/query_columns/attribute_column.rb
@@ -439,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: My administration

data/lib/symphonia/object.rb

@@ -1,31 +0,0 @@
-class String
-
-  def to_boolean
-    ['true', 1, '1', 'yes', 't', 'y'].include?(downcase)
-  end
-
-end
-
-class NilClass
-
-  def to_boolean
-    false
-  end
-
-end
-
-class FalseClass
-
-  def to_boolean
-    false
-  end
-
-end
-
-class TrueClass
-
-  def to_boolean
-    true
-  end
-
-end