symphonia 4.1.3 → 5.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -38,48 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.4.0
-- !ruby/object:Gem::Dependency
-  name: awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-- !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
@@ -95,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
@@ -154,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
@@ -192,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
@@ -240,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sortable-table
   requirement: !ruby/object:Gem::Requirement
@@ -262,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
@@ -332,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
@@ -344,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
@@ -391,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
@@ -407,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
@@ -448,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
@@ -460,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
@@ -472,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
@@ -491,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:
@@ -507,41 +411,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+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

data/app/models/symphonia/role.rb

@@ -1,55 +0,0 @@
-module Symphonia
-  class Role < ApplicationRecord
-    self.table_name = 'roles'
-
-    include ModelAttributes
-
-    register_query do
-      add_attribute :name, :link
-    end
-
-    validates :name, presence: true
-
-    serialize :permissions, Array
-
-    scope :active, -> {}
-    scope :sorted, -> { order(:name) }
-
-    # after_save :expire_cache
-
-    def allowed_to?(permission)
-      Rails.cache.fetch([self, permission]) do
-        !allowed_permissions.detect { |i| permission.to_sym == i.name }.nil?
-      end
-    end
-
-    def authorize?(controller, action)
-      Rails.cache.fetch([self, controller, action]) do
-        !allowed_permissions.detect { |p| p.allowed?(controller, action) }.nil?
-      end
-    end
-
-    def allowed_permissions
-      return @allowed_permissions if @allowed_permissions
-
-      @allowed_permissions = permissions.collect do |i|
-        i.is_a?(Symphonia::Permissions::Permission) ? i : Symphonia::Permissions.get(i.to_sym)
-      end.compact
-
-      @allowed_permissions
-    end
-
-    def permission_names
-      permissions #.map(&:name)
-    end
-
-    # private
-    #
-    # def expire_cache
-    #   Rails.cache.delete_matched("role_#{self.id}_*")
-    #   Rails.cache.delete_matched('user_allowed_to*')
-    # end
-
-  end
-
-end

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

@@ -1,26 +0,0 @@
-<%= symphonia_form_for(@role) do |f| %>
-
-  <%= f.text_field :name, required: true %>
-  <%= f.text_area :description, size: '50x5' %>
-
-  <fieldset>
-    <legend>
-      <%= link_to(fa_icon('check lg'), 'javascript:void(0)', onclick: "$(this).closest('fieldset').find('input:checkbox').trigger('click')", class: "pull-right") -%>
-      <%= content_tag(:h4, Symphonia::Role.human_attribute_name(:permissions)) %>
-    </legend>
-    <div class="card-body row">
-        <% @permissions.each do |perm| %>
-          <div class="col-sm-3">
-            <label class="checkbox-inline">
-              <%= check_box_tag('permissions[]', perm, @role.permission_names.include?(perm.name), id: perm, class: '') %>
-              <%= t(perm.name, :scope => [:permissions], :default => perm.to_s.humanize) %>
-            </label>
-          </div>
-        <% end %>
-    </div>
-  </fieldset>
-
-  <p class="buttons">
-    <%= f.primary %>
-  </p>
-<% end %>

data/app/views/symphonia/roles/edit.html.erb

@@ -1,5 +0,0 @@
-<%= title(t(:button_edit), @role.name) do %>
-    <%= content_tag(:p, link_to_back, class: 'contextual') %>
-<% end %>
-
-<%= render(partial: 'form') %>

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

@@ -1,6 +0,0 @@
-<%= title(:label_roles) do %>
-    <%= link_to_new_entity %>
-<% end %>
-
-<%= render('symphonia/common/filters', remote: true) %>
-<%= render_symphonia_table(@query) %>

data/app/views/symphonia/roles/new.html.erb

@@ -1,4 +0,0 @@
-<%= title(t(:label_role_new)) do %>
-    <%= content_tag(:p, link_to_back, class: 'contextual') %>
-<% end %>
-<%= render(partial: 'form') %>

data/app/views/symphonia/roles/show.html.erb

@@ -1,11 +0,0 @@
-<%= title(@role.name, back: true) %>
-
-<div class="formatted-text">
-  <%= format_text @role.description %>
-</div>
-
-<ul class="permissions fa-ul">
-  <% @role.permissions.each do |perm| %>
-    <li><%= fa_icon "li check", text: t("permissions.#{perm}", default: perm.to_s.humanize) %></li>
-  <% end %>
-</ul>

data/db/migrate/20130714140501_create_roles.rb

@@ -1,18 +0,0 @@
-class CreateRoles < ActiveRecord::Migration[6.1]
-
-  def up
-    create_table :roles do |t|
-      t.string :name, null: false
-      t.text :description, null: true
-
-      t.text :permissions
-
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :roles
-  end
-
-end

data/db/migrate/20210509141420_roles_change_permissions_to_json.rb

@@ -1,18 +0,0 @@
-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

data/db/migrate/20210509180525_roles_change_permissions_to_native_json.rb

@@ -1,7 +0,0 @@
-class RolesChangePermissionsToNativeJson < ActiveRecord::Migration[6.1]
-
-  def up
-    change_column :roles, :permissions, :jsonb, using: 'permissions::jsonb'
-  end
-
-end

data/lib/symphonia/permissions.rb

@@ -1,93 +0,0 @@
-require 'rails'
-module Symphonia
-  module Permissions
-    @@mapper = []
-    @@used_names = []
-    mattr_accessor :mapper, :used_names
-    class PermissionMissingError < RuntimeError; end
-    class << self
-
-      def map(&block)
-        if block_given?
-          yield self
-        end
-      end
-
-      def register(name, options={})
-        return if @@used_names.include?(name)
-
-        p = Permission.new(name, options)
-        @@used_names << p.name.to_s
-        mapper << p
-
-        p
-      end
-
-      def update(name)
-        self.get(name) || raise(PermissionMissingError)
-      end
-
-      # Returns the permission of given name or nil if it wasn't found
-      # Argument should be a symbol
-      def get(name)
-        mapper.detect{|i| i.name == name}
-      end
-
-      def all
-        mapper
-      end
-
-      def find_all(permission_names=[])
-        ps = used_names & Array(permission_names).compact
-        ps.collect{|m| get(m.to_sym)}
-      end
-
-    end
-
-    class Permission
-      attr_reader :name
-      # actions => [:controller_name => [:action, :action, :action]]
-      def initialize(name, options={})
-        @name = name
-        @perms = Hash.new { |hash, key| hash[key] = Array.new }
-      end
-      alias_method :id, :name
-
-      def to_s
-        @name.to_s
-      end
-
-      def allowed?(controller, action)
-        Array(@perms[controller.to_sym]).include?(action.to_sym)
-      end
-
-      def add(controller, actions=[])
-        @perms[controller] += actions
-      end
-
-      def remove_actions(controller, actions=[])
-        @perms[controller] -= actions
-      end
-
-      def remove_controller(controller)
-        @perms.delete(controller)
-      end
-
-      def controllers
-        @controllers ||= @perms.keys
-      end
-
-      def allow_action?(controller, action)
-        controller = controller.to_sym
-        action = action.to_sym
-
-        if self.controllers.include?(controller)
-          return @perms[controller].include?(action)
-        else
-          return false
-        end
-      end
-    end
-  end
-
-end

data/spec/controllers/roles_controller_spec.rb

@@ -1,12 +0,0 @@
-# require_relative '../spec_helper.rb'
-
-module Symphonia
-  describe RolesController, type: 'controller', logged: :admin do
-    routes { Symphonia::Engine.routes }
-    subject { Symphonia::Role }
-
-    include_examples 'a controller actions', :role
-
-  end
-
-end

data/spec/models/role_spec.rb

@@ -1,13 +0,0 @@
-RSpec.describe Symphonia::Role do
-  subject { FactoryBot.create :role, permissions: [:view_users] }
-
-  describe "#allowed_to?" do
-    it "false" do
-      expect(subject.allowed_to?( :non_exists)).to eq false
-    end
-
-    it "true" do
-      expect(subject.allowed_to?(:view_users)).to eq true
-    end
-  end
-end

data/spec/requests/roles_spec.rb

@@ -1,10 +0,0 @@
-module Symphonia
-  describe Role, logged: :admin do
-    subject { 'role' }
-
-    let(:route) { symphonia }
-    include_examples 'a requests', :name
-
-  end
-
-end