symphonia 4.1.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64b152203dc6bf578501b1095fbd81e2cbe5ede1fd34a4eb020ffdf54ee8f57
-  data.tar.gz: 1c87c27bf654326f38c574bfb4afcf0eb0d7a19e442fa2581438d90953b7bbe9
+  metadata.gz: 71cb8a41bead7977d784fbb826c54a059b74f9cc75f43de46e67bbb8fd547cea
+  data.tar.gz: aa49eb8c8b095422abd9bb3c65105c3bfc79bf3cb82d2e8ea6655751cc9f15a2
 SHA512:
-  metadata.gz: a328cfbc0aae03353f32c05a5516f1a75525fb79660eaa01addbd3562a471b7d38be4aa0f0f7618328cd77bd55e7296e830a9205043d78c6a3f7df17971619ea
-  data.tar.gz: 14d656d24c7c1741d52ee4faa3cff9eebfabaea0b6ff1de737c7b99e1329e12f6fcad977a76bcec1a07fecd072429f132c7fe9446649cd51502b93f8ecf979c2
+  metadata.gz: 98a480e8c8c1e1a31c887c313fc6bd682774cc397277ff7edf10da58583d59badca233903adb447d131d98b704573d2dbdd8fd90e61465ae146eb126a4e85c36
+  data.tar.gz: bc42c7d29dcb974fee96e7749315449c77f44843a2b8cde034a5964dc4aec0c9fdfa25a5224605165b75453e24a23b6ca53d35ef59b2e3c620e1b00f6fe11216

data/CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [4.2.0] - 2022-04-07
+### Removed
+- awesome_nested_set dependency
+### Changed
+- start with Ruby3 support
+
 ## [4.1.3] - 2022-03-02
 ### Changed
 - update sidekiq

data/README.md

@@ -1,5 +1,6 @@
 # Symphonia
-> simple core toolkit for my rails apps
+
+simple core toolkit for my rails apps
 
 ## Installation
 
@@ -13,6 +14,7 @@ after `bundle install` run post-installation: `rails g symphonia:setup`
 
 > Setup prepare `config/initializers/settings.rb`, create `spec/spec_helper.rb`, add stylesheets and javascripts references and copy basic layout.
 
+## Configuration
 
 ## Upgrade to v4.0
 1. update Gemfile:
@@ -30,3 +32,27 @@ And `bundle update`
 export THOR_MERGE=vimdiff
 rails app:update
 ```
+## Upgrade to v5.0
+Version 5 remove sprockets bootstrap, font-awesome and others CSS/JS things. It expect that assets will be managed by webpacker (or similar) FE technology.
+
+Also remove `Role` model and whole permissions custom logic. Its replace standardized CanCanCan gem (https://github.com/CanCanCommunity/cancancan/tree/develop/docs)
+
+### Sprockets fallback
+For fallback add to Gemfile
+```ruby
+gem "bootstrap", "~> 4.6"
+gem "jquery-rails"
+gem "jquery-ui-rails"
+gem "listen"
+gem "sass-rails"
+gem "turbolinks"
+gem 'font-awesome-sass', '~> 6.2.0'
+```
+in your "app/assets/stylessheets/general.scss" make sure symphonia is imported
+```scss
+@import 'symphonia/basic';
+@import 'symphonia/layout';
+```
+
+### CanCanCan
+For user there is `Symphonia::UserAbility` which defined permissions for User model + for admin add basic CRUD operation for `:all`.

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

@@ -7,8 +7,8 @@
 //= require symphonia/_core
 //= require symphonia/Sortable
 
-//= require bootstrap-datepicker/core
-//= require bootstrap-datepicker/locales/bootstrap-datepicker.cs.js
+// require bootstrap-datepicker/core
+// require bootstrap-datepicker/locales/bootstrap-datepicker.cs.js
 
 //= require_self
 //= require symphonia/symphonia_bootstrap_dialog
@@ -155,4 +155,4 @@ SymphoniaCheckboxes = {
 
     return input;
   }
-};
+};

data/app/assets/javascripts/symphonia/symphonia_bootstrap_dialog.js

@@ -1,42 +1,42 @@
 /**
  * Symphonia modal dialog pop-up.
  * @param {String} id
- * @param {Object} options
- * @param {String} options.title - Title of dialog window.
- * @param {Boolean} options.force - If dialog element exists, will remove and replace new one.
- * @param {String} options.text - Text for body of dialog window.
- * @param {String} options.html - Content (html) for body of dialog window.
- * @param {String} options.submit - Text of submit button. If provided generate submit button.
- * @param {Boolean} options.large - Use Large modal
+ * @param {Object} opts
+ * @param {String} opts.title - Title of dialog window.
+ * @param {Boolean} opts.force - If dialog element exists, will remove and replace new one.
+ * @param {String} opts.text - Text for body of dialog window.
+ * @param {String} opts.html - Content (html) for body of dialog window.
+ * @param {String} opts.submit - Text of submit button. If provided generate submit button.
+ * @param {Boolean} opts.large - Use Large modal
  */
-SymphoniaDialog = function (id, options) {
-  var options = $.extend(options, {});
+SymphoniaDialog = function (id, opts) {
+  const options = $.extend(opts, {});
   if (options["force"] === undefined)
     options["force"] = true;
 
   this.id = id || 'ajax_modal';
-  var m = document.getElementById(this.id);
+  const m = document.getElementById(this.id);
 
   // var currentDialog = document.getElementById(this.id + "__symphonia_dialog");
   // if (currentDialog) {
   //   currentDialog.remove();
   // }
 
-  var dialog = document.createElement("div");
-  var modalDialog = document.createElement("div");
+  const dialog = document.createElement("div");
+  const modalDialog = document.createElement("div");
   modalDialog.className = "modal-dialog";
   if (options["large"]) {
     modalDialog.classList.add("modal-lg")
   }
   dialog.setAttribute("role", "document");
 
-  var content = document.createElement("div");
+  const content = document.createElement("div");
   content.className = "modal-content";
-  var heading = document.createElement("div");
+  const heading = document.createElement("div");
   heading.className = "modal-header";
-  var modalTitle = document.createElement("h5");
+  const modalTitle = document.createElement("h5");
   modalTitle.className = "modal-title";
-  var body = document.createElement("div");
+  const body = document.createElement("div");
 
   body.className = "modal-body";
   dialog.id = this.id;
@@ -46,7 +46,7 @@ SymphoniaDialog = function (id, options) {
   // =-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-
 
   this.appendSubmitButton = function (label) {
-    var submitButton = document.createElement('button');
+    const submitButton = document.createElement('button');
     submitButton.onclick = this.submit;
     submitButton.innerText = (label === true) && 'Submit' || label;
     submitButton.className = "btn btn-primary";
@@ -54,14 +54,14 @@ SymphoniaDialog = function (id, options) {
     return submitButton;
   };
   this.submit = function () {
-    var form = dialog.querySelector("form");
+    const form = dialog.querySelector("form");
     if (form)
       form.submit();
   };
   this.show = function () {
     // dialog.find(".modal-body > .modal-content-inner-container").css({'max-height': window.innerHeight - 200});
     // dialog.find(".modal-body > .modal-content-inner-container").css({'max-height': window.innerHeight - 200});
-    var t = dialog.querySelector(".title");
+    const t = dialog.querySelector(".title");
     if (t && t.innerHTML === '') {
       this.title = modalTitle.innerHTML;
       t.remove();
@@ -83,7 +83,7 @@ SymphoniaDialog = function (id, options) {
 
   modalTitle.innerText = options.title || '';
 
-  var closeButton = document.createElement("button");
+  const closeButton = document.createElement("button");
   closeButton.className = "close fa fa-times";
   closeButton.dataset['dismiss'] = "modal";
   heading.appendChild(modalTitle);
@@ -114,7 +114,7 @@ SymphoniaDialog = function (id, options) {
   dialog.appendChild(modalDialog);
 
   if (options.force) {
-    var currentDialog = document.getElementById(dialog.id);
+    const currentDialog = document.getElementById(dialog.id);
     if (currentDialog)
       currentDialog.remove();
   }
@@ -130,7 +130,7 @@ SymphoniaDialog.prototype.close = function () {
 };
 window.Symphonia.dialog = {
   show: function(IDcontainer, options) {
-    var modal = new SymphoniaDialog(IDcontainer, options);
+    const modal = new SymphoniaDialog(IDcontainer, options);
     modal.show();
   }
-}
+}

data/app/assets/stylesheets/symphonia/_font_awesome.scss

@@ -1,25 +1,27 @@
-@import 'font-awesome';
+@import "font-awesome";
 /* Font awesome aliases */
 .fa-add {
-  @extend .fa-plus-circle !optional;
+  //@include fa-icon-solid($fa-var-circle-plus);
+  @extend .fa-circle-plus !optional;
 }
 .fa-delete, .fa-del {
-  @extend .fa-trash-o !optional;
+  @include fa-icon-solid($fa-var-trash-can);
 }
 .fa-back {
-  @extend .fa-chevron-left !optional;
+  @include fa-icon-solid($fa-var-chevron-left);
 }
 .fa-true {
   @extend .fa-check !optional;
+  @include fa-icon-solid($fa-var-check);
 }
 .fa-false {
-  @extend .fa-times !optional;
+  @include fa-icon-solid($fa-var-times);
 }
 .fa-notice {
   @extend .fa-check-circle !optional;
 }
 .fa-error {
-  @extend .fa-times-circle !optional;
+  @extend .circle-exclamation !optional;
 }
 .alert .fa-info {
   @extend .fa-info-circle !optional;

data/app/assets/stylesheets/symphonia/_layout.scss

@@ -1,4 +1,4 @@
-@import "bootstrap";
+@import "/bootstrap";
 
 // fixed navbar
 body > .container {
@@ -38,3 +38,35 @@ footer.footer {
     @extend .d-print-none;
   }
 }
+
+/* TABLE */
+@mixin inactive-row {
+  opacity: 0.5
+}
+td.price {
+  text-align: right;
+}
+table.table {
+  th a.asc {
+    &:after {
+      content: "\2191";
+    }
+  }
+  th a.desc {
+    &:after {
+      content: "\2193";
+    }
+  }
+  tr.status {
+    &--lock, &--inactive, &--archived {
+      @include inactive-row;
+    }
+  }
+  .buttons {
+    text-align: right;
+  }
+}
+
+/* FORM */
+.required label, label[required], label.required, .has-error {color: red !important;}
+.required label:after, label[required]:after, label.required:after { content: '* '}

data/app/assets/stylesheets/symphonia/basic.scss

@@ -1,85 +1,13 @@
-@import "_font_awesome";
+@import "./_font_awesome";
 
 .page-header.title, .page-header.title h1 {
   margin-top: 0;
 }
-@mixin inactive-row {
-  opacity: 0.5
-}
+
 .reorder, .reorder label {
   cursor: move;
 }
 
-.flash {
-    border: 1px solid;
-    margin: 10px 0px;
-    padding:15px 10px 15px 10px;
-    background-repeat: no-repeat;
-    background-position: 10px center;
-    position:relative;
-    line-height: 30px;
-    &>i.icon:first-child {
-        font-family: FontAwesome;
-        font-size: 30px;
-
-        font-style: normal;
-        position:absolute;
-        top: 50%;
-        margin-top: -15px;
-    }
-    &>span.flash-content {
-        padding-left: 35px;
-
-    }
-}
-.info {
-    color: #00529B;
-    background-color: #BDE5F8;
-}
-.notice {
-    color: #4F8A10;
-    background-color: #DFF2BF;
-    &>i.icon:first-child:before {
-        content: "\f05d"
-    }
-}
-
-.nodata, .no-data {
-    @extend .flash;
-    @extend .info;
-    text-align: center;
-    border-width: 3px;
-}
-
-div.error_explanation {
-    color: #D63301;
-    background-color: #FFCCBA;
-    border: 1px solid rgba(255,0,0,0.5);
-    position: relative;
-    margin: 0 0 25px 0;
-    h2 {
-      display: none;
-    }
-    ul {
-      margin: 0;
-      li {
-        line-height: 25px;
-      }
-    }
-    &>p {
-      background-color: rgba(255,255,255,0.5);
-      margin: 0;
-      padding: 5px;
-      text-shadow: 0 0 5px #FFFFFF;
-    }
-    &>p:before {
-      font-family: FontAwesome;
-      margin-right: 5px;
-      font-size: 20px;
-      content: "\f071";
-    }
-}
-
 #account-extra-details {
   dt {
     width: 40%;
@@ -115,8 +43,6 @@ td.buttons {
 .contextual {@extend .pull-right !optional}
 .contextual input, .contextual select {font-size:0.9em;}
 
-.required label, label[required], label.required, .has-error {color: red !important;}
-.required label:after, label[required]:after, label.required:after { content: '* '}
 textarea {width: 99%;}
 
 #internal_static_page_sign {
@@ -142,29 +68,7 @@ textarea {width: 99%;}
     }
   }
 }
-td.price {
-  text-align: right;
-}
-table.table {
-  th a.asc {
-    &:after {
-      content: "\2191";
-    }
-  }
-  th a.desc {
-    &:after {
-      content: "\2193";
-    }
-  }
-  tr.status {
-    &--lock, &--inactive, &--archived {
-      @include inactive-row;
-    }
-  }
-  .buttons {
-    text-align: right;
-  }
-}
+
 
 .highlight {
   animation-duration: 1s;

data/app/assets/stylesheets/symphonia/filters.scss

@@ -1,13 +1,11 @@
 #symphonia_query_options_form {
   .filter-custom-date {
-    &>* {
+    & > * {
       width: 49%;
-      //&:last-child {
-      //  float:right;
-      //}
     }
   }
 }
+
 #query_data {
   table.table {
     .price {
@@ -16,4 +14,4 @@
       }
     }
   }
-}
+}

data/app/assets/stylesheets/symphonia/symphonia_bootstrap.scss

@@ -1,2 +1,2 @@
 @import "layout";
-@import "bootstrap-datepicker3";
+// @import "bootstrap-datepicker3";

data/app/controllers/symphonia/accounts_controller.rb

@@ -48,7 +48,7 @@ module Symphonia
       @user.attributes = user_params
       respond_to do |format|
         @user.edited_by = User.current.logged_in? && User.current
-        @user.edited_at = Time.now
+        @user.edited_at = Time.current
         if @user.save
           format.html { redirect_to({ action: 'show' }, notice: t(:text_updated)) }
           format.json { head :no_content }
@@ -104,7 +104,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].present?
         @user.password = params[:password]
       end
 
@@ -147,8 +147,12 @@ module Symphonia
       User.current
     end
 
+    def current_ability
+      @current_ability ||= UserAbility.new current_user
+    end
+
     def find_account_by_mail(mail)
-      User.where(email: mail).first
+      User.find_by(email: mail)
     end
 
     def find_account_by_token(id)

data/app/controllers/symphonia/application_controller.rb

@@ -4,5 +4,6 @@ module Symphonia
     include ControllerExtensions
 
     helper Symphonia::BootstrapModalHelper
+
   end
-end
+end

data/app/controllers/symphonia/users_controller.rb

@@ -2,10 +2,10 @@ module Symphonia
   class UsersController < ApplicationController
 
     helper Symphonia::RendererHelper
+    include ::CanCan::ControllerAdditions
 
-    before_action :find_user, except: %i[index new create show]
+    before_action :user, except: %i[index new create show]
     before_action :authorize, except: [:show]
-    before_action -> { menu_item(:my_account) }, only: %i[current edit_current update_current]
 
     def index
       @query = Symphonia::User.query.new
@@ -22,8 +22,8 @@ module Symphonia
 
     def show
       @user = Symphonia::User.find(params[:id]) if params[:id]
-      @user ||= Symphonia::User.current
-      authorize
+      @user ||= current_user
+      authorize! :show, @user
       respond_to do |format|
         format.html
         format.json { render json: @user, except: %w[crypted_password password_salt persistence_token perishable_token] }
@@ -32,7 +32,6 @@ module Symphonia
 
     def new
       @user = Symphonia::User.new
-      @roles = Symphonia::Role.sorted
       respond_to do |format|
         format.html
       end
@@ -46,27 +45,18 @@ module Symphonia
           format.xml { render xml: @user, status: :created, location: @user }
           format.json { render json: @user, status: :created, location: @user }
         else
-          format.html do
-            @roles = Symphonia::Role.sorted
-            render action: 'new'
-          end
+          format.html { render action: 'new' }
           format.xml { render xml: @user.errors, status: :unprocessable_entity }
           format.json { render json: @user.errors, status: :unprocessable_entity }
         end
       end
     end
 
-    def edit
-      @roles = Role.all
-    end
+    def edit; end
 
     def update
       @user.attributes = user_params
-      @user.admin = params[:admin] if params[:admin] && Symphonia::User.current.admin?
-      if params[:role_id].present? && Symphonia::User.current.admin?
-        @role = Role.find(params[:role_id])
-        @user.role = @role
-      end
+      @user.admin = params[:admin] if params[:admin] && current_user.admin?
       respond_to do |format|
         @user.edited_by = current_user
         @user.edited_at = DateTime.now
@@ -74,10 +64,7 @@ module Symphonia
           format.html { redirect_back_or_default user_path(@user), notice: t(:text_updated) }
           format.any(:json, :xml) { head :no_content }
         else
-          format.html do
-            @roles = Symphonia::Role.sorted
-            render action: 'edit'
-          end
+          format.html { render action: 'edit' }
           format.xml { render xml: @user.errors, status: :unprocessable_entity }
           format.json { render json: @user.errors, status: :unprocessable_entity }
         end
@@ -114,22 +101,23 @@ module Symphonia
 
     private
 
-    def find_user
-      @user = Symphonia::User.find(params[:id])
+    def user
+      @user ||= Symphonia::User.find(params[:id])
     end
 
     def authorize
-      if User.current.logged_in? && User.current.id == @user&.id
-        true
-      else
-        super
-      end
+      authorize! action_name.to_sym, @user
     end
 
     def user_params
       allowed = [:login, :first_name, :last_name, :password, :password_confirmation, :email, :mail, preference_ids: []]
-      allowed.concat(%i[admin role_id]) if Symphonia::User.current.admin?
+      allowed << :admin if current_user.admin?
       params.require(:user).permit(allowed)
     end
+
+    def current_ability
+      @current_ability ||= UserAbility.new current_user
+    end
+
   end
 end