symphonia 2.1.8 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da447b65e8df134e762dd99e232857836329c8a242d16566c6ef5f1d8295d2f
-  data.tar.gz: de6d595aade9877cc75469461c0224f9b1b9ed4835aa165a1be27882fa2718ad
+  metadata.gz: 6dbb027e9c0aabbd327fd90ec05a572978a20404790f27decfcecc1db39ca347
+  data.tar.gz: 11320d1a38c2ebc7b95cee4020ac1192849c1473fbca1bf58508ce6c882c4e91
 SHA512:
-  metadata.gz: 229511c5b388840de246acec21ffb3051628a5fa54627745fa8806e766071078d38bc5c5087a15c0d78a1d163bdef4df49bb39f2c44521817c2105a7520ff7f2
-  data.tar.gz: 6fa7d0ccde1636f9098cc0b472fb2dd166261607d2be17953cdc9df092d99aa5bffa03adefd123231a2dba6c9fb61e28737a24bdd0de7a9ffb2e7a6e013ff8cd
+  metadata.gz: 74731d7d000a1591b7046715a9118fd566a990c30900ddac2e6638a9799b8350f256a11a074e9e6b6eb2b3ed43911fb5785348bd0407644d2581450b4ab278be
+  data.tar.gz: 5a38f655057548ff77d21b738aee676adfa25ac6117647e45ad00d80d41a1dee52f5c59af5ef2d86f8096d431f7ff9552486bbd1f99ab0ec05372460569399db

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

@@ -22,9 +22,20 @@ $(document).on("ready turbolinks:load", function () {
     $("header ul.nav li").removeClass('active');
     menuItem.className += ' active';
   }
-  if (typeof($.colorbox) === "function") {
+  if (typeof ($.colorbox) === "function") {
     $.colorbox.remove();
-    $('a.symphonia-lightbox[data-lightbox="true"]').colorbox({rel: 'gallery', maxHeight: '80%', photo: true});
+    $('a.symphonia-lightbox[data-lightbox="true"]').colorbox({
+      rel: 'gallery',
+      maxHeight: '80%',
+      photo: true,
+      current: function (settings) {
+        if (settings.el.title.length > 0) {
+        } else {
+          return settings.el.dataset.current || "image {current} of {total}";
+        }
+      }
+
+    });
   }
   var images = document.getElementById("editable_images");
   if (images) {
@@ -108,7 +119,7 @@ Symphonia.filters = {
       window.location.search = '';
     }
   },
-  removeRow: function(id) {
+  removeRow: function (id) {
     var el = document.getElementById(id);
     el.remove();
   }
@@ -134,7 +145,7 @@ SymphoniaCheckboxes = {
     toggler.dataset.checked = !isChecked;
   },
   toggle: function (input, isChecked) {
-    if (typeof(isChecked) === "undefined")
+    if (typeof (isChecked) === "undefined")
       isChecked = input.checked;
 
     input.checked = !isChecked;

data/app/helpers/symphonia/application_helper.rb

@@ -23,7 +23,7 @@ module Symphonia
     def render_flash_messages(flash_messages = nil)
       s = ''
       Array(flash_messages || flash).each do |type, message|
-        s << content_tag(:div, class: "alert #{bootstrap_class_for(type)}") do
+        s << content_tag(:div, class: "d-print-none alert #{bootstrap_class_for(type)}") do
           content_tag(:button, '', class: 'fa fa-times-circle-o close', data: { dismiss: 'alert' }) + Array.wrap(message).collect { |m| fa_icon(type, text: m) }.join("<br>").html_safe
         end
       end
@@ -195,10 +195,10 @@ module Symphonia
 
       anchor = options.has_key?(:anchor) ? options.delete(:anchor) : 'page_header'
       label = options.delete(:label) || t("label_#{controller_name.singularize}_new")
-      url = options.delete(:url) || new_polymorphic_path(controller_name.singularize, anchor: anchor)
-      link = link_to(fa_icon('add', text: label), url, { class: 'btn btn-primary' }.merge(options))
+      model = controller.try(:model) || controller_name.singularize
+      url = options.delete(:url) || new_polymorphic_path(model, anchor: anchor)
 
-      # content_tag(:div, link, class: 'contextual')
+      link_to(fa_icon('add', text: label), url, { class: 'btn btn-primary' }.merge(options))
     end
 
     # change the default link renderer for will_paginate

data/app/helpers/symphonia/renderer_helper.rb

@@ -45,7 +45,8 @@ module Symphonia
       end
 
       def edit_link(entity)
-        @_c.link_to(@_c.icon('edit', t(:button_edit)), @_c.edit_polymorphic_path(entity, back_url: @_c.polymorphic_path(@_c.controller_name, page: @_c.params[:page])))
+        model = @_c.controller.try(:model) || @_c.controller_name
+        @_c.link_to(@_c.icon('edit', t(:button_edit)), @_c.edit_polymorphic_path(entity, back_url: @_c.polymorphic_path(model, page: @_c.params[:page])))
       end
 
       def delete_link(entity)

data/app/models/symphonia/user.rb

@@ -134,6 +134,10 @@ module Symphonia
       def persistence_token
         nil
       end
+
+      def language
+        Symphonia.config.default_locale || I18n.default_locale
+      end
     end
 
   end

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

@@ -0,0 +1,5 @@
+<%= title :"label_#{controller.model.name.underscore}" do %>
+  <%= link_to_new_entity %>
+<% end %>
+<%= render('symphonia/common/filters', remote: true) %>
+<%= render_symphonia_table(@query) %>

data/lib/symphonia/base_controller.rb

@@ -34,7 +34,7 @@ module Symphonia
     end
 
     def new
-      @entity ||= instance_variable_set(:"@#{model_name}", model.new)
+      @entity ||= instance_variable_set(:"@#{model_name}", model.new(params.fetch(model_name, {}).permit(safe_attributes)))
     end
 
     def edit
@@ -44,6 +44,7 @@ module Symphonia
       @entity ||= instance_variable_set(:"@#{model_name}", model.new(entity_params))
       respond_to do |format|
         if @entity.save
+          after_create
           format.html { redirect_back_or_default @entity, notice: t(:text_created) }
           format.json { render json: @entity, status: :created, location: @entity }
         else
@@ -56,6 +57,7 @@ module Symphonia
     def update
       respond_to do |format|
         if @entity.update(entity_params)
+          after_update
           format.html { redirect_back_or_default @entity, notice: t(:text_updated) }
           format.json { head :no_content }
         else
@@ -92,5 +94,13 @@ module Symphonia
       model.name.demodulize.underscore.to_sym
     end
 
+    def after_create
+
+    end
+
+    def after_update
+
+    end
+
   end
 end

data/lib/symphonia/controller_extensions.rb

@@ -5,7 +5,8 @@ module Symphonia
 
 
     included do
-      class Unauthorized < Exception; end
+      class Unauthorized < Exception;
+      end
 
       before_action :current_user, :menu_item
       before_action :set_default_locale
@@ -73,8 +74,9 @@ module Symphonia
     # private
 
     def set_locale
-      client_lang = params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten
-      @client_lang = Array(client_lang).detect { |l| I18n.available_locales.include?(l.to_sym) }
+      client_lang = Array(params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten)
+      client_lang.unshift current_user.language if current_user.language
+      @client_lang = client_lang.detect { |l| I18n.available_locales.include?(l.to_sym) }
 
       I18n.locale = (@client_lang || I18n.default_locale)
       session[:locale] = I18n.locale
@@ -97,9 +99,8 @@ module Symphonia
             store_location
             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: 403
-          end
+          format.json { render json: { errors: 'You must be logged in to access this endpoint' }, status: 401 }
+          format.any { head 401 }
         end
         return false
       end
@@ -111,6 +112,7 @@ module Symphonia
 
     def admin_require
       return unless login_require
+
       unless current_user.admin?
         render_403
         return false

data/lib/symphonia/model_filters/select_filter.rb

@@ -18,7 +18,11 @@ module Symphonia
       end
 
       def value=(q)
-        @value = Array(q)
+        @value = if q.is_a?(Array)
+                   q
+                 else
+                   q.to_s.split("|")
+                 end
       end
 
       def operator=(o)
@@ -28,7 +32,7 @@ module Symphonia
       end
 
       def apply(scope)
-        super
+        Rails.logger.debug("Apply filter #{name} '#{operator}' #{value}")
         t = scope.arel_table
         scope.where(t[name].send(operator, value))
       end

data/lib/symphonia/model_filters/string_filter.rb

@@ -5,7 +5,7 @@ module Symphonia
       def apply(scope)
         super
         t = scope.arel_table
-        scope.where(t[name].lower.send(operator, Array(value).map(&:downcase)))
+        scope.where(t[name].lower.send(operator, value&.downcase))
       end
 
       def form_field(_c)

data/lib/symphonia/user_management.rb

@@ -15,7 +15,7 @@ module Symphonia
       validates :login, :mail, :first_name, :last_name, presence: true
 
       def self.current=(entity)
-        Rails.logger.info("* #{entity.class.name}: #{entity.login} id: #{entity.id}")
+        Rails.logger.info("* #{entity.class.name}: #{entity.login} id: #{entity.id}") if entity
         Thread.current[:"current_#{name.underscore}"] = entity
       end
 

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '2.1.8'
+  VERSION = '2.2.1'
 end

data/spec/models/query/filters_spec.rb

@@ -0,0 +1,29 @@
+RSpec.describe Symphonia::ModelFilters::Base do
+  let(:query) { Symphonia::User.query.new }
+  let!(:user) { FactoryBot.create :user, email: "sample@dummy.cz", status: "active" }
+
+  describe "string" do
+    subject { Symphonia::ModelFilters::StringFilter.new attribute, query }
+
+    let(:attribute) { Symphonia::User.registered_attributes[:email] }
+    it "simple filter" do
+      subject.value = "~sample@dummy.cz"
+      expect(subject.apply(Symphonia::User.all).count).to eq 1
+    end
+
+  end
+
+  describe "status" do
+    let(:attribute) { Symphonia::User.registered_attributes[:status] }
+    subject { Symphonia::ModelFilters::SelectFilter.new attribute, query }
+
+    it "simple filter" do
+      subject.value = "1"
+      expect(subject.apply(Symphonia::User.all).count).to eq 1
+    end
+    it "array filter" do
+      subject.value = "1|2|3"
+      expect(subject.apply(Symphonia::User.all).count).to eq 1
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -51,6 +51,7 @@ RSpec.configure do |config|
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
     Rails.application.config.action_mailer.delivery_method = :test
+    Symphonia::User.current = nil
   end
 
   config.before(:each, type: :feature) do

data/spec/support/shared_controllers.rb

@@ -10,7 +10,7 @@ RSpec.shared_examples 'a controller actions' do |factory|
 
   it '#destroy' do
     entity # touch
-    expect { delete :destroy, params: { id: entity } }.to change(subject, :count).by(-1)
+    expect { delete :destroy, params: { id: entity } }.to change(entity.class, :count).by(-1)
   end
 
   context 'json' do
@@ -24,7 +24,7 @@ RSpec.shared_examples 'a controller actions' do |factory|
     it '#show' do
       get :show, params: {id: entity, format: 'json'}
       expect(response).to have_http_status(:success)
-      expect(response.body).to include %Q{"id":#{entity.id}}
+      expect(response.body).to include "id", entity.id.to_s
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.2.1
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -524,6 +524,7 @@ files:
 - app/views/symphonia/accounts/update.js.erb
 - app/views/symphonia/admin/index.html.erb
 - app/views/symphonia/attachments/destroy.js.erb
+- app/views/symphonia/base/index.html.erb
 - app/views/symphonia/common/_editable_images_grid.html.erb
 - app/views/symphonia/common/_filters.html.erb
 - app/views/symphonia/common/_locale_chooser.html.erb
@@ -619,6 +620,7 @@ files:
 - spec/mailers/symphonia/notifier_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/query/attribute_spec.rb
+- spec/models/query/filters_spec.rb
 - spec/models/query/symphonia_query_spec.rb
 - spec/models/role_spec.rb
 - spec/models/user_spec.rb
@@ -657,8 +659,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: My administration
@@ -670,6 +671,7 @@ test_files:
 - spec/models/attachment_spec.rb
 - spec/models/query/attribute_spec.rb
 - spec/models/query/symphonia_query_spec.rb
+- spec/models/query/filters_spec.rb
 - spec/models/user_spec.rb
 - spec/models/role_spec.rb
 - spec/requests/roles_spec.rb