symphonia 4.2.0 → 5.0.0

data/lib/symphonia/form_builder.rb

@@ -1,26 +1,26 @@
 module Symphonia
   class FormBuilder < ::BootstrapForm::FormBuilder
 
+    delegate :tag, :t, to: :@template
+
     def error_messages
-      if object.respond_to?(:errors) && object.errors.any?
-        list = content_tag(:p, I18n.t('activerecord.errors.template.body')).html_safe
-        list += content_tag(:ul) do
-          object.errors.full_messages.collect do |error|
-            content_tag(:li, error)
-          end.join.html_safe
-        end
-        content_tag(:div, list, class: 'error_explanation')
+      return if !object.respond_to?(:errors) || object.errors.blank?
+
+      list = tag.p(@template.icon("circle-exclamation", t('activerecord.errors.template.body')))
+      list += tag.ul do
+        object.errors.full_messages.collect do |error|
+          tag.li error
+        end.join.html_safe
       end
+      tag.div(list, class: 'alert alert-danger error_explanation')
     end
 
     def calendar_field(name, options = {})
-      options[:data] ||= {} #{'date-clear-btn': true, 'date-format': 'yyyy-mm-dd'}
-      options[:data][:'date-clear-btn'] ||= true
-      # options[:data][:'date-format'] ||= 'yyyy-mm-dd'
-      text_field(name, options.merge({
-                                         class: 'form-control datepicker',
-                                         append: @template.fa_icon('calendar')
-                                     }))
+      options[:type] ||= "date"
+      text_field(name, options.merge(
+        class: 'form-control datepicker',
+        append: @template.icon('calendar'),
+      ))
     end
 
     # def form_group_builder(method, options, html_options = nil)
@@ -91,6 +91,7 @@ module Symphonia
         options[:text]
       end
     end
+
     # def generate_label(id, name, options, custom_label_col, group_layout)
     #   return if options.blank?
     #   # id is the caller's options[:id] at the only place this method is called.
@@ -134,4 +135,4 @@ module Symphonia
     end
 
   end
-end
+end

data/lib/symphonia/menu_manager.rb

@@ -1,23 +1,27 @@
 module Symphonia
-  module MenuManager
-    @@mapper = {}
-    mattr_accessor :mapper
+  # Store in-app menu super-global object for all instances/workers
+  class MenuManager
+    class << self
 
-    def self.menu(name)
-      return mapper[name.to_sym] || {}
-    end
+      def mapper
+        $mapper ||= {}
+      end
+
+      # @param [Symbol] name
+      def menu(name)
+        mapper[name] || {}
+      end
 
-    class << self
       def map(menu_name)
         mapper[menu_name] ||= {}
-        if block_given?
-          yield mapper[menu_name]
-        end
+        yield mapper[menu_name]
       end
 
       def clear(menu_name)
-        !mapper.delete(menu_name.to_sym).nil?
+        !mapper.delete(menu_name).nil?
       end
+
     end
+
   end
 end

data/lib/symphonia/object.rb

@@ -1,31 +1,31 @@
-class Object
-  # def to_boolean
-  #   return true if self.is_a?(TrueClass)
-
-  #   respond_to?(:downcase) && ['true', 1, '1', 'yes', 't', 'y'].include?(self.downcase)
-  # end
-end
-
 class String
+
   def to_boolean
-    ['true', 1, '1', 'yes', 't', 'y'].include?(self.downcase)
+    ['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

data/lib/symphonia/spec_helper.rb

@@ -1,6 +1,10 @@
-if Rails.env.test?
-  require File.expand_path('../../../spec/spec_helper', __FILE__)
-  Dir.glob(File.expand_path('../../../spec/{factories,support}/*.rb', __FILE__)).each do |file|
-    require file
+module Symphonia
+  module SpecHelper
+    if Rails.env.test?
+      require File.expand_path('../../../spec/spec_helper', __FILE__)
+      Dir.glob(File.expand_path('../../../spec/{factories,support}/*.rb', __FILE__)).each do |file|
+        require file
+      end
+    end
   end
 end

data/lib/symphonia/user_management.rb

@@ -29,7 +29,7 @@ module Symphonia
       end
 
       def name=(string)
-        words = string.split(" ")
+        words = string.split
         self.first_name = words[0..-2].join(" ")
         self.last_name = words[-1]
       end

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = '4.2.0'
+  VERSION = '5.0.0'
 
 end

data/lib/symphonia.rb

@@ -2,15 +2,18 @@ module Symphonia
 
   include ::ActiveSupport::Configurable
 
-  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 :ModelAttributes, 'symphonia/model_attributes'
-  autoload :ModelFilters, 'symphonia/model_filters'
-  autoload :Query, 'symphonia/query'
-  autoload :QueryColumns, 'symphonia/query_columns'
+  # 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 :MenuManager, 'symphonia/menu_manager'
+  # autoload :ModelAttributes, 'symphonia/model_attributes'
+  # autoload :ModelFilters, 'symphonia/model_filters'
+  # autoload :Permissions, 'symphonia/permissions'
+  # autoload :Query, 'symphonia/query'
+  # autoload :QueryColumns, 'symphonia/query_columns'
+  # autoload :UserManagement, 'symphonia/user_management'
 
   module ActionCable
 

data/spec/factories/factories.rb

@@ -23,10 +23,6 @@ FactoryBot.define do
     factory :admin_user, traits: [:admin]
   end
 
-  factory :role, class: 'Symphonia::Role' do
-    sequence(:name) { |n| "#{Faker::Job.title} #{n}" }
-  end
-  
   factory :preference, class: 'Symphonia::Preference' do
 
     factory :email_preference, class: 'Symphonia::EmailPreference' do

data/spec/models/user_spec.rb

@@ -1,7 +1,8 @@
 RSpec.describe Symphonia::User do
   subject { FactoryBot.create(:user, email: "test@dummy.com") }
+
   it "#like" do
-    expect(Symphonia::User.like(subject.mail)).to be_all Symphonia::User
+    expect(described_class.like(subject.mail)).to be_all described_class
   end
 
   it "#to_s" do
@@ -22,14 +23,50 @@ RSpec.describe Symphonia::User do
     end
   end
 
-
   describe "#required_password" do
     it "require password for internal" 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
     end
   end
 
+  require "cancan/matchers"
+
+  describe "abilities" do
+    subject(:ability) { Symphonia::UserAbility.new(user) }
+
+    let(:admin) { create(:admin_user) }
+    let(:franta) { create(:user, login: "franta", status: :pending) }
+    let(:user) { nil }
+
+    context "when is an admin" do
+      let(:user) { create(:admin_user) }
+
+      it { is_expected.to be_able_to(:show, admin) }
+      it { is_expected.to be_able_to(:edit, admin) }
+      it { is_expected.to be_able_to(:edit, user) }
+      it { is_expected.not_to be_able_to(:activate, described_class.new(status: :active)) }
+      it { is_expected.to be_able_to(:activate, described_class.new(status: :pending)) }
+      it { is_expected.not_to be_able_to(:activate, described_class.new(status: :archived)) }
+      it { is_expected.to be_able_to(:archive, described_class.new(status: :active)) }
+      it { is_expected.not_to be_able_to(:archive, described_class.new(status: :archived)) }
+
+    end
+
+    context "regular user" do
+      let(:user) { create(:user) }
+
+      it { is_expected.not_to be_able_to(:show, franta) }
+      it { is_expected.to be_able_to(:show, user) }
+      it { is_expected.to be_able_to(:edit, user) }
+      it { is_expected.not_to be_able_to(:edit, franta) }
+      it { is_expected.to be_able_to(:update, user) }
+      it { is_expected.not_to be_able_to(:destroy, described_class.new) }
+      it { is_expected.not_to be_able_to(:create, described_class.new) }
+      it { is_expected.not_to be_able_to(:update, described_class.new) }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'pry-rails'
 require 'faker'
 require 'factory_bot_rails'
 require 'database_cleaner'
-require 'sass-rails'
 require 'authlogic/test_case'
 
 Dir.glob(File.join(__dir__, 'support', '*.rb')).sort.each { |f| require f }

data/spec/support/stub_users.rb

@@ -6,10 +6,10 @@ def regular_user
   @regular_user ||= FactoryBot.create :user
 end
 
-def add_permission *args
-  @role ||= FactoryBot.build_stubbed :role
-  @role.permissions = args
-  regular_user.role = @role
-  # allow(regular_user).to receive(:role).and_return @role
-  @role
-end
+# def add_permission *args
+#   # @role ||= FactoryBot.build_stubbed :role
+#   # @role.permissions = args
+#   # regular_user.role = @role
+#   # # allow(regular_user).to receive(:role).and_return @role
+#   # @role
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.4.0
-- !ruby/object:Gem::Dependency
-  name: bootstrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.0
-- !ruby/object:Gem::Dependency
-  name: bootstrap-datepicker-rails
-  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: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0.5
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0.5
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  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'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +98,16 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  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: scrypt
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  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: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +248,6 @@ files:
 - app/controllers/symphonia/application_controller.rb
 - app/controllers/symphonia/filters_controller.rb
 - app/controllers/symphonia/login_controller.rb
-- app/controllers/symphonia/roles_controller.rb
 - app/controllers/symphonia/user_sessions_controller.rb
 - app/controllers/symphonia/users_controller.rb
 - app/helpers/symphonia/application_helper.rb
@@ -330,8 +259,8 @@ files:
 - app/models/symphonia/application_record.rb
 - app/models/symphonia/email_preference.rb
 - app/models/symphonia/preference.rb
-- app/models/symphonia/role.rb
 - app/models/symphonia/user.rb
+- app/models/symphonia/user_ability.rb
 - app/models/symphonia/user_session.rb
 - app/views/base/_form.html.erb
 - app/views/base/edit.html.erb
@@ -377,11 +306,6 @@ files:
 - app/views/symphonia/notifier/user_change_to_active.text.erb
 - app/views/symphonia/notifier/user_registered.html.erb
 - app/views/symphonia/notifier/user_registered.text.erb
-- app/views/symphonia/roles/_form.html.erb
-- app/views/symphonia/roles/edit.html.erb
-- app/views/symphonia/roles/index.html.erb
-- app/views/symphonia/roles/new.html.erb
-- app/views/symphonia/roles/show.html.erb
 - app/views/symphonia/users/_form.html.erb
 - app/views/symphonia/users/edit.html.erb
 - app/views/symphonia/users/edit.js.erb
@@ -393,16 +317,13 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20130714140500_create_users.rb
-- db/migrate/20130714140501_create_roles.rb
 - db/migrate/20130714140502_create_preferences.rb
 - db/migrate/20190706130409_add_external_id_to_users.rb
 - db/migrate/20200428180001_add_uuid_to_users.rb
 - db/migrate/20200428180008_add_avatar_to_users.rb
-- db/migrate/20210509141420_roles_change_permissions_to_json.rb
-- db/migrate/20210509180525_roles_change_permissions_to_native_json.rb
 - db/seeds.rb
 - lib/generators/symphonia/entity_controller/entity_controller_generator.rb
-- lib/generators/symphonia/entity_controller/templates/controller.rb
+- lib/generators/symphonia/entity_controller/templates/controller.rb.tt
 - lib/generators/symphonia/query/query_generator.rb
 - lib/generators/symphonia/setup/setup_generator.rb
 - lib/generators/symphonia/setup/templates/Gemfile
@@ -434,7 +355,6 @@ files:
 - lib/symphonia/model_filters/select_filter.rb
 - lib/symphonia/model_filters/string_filter.rb
 - lib/symphonia/object.rb
-- lib/symphonia/permissions.rb
 - lib/symphonia/query.rb
 - lib/symphonia/query_columns.rb
 - lib/symphonia/query_columns/attribute_column.rb
@@ -446,7 +366,6 @@ files:
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/filters_controller_spec.rb
 - spec/controllers/login_controller_spec.rb
-- spec/controllers/roles_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/factories.rb
 - spec/helpers/symphonia/application_helper_spec.rb
@@ -458,12 +377,10 @@ files:
 - 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
 - spec/rails_helper.rb
 - spec/requests/accounts_spec.rb
 - spec/requests/login_spec.rb
-- spec/requests/roles_spec.rb
 - spec/requests/users_spec.rb
 - spec/spec_helper.rb
 - spec/support/query.rb
@@ -477,7 +394,8 @@ files:
 homepage: https://github.com/luk4s
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 'run: rails g symphonia:setup'
 rdoc_options: []
 require_paths:
@@ -493,41 +411,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: My administration
 test_files:
-- spec/spec_helper.rb
-- spec/mailers/symphonia/notifier_spec.rb
+- spec/controllers/account_controller_spec.rb
+- spec/controllers/admin_controller_spec.rb
+- spec/controllers/base_controller_spec.rb
+- spec/controllers/filters_controller_spec.rb
+- spec/controllers/login_controller_spec.rb
+- 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/libs/some_lib_spec.rb
 - spec/mailers/previews/symphonia/notifier_preview.rb
-- spec/version_spec.rb
+- spec/mailers/symphonia/notifier_spec.rb
 - spec/models/query/attribute_spec.rb
-- spec/models/query/symphonia_query_spec.rb
 - spec/models/query/filters_spec.rb
+- spec/models/query/symphonia_query_spec.rb
 - spec/models/user_spec.rb
-- spec/models/role_spec.rb
-- spec/requests/roles_spec.rb
-- spec/requests/login_spec.rb
+- spec/rails_helper.rb
 - spec/requests/accounts_spec.rb
+- spec/requests/login_spec.rb
 - spec/requests/users_spec.rb
-- spec/libs/some_lib_spec.rb
-- spec/support/stub_users.rb
+- spec/spec_helper.rb
+- spec/support/query.rb
 - 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
-- spec/controllers/login_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- 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/support/stub_users.rb
+- spec/support/wait_for_ajax.rb
+- spec/version_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/controllers/symphonia/roles_controller.rb

@@ -1,39 +0,0 @@
-module Symphonia
-  class RolesController < ApplicationController
-
-    include BaseController
-
-    def model
-      Role
-    end
-
-    def safe_attributes
-      [:name, :description, permissions: []]
-    end
-    # helper Symphonia::RendererHelper
-    #
-    # before_action :authorize
-    before_action :load_permissions, only: [:new, :edit, :update, :create]
-
-    def create
-      @entity = @role = Role.new(entity_params)
-      @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
-      super
-    end
-
-    def update
-      @entity = @role = Role.find(params[:id])
-      @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
-      super
-
-    end
-
-    private
-
-    def load_permissions
-      @permissions = Symphonia::Permissions.all
-    end
-
-  end
-
-end