symphonia 4.1.3 → 5.0.0

data/lib/symphonia/admin_constraint.rb

@@ -4,7 +4,7 @@ module Symphonia
     def matches?(request)
       return false if (credentials = request.session["symphonia/user_credentials"]).blank?
 
-      user = User.find_by_persistence_token(credentials.split(':')[0])
+      user = User.find_by(persistence_token: credentials.split(':')[0])
       user&.admin?
     end
 

data/lib/symphonia/base_controller.rb

@@ -13,16 +13,14 @@ module Symphonia
   #   %i[]
   # end
   #
-  # def swagger_path
-  #  false # => for disable swagger
-  #   "/my-custom-path" # => for custom route
-  # end
+
   module BaseController
+
     extend ActiveSupport::Concern
 
     included do
       # before_action :authorize
-      before_action :find_entity, only: [:show, :edit, :update, :destroy]
+      before_action :find_entity, only: %i[show edit update destroy]
 
       include Rails::Pagination
       helper Symphonia::BootstrapModalHelper
@@ -30,11 +28,9 @@ module Symphonia
 
       # @param [Class] model
       class_attribute :model
-
     end
 
     class_methods do
-
       # def model=(klass)
       #   @model = klass
       # end
@@ -76,11 +72,11 @@ module Symphonia
     end
 
     def new
-      @entity ||= instance_variable_set(:"@#{model_name}", model.new(params.fetch(model_name, {}).permit(safe_attributes)))
+      @entity ||= instance_variable_set(:"@#{model_name}",
+                                        model.new(params.fetch(model_name, {}).permit(safe_attributes)))
     end
 
-    def edit
-    end
+    def edit; end
 
     def create
       @entity ||= instance_variable_set(:"@#{model_name}", model.new(entity_params))
@@ -119,7 +115,7 @@ module Symphonia
     end
 
     def model_name
-      model.name.demodulize.underscore.to_sym
+      model.name.demodulize.underscore
     end
 
     private
@@ -138,13 +134,9 @@ module Symphonia
       params.require(model_name).permit(safe_attributes)
     end
 
-    def after_create
-
-    end
+    def after_create; end
 
-    def after_update
-
-    end
+    def after_update; end
 
   end
 end

data/lib/symphonia/controller_extensions.rb

@@ -17,7 +17,7 @@ module Symphonia
       add_flash_types :error
 
       rescue_from ::ActiveRecord::RecordNotFound, with: :render_404
-      rescue_from Unauthorized, with: :render_403
+      rescue_from Unauthorized, CanCan::AccessDenied, with: :render_403
 
       helper_method :current_user, :back_url
     end
@@ -117,7 +117,7 @@ module Symphonia
 
     # Renders a 200 response for successful updates or deletions via the API
     def render_api_ok
-      head :ok
+      render_api_head :ok
     end
 
     # Renders a head API response
@@ -143,20 +143,10 @@ module Symphonia
     end
 
     def authorize
-      if Symphonia::User.current.authorize?(controller_name, action_name)
-        return true
-      elsif Symphonia::User.current.logged_in?
-        raise Unauthorized
-      else
-        respond_to do |format|
-          format.html do
-            return redirect_to(symphonia.login_path(back_url: request.path), error: t(:text_error_login_required))
-          end
-          format.any { return head 401 }
-        end
-      end
+      return true if Symphonia::User.current.admin?
+      raise Unauthorized if Symphonia::User.current.logged_in?
 
-      raise Unauthorized
+      login_require
     end
 
     def handle_unverified_request

data/lib/symphonia/engine.rb

@@ -1,54 +1,37 @@
 require 'symphonia/object'
-require 'symphonia/menu_manager'
-require 'symphonia/permissions'
-require 'symphonia/user_management'
 
-require 'rails-i18n'
-require 'turbolinks'
 require 'authlogic'
+require 'cancancan'
 require 'scrypt'
-require 'bootstrap'
 
 require 'will_paginate'
 require 'api-pagination'
-require 'font-awesome-rails'
-require 'jquery-rails'
-require 'jquery-ui-rails'
+
+require 'rails_i18n'
 require 'rdiscount'
 require 'sortable-table'
-# require 'paperclip'
-require 'awesome_nested_set'
-# require 'acts_as_list'
 require 'bootstrap_form'
-require 'bootstrap-datepicker-rails'
-# require 'wicked_pdf'
-# require 'swagger/blocks'
 
 module Symphonia
 
   class Engine < ::Rails::Engine
     isolate_namespace Symphonia
 
+    config.autoload_paths << File.expand_path("..", __dir__)
+
     config.generators do |g|
       g.test_framework :rspec, fixture: false
       g.fixture_replacement :factory_bot, dir: 'spec/factories'
     end
 
-    # Rails 5
-    # ActionController::Base.class_eval do
-    #   include Symphonia::ApplicationController
-    # end
-
-
     initializer :symphonia_extensions do
+      ActiveSupport.on_load(:action_controller_base) do
+        # prepend Symphonia::ApplicationController
+        helper Symphonia::ApplicationHelper
+        helper Symphonia::BootstrapModalHelper
+      end
     end
 
-    # ActiveSupport::Reloader.to_prepare do
-    #   ::ApplicationController.send :helper, Symphonia::ApplicationHelper
-    #   ::ApplicationMailer.send :helper, Symphonia::ApplicationHelper
-    #   BootstrapForm::FormBuilder.prepend(Symphonia::FormBuilder)
-    # end
-
     initializer :symphonia_setup do |_app|
       Mime::Type.register 'application/pdf', :pdf
       config.i18n.available_locales ||= %i[cs en]
@@ -72,29 +55,15 @@ module Symphonia
       end
     end
 
-    # include helpers
     initializer :load_helper, before: :load_config_initializers do |app|
-      # config.active_record.raise_in_transactional_callbacks = false
       if Rails.env.development?
         config.action_mailer.default_url_options ||= { host: 'symphonia.app' }
         config.action_mailer.preview_path = "{#{app.root.join('spec/mailers/previews')},#{root.join('spec/mailers/previews')}}"
       end
     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'
-      #end
-    end
-
-    initializer :symphonia_general_permissions do |_app|
-      Symphonia::Permissions.map do |m|
-        m.register(:view_users).add(:users, %i[index show])
-        m.register(:manage_users).add(:users, %i[create update destroy new edit])
-      end
-
+    initializer :assets do |app|
+      app.config.assets.precompile << 'symphonia/application.css'
     end
 
     # initializer :wicked_pdf do |_app|

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/model_attributes/attribute.rb

@@ -106,7 +106,7 @@ module Symphonia
 
       # TODO: @klass.name || @klass.base_class.name || entity.class.name
       def format_value(view, value, _entity)
-        view.t("#{@klass.name.underscore}.#{name.to_s.pluralize}.#{value}", format_options)
+        view.t("#{@klass.name.underscore}.#{name.to_s.pluralize}.#{value}", **format_options)
       end
 
       def input_field
@@ -179,7 +179,7 @@ module Symphonia
     class DateAttribute < Attribute
 
       def format_value(view, value, _entity)
-        value && view.l(value.to_date, format_options)
+        value && view.l(value.to_date, **format_options)
       end
 
     end
@@ -187,7 +187,7 @@ module Symphonia
     class DateTimeAttribute < Attribute
 
       def format_value(view, value, _entity)
-        value && view.l(value.localtime, format_options)
+        value && view.l(value.localtime, **format_options)
       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.1.3'
+  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