symphonia 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbaab70557fe0b832f613459ec8b05d74de1e150cd1f1976de5230ace666f0fd
-  data.tar.gz: aae5ec3a1707998fe75f595851f5a3addbbd7daff1901f6190662a9342391e2c
+  metadata.gz: c5b28e0e3450123e448544ebc31cc508547f46edf4720ae1ccd14388d43f4d79
+  data.tar.gz: 50220dbb88357b44759b56922ed45fbdb39d318abb6984d014b4b54d28ccbbe4
 SHA512:
-  metadata.gz: 15fde87f3e9a1748826b980e48dbcd18e7302e19db5abb52ba73c58f58a760b5e0aec33ad9d2caeb58af6eb869a7e8bae82e46e666f6213f7b3cd286d369dc38
-  data.tar.gz: 37913e513d2d135311daafd33fa5d1beea5ed01da83d002f4742e95425a74bb8aeff4c62280c8d4333f7612236b2b5fdee11007dae3710b34d4208c7c1d2538d
+  metadata.gz: b3d488537c8872ce378ea9cb196b01f5cf0f5a116fa2b849e6e7d20cf5c4e4f56c5e69eae370c74885a752e837a58ecb7899649b0e47fa8c445510a8f806bf82
+  data.tar.gz: fb4e0f340bd7efa71dbca9a549151c01ffda76147282f2257dc0ba1fe19368880b442db5d810e538931c7a47e30ada443834e22f743dbbe6f5d5a85dcd13dff9

data/.rubocop.yml

@@ -1,8 +1,14 @@
+#require:
+#  - rubocop-rails
 All:
   Rails: true
 AllCops:
   TargetRubyVersion: 2.5
 
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines_special
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines_except_namespace
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented_relative_to_receiver
 

data/app/assets/config/symphonia_manifest.js

@@ -0,0 +1,5 @@
+//= link_tree ../images
+// link_directory ../javascripts/symphonia .js
+// link_directory ../stylesheets/symphonia .css
+//= link ../../javascripts/symphonia/application.js
+//= link ../../stylesheets/symphonia/application.css

data/app/controllers/base_controller.rb

@@ -0,0 +1,4 @@
+# @abstract used for templates
+class BaseController < ApplicationController
+  include Symphonia::BaseController
+end

data/app/controllers/symphonia/accounts_controller.rb

@@ -23,17 +23,17 @@ module Symphonia
     def create
       menu_item(:register)
       @user.attributes = user_params
-      if Symphonia.config[:self_activation_enabled]
-        @user.status = @user.class.statuses[:active]
-      else
-        @user.status = @user.class.statuses[:pending]
-      end
+      @user.status = if Symphonia.config[:self_activation_enabled]
+                       @user.class.statuses[:active]
+                     else
+                       @user.class.statuses[:pending]
+                     end
       respond_to do |format|
         verified = if defined?(Recaptcha)
-          @user.valid? && verify_recaptcha(model: @user)
-        else
-          true
-        end
+                     @user.valid? && verify_recaptcha(model: @user)
+                   else
+                     true
+                   end
         if verified && @user.save
           Notifier.activation_user(@user).deliver_now
           Notifier.user_registered(@user).deliver_now
@@ -113,7 +113,7 @@ module Symphonia
       @user = find_account_by_token(params.require(:id))
       return render_404 if @user.nil?
 
-      if params[:password]# && params[:password_confirmation]
+      if params[:password] # && params[:password_confirmation]
         @user.password = params[:password]
         # @user.password_confirmation = params[:password_confirmation]
       end
@@ -145,11 +145,12 @@ module Symphonia
 
     def prepare_user
       return render_403 unless Symphonia.config[:allow_registrations]
+
       @user = User.new
     end
 
     def user_params
-      params.require(:user).permit(:login, :first_name, :last_name, :password, :password_confirmation, :email, :mail, preference_ids: [])
+      params.require(:user).permit(:login, :name, :first_name, :last_name, :password, :password_confirmation, :email, :mail, preference_ids: [])
     end
 
     def current_account

data/app/controllers/symphonia/users_controller.rb

@@ -1,6 +1,6 @@
 module Symphonia
   class UsersController < ApplicationController
-    include Swagger::Blocks
+    include ::Swagger::Blocks
 
     swagger_path '/admin/users/{id}.json' do
       operation :get do
@@ -165,4 +165,4 @@ module Symphonia
       params.require(:user).permit(allowed)
     end
   end
-end
+end

data/app/helpers/symphonia/renderer_helper.rb

@@ -69,8 +69,7 @@ module Symphonia
         options_class = options.delete(:class)
         css_class = is_current_column ? "current #{current_column.direction} #{options_class}" : options_class
         direction = is_current_column && current_column.direction == 'asc' ? 'desc' : 'asc'
-        sort_params = { "#{prefix}sort" => column.sort_definition.column,
-                        "#{prefix}direction" => direction,
+        sort_params = { "#{prefix}sort" => "#{column.sort_definition.column}:#{direction}",
                         "#{prefix}page" => nil }
         @_c.link_to title, query.to_params.merge(sort_params), options.merge({ class: css_class })
       end

data/app/models/symphonia/user.rb

@@ -99,6 +99,7 @@ module Symphonia
     # def form_path
     #   'symphonia/users/form'
     # end
+
     private
 
     def require_password?

data/app/views/base/_form.html.erb

@@ -0,0 +1,15 @@
+<%= symphonia_form_for(@entity) do |f| %>
+  <%= f.error_messages %>
+
+  <% @entity.class.registered_attributes.each do |name, attribute| %>
+    <% next unless attribute.input_field %>
+    <p>
+      <%= f.send attribute.input_field, name, attribute.input_options %>
+    </p>
+  <% end %>
+
+  <p class="buttons">
+    <%= link_to_back(polymorphic_path(@entity.class)) %>
+    <%= f.primary %>
+  </p>
+<% end %>

data/app/views/base/edit.html.erb

@@ -0,0 +1,3 @@
+<%= title @entity.to_s %>
+
+<%= render 'form' %>

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

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

data/app/views/base/new.html.erb

@@ -0,0 +1,3 @@
+<%= title t("label_#{controller.model_name}_new") %>
+
+<%= render 'form' %>

data/app/views/base/show.html.erb

@@ -0,0 +1,10 @@
+<%= title @entity.to_s do %>
+  <%= link_to icon("edit", t(:button_edit)), edit_polymorphic_path(@entity) %>
+<% end %>
+
+<% @entity.attributes do |name, value, attribute| %>
+  <div class="<%= attribute.class.name.demodulize.underscore %>">
+    <dt><%= @entity.label name %></dt>
+    <dd><%= value %></dd>
+  </div>
+<% end %>

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

@@ -1,20 +1,30 @@
 <% name = @user.class.name.demodulize.downcase %>
 <%= title(t(:"label_register_new_#{name}")) %>
-<%= symphonia_form_for(@user, url: account_register_path) do |f| %>
-  <div style="width:1px;height: 1px;visibility: hidden"><%= check_box_tag :terms, true %></div>
 
-  <%= render(partial: "symphonia/#{name.pluralize}/form", locals: { f: f }) %>
-
-  <% if defined? Recaptcha %>
-  <fieldset>
-    <%= content_tag(:legend, t(:text_explanation_recaptcha)) %>
-    <div class="form-group">
-      <div class="col-sm-offset-4 col-sm-5">
-        <%#= invisible_recaptcha_tags %>
-        <%= recaptcha_tags(:display => {:theme => 'white'}) %>
+<div class="row">
+  <div class="col-md-6 col-xs-12 mx-auto">
+    <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>
+          <%= f.error_messages %>
+          <%= f.email_field :mail, required: true, prepend: "@" %>
+          <%= f.text_field :name, required: true, prepend: icon("user") %>
+          <%= f.password_field :password, required: true, prepend: icon('key') %>
+          <% if defined? Recaptcha %>
+            <fieldset>
+              <%= content_tag(:legend, t(:text_explanation_recaptcha)) %>
+              <div class="form-group">
+                <div class="col-sm-offset-4 col-sm-5">
+                  <%#= invisible_recaptcha_tags %>
+                  <%= recaptcha_tags(:display => { :theme => 'white' }) %>
+                </div>
+              </div>
+            </fieldset>
+          <% end %>
+          <%= f.primary t(:button_register), class: 'btn btn-primary btn-block' %>
+        <% end %>
       </div>
     </div>
-  </fieldset>
-  <% end %>
-  <%= f.primary t(:button_register) %>
-<% end %>
+  </div>
+</div>

data/config/locales/cs.yml

@@ -14,7 +14,7 @@ cs:
       # not_confirmed: Your account is not confirmed
       # not_approved: Your account is not approved
       # no_authentication_details: You did not provide any details for authentication.
-      general_credentials_error: login nebo heslo
+      general_credentials_error: Login nebo heslo není správně
     models:
       user_session: Přihlášení
     attributes:

data/lib/symphonia.rb

@@ -2,14 +2,15 @@
 module Symphonia
   include ::ActiveSupport::Configurable
 
+  autoload :Attachable, 'symphonia/attachable'
   autoload :BaseController, 'symphonia/base_controller'
+  autoload :BootstrapLinkRender, 'symphonia/bootstrap_link_render'
   autoload :ControllerExtensions, 'symphonia/controller_extensions'
+  autoload :EntityDecorator, 'symphonia/entity_decorator'
   autoload :FormBuilder, 'symphonia/form_builder'
-  autoload :BootstrapLinkRender, 'symphonia/bootstrap_link_render'
-  autoload :Query, 'symphonia/query'
   autoload :ModelAttributes, 'symphonia/model_attributes'
   autoload :ModelFilters, 'symphonia/model_filters'
-  autoload :Attachable, 'symphonia/attachable'
+  autoload :Query, 'symphonia/query'
   autoload :QueryColumns, 'symphonia/query_columns'
 
   module ActionCable

data/lib/symphonia/base_controller.rb

@@ -1,4 +1,11 @@
 module Symphonia
+  # General controller for CRUD operations of Entity
+  #
+  # How to use:
+  # include Symphonia::BaseController
+  # def model
+  #   YourModel
+  # end
   module BaseController
     extend ActiveSupport::Concern
 
@@ -9,8 +16,30 @@ module Symphonia
       include Rails::Pagination
       helper Symphonia::RendererHelper
 
+      class_attribute :model
+
+    end
+
+    class_methods do
+
+      # def model=(klass)
+      #   @model = klass
+      # end
+      #
+      # def model
+      #   @model
+      # end
     end
 
+    # def model
+    #   self.class.model
+    # end
+    # @abstract model
+    # by default it guess from class name of controller
+    # def model
+    #   @model ||= self.class.name.remove("Controller").classify.constantize
+    # end
+
     def index
       @query ||= model.query.new
       @query.from_params params
@@ -28,7 +57,7 @@ module Symphonia
 
     def show
       respond_to do |format|
-        format.html
+        format.html { @entity = Symphonia::EntityDecorator.new(@entity, view_context) }
         format.json { render json: @entity }
       end
     end
@@ -70,13 +99,18 @@ module Symphonia
     def destroy
       @entity.destroy
       respond_to do |format|
-        format.html { redirect_back_or_default(action: :index, notice: t(:text_destroyed)) }
+        format.html { redirect_back_or_default(polymorphic_path(model), notice: t(:text_destroyed)) }
         format.json { head :no_content }
-        format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@entity)}')"}
+        format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@entity)}')" }
       end
     end
 
+    def model_name
+      model.name.demodulize.underscore.to_sym
+    end
+
     private
+
     # Use callbacks to share common setup or constraints between actions.
     def find_entity
       @entity ||= instance_variable_set(:"@#{model_name}", model.find(params[:id]))
@@ -85,15 +119,12 @@ module Symphonia
     def safe_attributes
       []
     end
+
     # Never trust parameters from the scary internet, only allow the white list through.
     def entity_params
       params.require(model_name).permit(safe_attributes)
     end
 
-    def model_name
-      model.name.demodulize.underscore.to_sym
-    end
-
     def after_create
 
     end
@@ -103,4 +134,4 @@ module Symphonia
     end
 
   end
-end
+end

data/lib/symphonia/controller_extensions.rb

@@ -13,6 +13,8 @@ module Symphonia
 
       # force_ssl if: -> {Rails.env.production? && User.current.ssl?}
 
+      add_flash_types :notice
+      add_flash_types :info
       add_flash_types :warning
       add_flash_types :error
 

data/lib/symphonia/engine.rb

@@ -21,7 +21,7 @@ require 'acts_as_list'
 require 'bootstrap_form'
 require 'the_sortable_tree'
 require 'bootstrap-datepicker-rails'
-require 'wicked_pdf'
+# require 'wicked_pdf'
 require 'swagger/blocks'
 
 module Symphonia
@@ -82,6 +82,7 @@ module Symphonia
     end
 
     initializer :assets do |_app|
+      config.assets.precompile << 'symphonia/application.css'
       if defined?(::Ckeditor)
         config.assets.precompile << 'ckeditor/**/*'
         config.assets.precompile << 'symphonia/symphonia_ckeditor.js'
@@ -96,13 +97,13 @@ module Symphonia
 
     end
 
-    initializer :wicked_pdf do |_app|
-      WickedPdf.config = {
-        layout: 'application.pdf',
-        print_media_type: true,
-        viewport_size: '1280x800', zoom: 0.7, dpi: 300
-      }
-    end
+    # initializer :wicked_pdf do |_app|
+    #   WickedPdf.config = {
+    #     layout: 'application.pdf',
+    #     print_media_type: true,
+    #     viewport_size: '1280x800', zoom: 0.7, dpi: 300
+    #   }
+    # end
 
     initializer :api_paginate do
       ApiPagination.configure do |config|

data/lib/symphonia/entity_decorator.rb

@@ -0,0 +1,34 @@
+module Symphonia
+  # This class decorate general entity
+  class EntityDecorator < SimpleDelegator
+
+    def initialize(entity, view_context)
+      @view_context = view_context
+      super(entity)
+    end
+
+    def registered_attributes
+      __getobj__.class.registered_attributes
+    end
+
+    def label(name, **options)
+      __getobj__.class.human_attribute_name name, options
+    end
+
+    def attributes(&block)
+      registered_attributes.collect do |name, attr|
+        value = __getobj__.format_value(name, @view_context)
+        yield name, value, attr if block_given?
+        [name, value]
+      end.to_h
+    end
+
+    # def name
+    #   @name ||= super || registered_attributes.find { |name, a| name == :name }.last
+    # end
+    #
+    # def title
+    #   super || name || to_s
+    # end
+  end
+end

data/lib/symphonia/model_attributes/attribute.rb

@@ -22,7 +22,7 @@ module Symphonia
         entity.send(name)
       end
 
-      def format(view, entity, options={})
+      def format(view, entity, options = {})
         @format_options = options
         if @formatter.is_a?(Proc)
           @formatter.call(view, self, entity).to_s
@@ -61,6 +61,18 @@ module Symphonia
         !!@options[:default]
       end
 
+      def required?
+
+      end
+
+      def input_field
+        :text_field
+      end
+
+      def input_options
+        {}
+      end
+
       private
 
       def format_value(_view, value, _entity)
@@ -69,6 +81,15 @@ module Symphonia
     end
 
 
+    class TextAttribute < Attribute
+      def format_value(view, value, entity)
+        view.format_text(value)
+      end
+
+      def input_field
+        :text_area
+      end
+    end
     class DecimalAttribute < Attribute
       def format_value(view, value, entity)
         view.format_price(value)
@@ -80,6 +101,14 @@ module Symphonia
       def format_value(view, value, entity)
         view.t("#{@klass.name.underscore}.#{name.to_s.pluralize}.#{value}", format_options)
       end
+
+      def input_field
+        :select
+      end
+
+      def input_options
+        []
+      end
     end
 
     class LinkAttribute < Attribute
@@ -101,12 +130,26 @@ module Symphonia
       end
 
       def title
-        @klass.human_attribute_name(@klass.reflect_on_association(name).foreign_key, @options[:i18n] || {})
+        if (ref = @klass.reflect_on_association(name)).macro == :belongs_to
+          @klass.human_attribute_name(ref.foreign_key, @options[:i18n] || {})
+        else
+          super
+        end
+
       end
 
       def format_value(view, value, entity)
-        view.link_to value.to_s, value, format_options
+        if value.is_a?(ActiveRecord::Associations::CollectionProxy) || value.is_a?(Array)
+          value.collect { |v| view.link_to v.to_s, v, format_options }.join("\n").html_safe
+        else
+          view.link_to value.to_s, value, format_options
+        end
+      end
+
+      def input_field
+        nil
       end
+
     end
 
     class BooleanAttribute < Attribute
@@ -117,6 +160,10 @@ module Symphonia
           view.icon('false', view.t(:false))
         end
       end
+
+      def input_field
+        :check_box
+      end
     end
 
     class DateAttribute < Attribute
@@ -134,4 +181,4 @@ module Symphonia
       # alias
     end
   end
-end
+end

data/lib/symphonia/query.rb

@@ -23,9 +23,7 @@ module Symphonia
         # @query.from_params params
         #
       end
-      if options[:default_order]
-        ActiveSupport::Deprecation.warn("default_order is deprecated, use just `sort`")
-      end
+      ActiveSupport::Deprecation.warn("default_order is deprecated, use just `sort`") if options[:default_order]
       @active_filters = {}
       @default_sort = sort
       @default_filters = filters
@@ -33,13 +31,15 @@ module Symphonia
       @options = options
     end
 
+    # @param [Hash] params
+    # @option params [String] :sort name of column, also can be name:direction
+    # @option params [String] :direction ASC or DESC
+    # @option params [Boolean] :set_filter if `true` apply filters
     def from_params(params)
-      @sort_col = params[:sort]
-      @sort_dir = params[:direction]
+      @sort_col, @sort_dir = params[:sort]&.split(":")
+      @sort_dir ||= params[:direction]
       self.entity_scope = entity.like(@q) if (@q = params[:q].presence)
-      if (@set_filter = params[:set_filter].to_boolean)
-        setup_filters(params)
-      end
+      setup_filters(params) if (@set_filter = params[:set_filter].to_boolean)
       setup_columns(params)
     end
 
@@ -255,6 +255,7 @@ module Symphonia
     def add_boolean_column(name, options = {})
       add_column(:boolean, name, options)
     end
+
     #
     def add_attribute_column(attribute, options = {})
       @available_columns[attribute.name] = ::Symphonia::QueryColumns::AttributeColumn.new(attribute, self, options)

data/lib/symphonia/user_management.rb

@@ -12,7 +12,8 @@ module Symphonia
       # validates :mail, uniqueness: true, format: { with: Authlogic::Regex::EMAIL_NONASCII }
       # validates :password, presence: true, if: ->(u){ u.new_record? }
 
-      validates :login, :mail, :first_name, :last_name, presence: true
+      validates :email, presence: true, uniqueness: { case_sensitive: false }
+      validates :login, :first_name, presence: true
 
       def self.current=(entity)
         Rails.logger.info("* #{entity.class.name}: #{entity.login} id: #{entity.id}") if entity

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 end

data/spec/controllers/base_controller_spec.rb

@@ -0,0 +1,42 @@
+class ModelA
+
+  def self.find(_)
+    new
+  end
+end
+
+class ModelB
+
+  def self.find(_)
+    new
+  end
+end
+
+class DummyBaseA < Symphonia::ApplicationController
+  include Symphonia::BaseController
+  self.model = ModelA
+end
+class DummyBaseB < DummyBaseA
+  # include Symphonia::BaseController
+  self.model = ModelB
+end
+
+RSpec.describe DummyBaseB do
+  # subject { described_class.new }
+  controller do
+    def show
+      render plain: model.name
+    end
+  end
+  it "#model" do
+    subject = DummyBaseA.new
+    expect(subject.model).to eq ModelA
+    subject = DummyBaseB.new
+    expect(subject.model).to eq ModelB
+  end
+
+  it "#show" do
+    get :show, params: { id: 1 }
+    expect(response.body).to eq "ModelB"
+  end
+end

data/spec/controllers/users_controller_spec.rb

@@ -1,4 +1,5 @@
-# require_relative '../spec_helper.rb'
+# frozen_string_literal: true
+
 module Symphonia
   describe UsersController, type: 'controller' do
     routes { Symphonia::Engine.routes }
@@ -13,22 +14,22 @@ module Symphonia
 
       context 'not found' do
         it '#show' do
-          get :show, params: {id: 0 }
+          get :show, params: { id: 0 }
           expect(response).to have_http_status :not_found
         end
       end
 
       it '#archive' do
         user.update_columns status: 'active'
-        expect ( post :archive, params: { id: user } )
+        expect(post(:archive, params: { id: user }))
         expect(response).to redirect_to users_url
         expect(user.reload.status).to eq 'archived'
       end
 
       it '#unarchive' do
         user.update_columns status: 'archived'
-        expect( post :unarchive, params: { id: user } )
-        expect(ActionMailer::DeliveryJob).to have_been_enqueued
+        expect(post(:unarchive, params: { id: user }))
+        expect(ActionMailer::MailDeliveryJob).to have_been_enqueued
         expect(response).to redirect_to users_url
         expect(user.reload.status).to eq 'active'
       end

data/spec/helpers/symphonia/entity_decorator_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe Symphonia::ApplicationHelper do
+  let(:entity) { FactoryBot.create :user }
+  subject { Symphonia::EntityDecorator.new entity, spy }
+
+  it "#attributes" do
+    expect(subject.attributes).to be_a Hash
+    expect(subject.attributes[:name]).to include "<a", "mailto", entity.email
+  end
+end

data/spec/models/query/symphonia_query_spec.rb

@@ -53,6 +53,26 @@ RSpec.describe Symphonia::Query do
       q.from_params(column_names: "name")
       expect(q.column_names).to match_array [:name]
     end
+
+    context "sorting" do
+      it "basic" do
+        q = DummyQueryEntity.query.new
+        q.from_params sort: "name"
+        scope = double
+        expect(q).to receive(:scope).and_return scope
+        expect(scope).to receive(:order).with include("first_name", "last_name", "ASC")
+        q.entities
+      end
+
+      it "shortcut direction" do
+        q = DummyQueryEntity.query.new
+        q.from_params sort: "name:desc"
+        scope = double
+        expect(q).to receive(:scope).and_return scope
+        expect(scope).to receive(:order).with include("first_name", "last_name", "DESC")
+        q.entities
+      end
+    end
   end
 
   describe "#entities" do
@@ -67,4 +87,4 @@ RSpec.describe Symphonia::Query do
 
   end
 
-end
+end

data/spec/models/user_spec.rb

@@ -20,8 +20,8 @@ RSpec.describe Symphonia::User do
       expect { FactoryBot.create(:user, password: nil) }.to raise_error ActiveRecord::RecordInvalid
     end
     it "do not require password for external_ids" do
-      expect { FactoryBot.create(:user, password: nil, external_id: "ex1") }.not_to raise_error ActiveRecord::RecordInvalid
+      expect { FactoryBot.create(:user, password: nil, external_id: "ex1") }.not_to raise_error
     end
   end
 
-end
+end

data/spec/support/shared_controllers.rb

@@ -22,10 +22,10 @@ RSpec.shared_examples 'a controller actions' do |factory|
     end
 
     it '#show' do
-      get :show, params: {id: entity, format: 'json'}
+      get :show, params: { id: entity, format: 'json' }
       expect(response).to have_http_status(:success)
       expect(response.body).to include "id", entity.id.to_s
     end
   end
 
-end
+end

data/spec/support/shared_requests.rb

@@ -0,0 +1,32 @@
+RSpec.shared_examples 'a requests actions' do |factory|
+  let(:entity) { FactoryBot.create(factory) }
+  let(:entities_list) { FactoryBot.create_list(factory, 3) }
+
+  it '#index' do
+    entities_list
+    # get :index, params: { use_route: 'admin' }
+    get polymorphic_path(factory.to_s.pluralize)
+    expect(response).to have_http_status(:success)
+  end
+
+  it '#destroy' do
+    entity # touch
+    expect { delete polymorphic_path(entity) }.to change(entity.class, :count).by(-1)
+  end
+
+  context 'json' do
+
+    it '#index' do
+      entities_list
+      get polymorphic_path(factory.to_s.pluralize, format: "json")
+      expect(response).to have_http_status(:success)
+    end
+
+    it '#show' do
+      get polymorphic_path(entity)
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include "id", entity.id.to_s
+    end
+  end
+
+end

data/spec/support/stub_users.rb

@@ -1,9 +1,9 @@
 def admin_user
-  @admin_user ||= FactoryBot.build_stubbed :user, :admin
+  @admin_user ||= FactoryBot.create :user, :admin
 end
 
 def regular_user
-  @regular_user ||= FactoryBot.build_stubbed :user
+  @regular_user ||= FactoryBot.create :user
 end
 
 def add_permission *args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +276,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wicked_pdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -338,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 4.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -364,72 +350,72 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: Basis of my applications
 email:
 - luk4s.pokorny@gmail.com
@@ -441,6 +427,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/symphonia_manifest.js
 - app/assets/images/bg-checker.png
 - app/assets/images/bullet.gif
 - app/assets/images/close.png
@@ -453,7 +440,7 @@ files:
 - app/assets/javascripts/ckeditor/plugins/image_chooser/plugin.js
 - app/assets/javascripts/symphonia/Sortable.js
 - app/assets/javascripts/symphonia/_core.js
-- app/assets/javascripts/symphonia/application.js.erb
+- app/assets/javascripts/symphonia/application.js
 - app/assets/javascripts/symphonia/filters.js
 - app/assets/javascripts/symphonia/symphonia_bootstrap_dialog.js
 - app/assets/javascripts/symphonia/symphonia_ckeditor.js
@@ -462,6 +449,7 @@ files:
 - app/assets/stylesheets/symphonia/filters.scss
 - app/assets/stylesheets/symphonia/symphonia_bootstrap.scss
 - app/channels/application_cable/channel.rb
+- app/controllers/base_controller.rb
 - app/controllers/symphonia/accounts_controller.rb
 - app/controllers/symphonia/admin_controller.rb
 - app/controllers/symphonia/api_controller.rb
@@ -491,6 +479,11 @@ files:
 - app/models/symphonia/swagger/responses.rb
 - app/models/symphonia/user.rb
 - app/models/symphonia/user_session.rb
+- app/views/base/_form.html.erb
+- app/views/base/edit.html.erb
+- app/views/base/index.html.erb
+- app/views/base/new.html.erb
+- app/views/base/show.html.erb
 - app/views/common/403.html.erb
 - app/views/common/404.html.erb
 - app/views/layouts/symphonia/_modal.html.erb
@@ -511,7 +504,6 @@ 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
@@ -573,6 +565,7 @@ files:
 - lib/symphonia/bootstrap_link_render.rb
 - lib/symphonia/controller_extensions.rb
 - lib/symphonia/engine.rb
+- lib/symphonia/entity_decorator.rb
 - lib/symphonia/form_builder.rb
 - lib/symphonia/menu_manager.rb
 - lib/symphonia/model_attributes.rb
@@ -596,6 +589,7 @@ files:
 - spec/controllers/account_controller_spec.rb
 - spec/controllers/admin_controller_spec.rb
 - spec/controllers/api_controller_spec.rb
+- spec/controllers/base_controller_spec.rb
 - spec/controllers/filters_controller_spec.rb
 - spec/controllers/images_controller_spec.rb
 - spec/controllers/login_controller_spec.rb
@@ -603,6 +597,7 @@ files:
 - spec/controllers/users_controller_spec.rb
 - spec/factories/factories.rb
 - spec/helpers/symphonia/application_helper_spec.rb
+- spec/helpers/symphonia/entity_decorator_spec.rb
 - spec/helpers/symphonia/renderer_helper_spec.rb
 - spec/mailers/previews/symphonia/notifier_preview.rb
 - spec/mailers/symphonia/notifier_spec.rb
@@ -623,6 +618,7 @@ files:
 - spec/support/query.rb
 - spec/support/shared.rb
 - spec/support/shared_controllers.rb
+- spec/support/shared_requests.rb
 - spec/support/stub_users.rb
 - spec/support/symphonia.jpg
 - spec/support/wait_for_ajax.rb
@@ -647,7 +643,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: My administration
@@ -673,6 +669,7 @@ test_files:
 - spec/support/shared.rb
 - spec/support/wait_for_ajax.rb
 - spec/support/shared_controllers.rb
+- spec/support/shared_requests.rb
 - spec/support/query.rb
 - spec/factories/factories.rb
 - spec/controllers/roles_controller_spec.rb
@@ -682,8 +679,10 @@ test_files:
 - spec/controllers/filters_controller_spec.rb
 - spec/controllers/admin_controller_spec.rb
 - spec/controllers/account_controller_spec.rb
+- spec/controllers/base_controller_spec.rb
 - spec/controllers/images_controller_spec.rb
 - spec/views/filters/options.html.erb_spec.rb
 - spec/rails_helper.rb
 - spec/helpers/symphonia/application_helper_spec.rb
 - spec/helpers/symphonia/renderer_helper_spec.rb
+- spec/helpers/symphonia/entity_decorator_spec.rb

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

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