symphonia 3.1.5 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7ffaee9227f92a65343e7ceb49c1b456a55979dee59eb58084315f9395c4ff
-  data.tar.gz: 863eab3a706edd2db29cbe2929fb9c4a873bd57bbe7516dd1aced6c3b844693c
+  metadata.gz: 7a195060e6fa12677b383245afdaa0d7cefb75e463031b21aca473c2b2eabc6d
+  data.tar.gz: ca98109a38542883af2f24a0eadbfb9363861b09fa98a146437c405ba4872338
 SHA512:
-  metadata.gz: 254b4b7854e3ea0e0c86fb8a97774db2947212d88611e32e4758d02fadd4d4b7d9ff4205eb15f82bc3c7fda78ab6f56b740693c02b3b4f085b9607a509b9f93f
-  data.tar.gz: 931719ab8a002fa957fb9091960417d0a4a9b7b30bc9f4aa2d8244989b910aa43b79c7dc5afe32102f82bc541944f656c79e573c26a8d45922cde248e16b95db
+  metadata.gz: 4b5a099d7ab9e70cbe8526a9e2a765220c3d137472a08dfcbedebaef43745c96f78dc90512335adf4da26b1e910052231c9fa49fcff11dc8eeda122bb8ef1554
+  data.tar.gz: 6f300e80b0373f6f19298f6a1c33a4e059be86e7f1110eeebe74f32e90a04960a3ab2edbadf2d5d54624fbc3b4b38c6734b02abd7f6e857d06c11c6648a49b03

data/.rubocop.yml

@@ -1,7 +1,3 @@
-#require:
-#  - rubocop-rails
-All:
-  Rails: true
 AllCops:
   TargetRubyVersion: 2.5
 
@@ -16,13 +12,13 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
+#Metrics/LineLength:
+#  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
+#Style/BracesAroundHashParameters:
+#  EnforcedStyle: context_dependent
 Style/Documentation:
   Enabled: false
 Style/MutableConstant:

data/CHANGELOG.md

@@ -0,0 +1,88 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+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]
+### Removed
+- openapi (it seems to be uneccessary)
+- paperclip support
+### Changed
+- upgrade authlogic to 6.1.0
+## [3.2.4] - 2020-05-10
+### Added
+- sidekiq-cron gem
+## [3.2.3] - 2020-05-07
+### Fixed
+- find user by token from session
+## [3.2.2] - 2020-05-05
+### Changed
+- user/account form layout
+- Sidekiq v6
+### Fixed
+- UsersController#update Role should be sorted
+## [3.2.1] - 2020-05-01
+### Added
+- avatar_url to users
+- uuid to users
+- openapi support
+### Changed
+- improve setup generator
+- anonymous user have no "enforced" language
+### Fixed
+- update .rubocop
+- bootstrap_form update to 4.4.0
+- show time in localtime
+### Removed
+- ckeditor-jquery
+## [3.1.5] - 2020-01-20
+### Changed
+- improve split name (Symphonia::UserManagement#name=)
+## [3.1.4] - 2020-01-17
+### Changed
+- improve role form
+## [3.1.3] - 2019-12-21
+### Added
+- bootstrap_modal_helper extended by `link_to_modal` feature
+### Changed
+- helper Symphonia::BootstrapModalHelper in BaseController
+- new argument options in `icon` method (pass into `fa_icon`) 
+## [3.1.2] - 2019-12-07
+### Added
+- skip permission check in link_to_new_entity method
+### Fixed
+- login form additional buttons
+- lost_password form & mail
+- reset_password form & mail
+## [3.1.1] - 2019-12-07
+### Changed
+- accounts registration validation
+- update static 500.html
+## [3.1.0] - 2019-12-07
+### Added
+- BaseController for simplier create CRUD inheritance
+- base views (new, form, edit, show and index)
+- general EntityDecorator
+- input field in model Attribute
+- TextAttribute format
+### Changed
+- registration form refactored
+- update dummy to Rails 6
+### Removed
+- wicked_pdf dependency
+## [3.0.3] - 2019-10-06
+### Changed
+- rubocop.yml
+- use real user in tests instead a dummy object
+## [3.0.1] - 2019-07-08
+### Changed
+- do not require password for SSO users
+- hide password field from form of SSO users
+## [3.0.0] - 2019-07-06
+### Added
+- external_id on user
+### Changed
+- users/show only for logged users
+- upgrade to authlogic 5
+- minor improvements

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

@@ -1,4 +1,3 @@
-//= require ckeditor-jquery
 //= require_self
 
 CKEDITOR.editorConfig = function( config )

data/app/controllers/symphonia/accounts_controller.rb

@@ -106,7 +106,6 @@ module Symphonia
 
       if params[:password] # && params[:password_confirmation]
         @user.password = params[:password]
-        # @user.password_confirmation = params[:password_confirmation]
       end
 
       if @user.changed? && @user.save

data/app/controllers/symphonia/roles_controller.rb

@@ -14,87 +14,26 @@ module Symphonia
     #
     # before_action :authorize
     before_action :load_permissions, only: [:new, :edit, :update, :create]
-    #
-    # #layout 'admin'
-    #
-    # def index
-    #   @query = Symphonia::Role.query.new(self)
-    #   @entities = @query.entities
-    #   respond_to do |format|
-    #     format.html do
-    #       @entities = @entities.page(params[:page])
-    #       render layout: !request.xhr?
-    #     end
-    #     format.xml { render xml: @entities.all }
-    #     format.json { render json: @entities.all }
-    #   end
-    # end
-    #
-    # def show
-    #   @role = Role.find(params[:id])
-    #   respond_to do |format|
-    #     format.html
-    #     format.json { render json: @role }
-    #   end
-    # end
-    #
-    # def new
-    #   @role = Role.new
-    # end
-    #
-    # def edit
-    #   @role = Role.find(params[:id])
-    # end
 
     def create
       @entity = @role = Role.new(entity_params)
       @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
       super
-      # respond_to do |format|
-      #   if @role.save
-      #     format.html { redirect_to((params[:continue] ? new_role_path : roles_path), notice: t(:text_created)) }
-      #     format.json { render(json: @role, status: :created, location: @role) }
-      #   else
-      #     format.html { render(action: 'new') }
-      #     format.json { render(json: @role.errors, status: :unprocessable_entity) }
-      #   end
-      # end
     end
 
     def update
       @entity = @role = Role.find(params[:id])
       @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
       super
-      # respond_to do |format|
-      #   if @role.update_attributes(role_params)
-      #     format.html { redirect_to(edit_role_path(@role), notice: t(:text_updated)) }
-      #     format.json { head(:no_content) }
-      #   else
-      #     format.html { render(action: 'edit') }
-      #     format.json { render(json: @role.errors, status: :unprocessable_entity) }
-      #   end
-      # end
+
     end
 
-    # def destroy
-    #   @role = Role.find(params[:id])
-    #   @role.destroy
-    #   respond_to do |format|
-    #     format.html { redirect_to(roles_url, notice: t(:text_destroyed)) }
-    #     format.json { head :no_content }
-    #     format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@role)}')"}
-    #   end
-    # end
-    #
     private
-    #
+
     def load_permissions
       @permissions = Symphonia::Permissions.all
     end
-    #
-    # def role_params
-    #   params.require(:role).permit(:name, :description, permissions: [])
-    # end
+
   end
 
 end

data/app/controllers/symphonia/user_sessions_controller.rb

@@ -8,7 +8,7 @@ module Symphonia
     end
 
     def current_session
-        current_user_session
+      current_user_session
     end
 
   end

data/app/controllers/symphonia/users_controller.rb

@@ -1,38 +1,5 @@
 module Symphonia
   class UsersController < ApplicationController
-    include ::Swagger::Blocks
-
-    swagger_path '/admin/users/{id}.json' do
-      operation :get do
-        key :summary, 'Find User by ID'
-        key :description, 'Returns a single user if the user has access'
-        # key :operationId, 'findPetById'
-        # key :tags, [
-        #   'pet'
-        # ]
-        parameter do
-          key :name, :id
-          key :in, :path
-          key :description, 'ID of user to fetch'
-          key :required, true
-          key :type, :integer
-          key :format, :int64
-        end
-        extend Symphonia::Swagger::Responses
-        response 200 do
-          key :description, 'user response'
-          schema do
-            key :'$ref', :User
-          end
-        end
-        # response :default do
-        #   key :description, 'unexpected error'
-        #   schema do
-        #     key :'$ref', :ErrorModel
-        #   end
-        # end
-      end
-    end
 
     helper Symphonia::RendererHelper
 
@@ -108,7 +75,7 @@ module Symphonia
           format.any(:json, :xml) { head :no_content }
         else
           format.html do
-            @roles = Symphonia::Role.all
+            @roles = Symphonia::Role.sorted
             render action: 'edit'
           end
           format.xml { render xml: @user.errors, status: :unprocessable_entity }

data/app/helpers/symphonia/application_helper.rb

@@ -38,7 +38,7 @@ module Symphonia
       end
       options[:container_class] ||= 'mr-auto'
 
-      return content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://data-vocabulary.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      return content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
     end
 
     def render_menu_node(menu, item, options = {})

data/app/helpers/symphonia/form_helper.rb

@@ -4,8 +4,6 @@ module Symphonia
     def symphonia_form_for(object, options={}, &block)
       options.reverse_merge!(builder: Symphonia::FormBuilder)
 
-      options = process_options(options)
-
       unless options[:remote] && options[:local].nil?
         options[:local] = true
       end

data/app/models/symphonia/user.rb

@@ -19,6 +19,7 @@ module Symphonia
     end
 
     acts_as_authentic do |config|
+      config.crypto_provider = ::Authlogic::CryptoProviders::SCrypt
     end
     validates :email, uniqueness: { case_sensitive: false }
     validates :password,
@@ -30,30 +31,6 @@ module Symphonia
 
     include UserManagement
 
-    include ::Swagger::Blocks
-
-    swagger_schema :User do
-      key :required, %i[id login email]
-      property :id do
-        key :type, :integer
-        key :format, :int64
-      end
-      property :fist_name do
-        key :type, :string
-      end
-      property :last_name do
-        key :type, :string
-      end
-      property :email do
-        key :type, :string
-        key :format, :email
-      end
-      property :status do
-        key :type, :string
-        key :enum, Symphonia::User.statuses.keys
-      end
-    end
-
     attr_writer :password_confirmation
 
     has_and_belongs_to_many :preferences, foreign_key: 'user_id'
@@ -155,7 +132,7 @@ module Symphonia
       end
 
       def language
-        Symphonia.config.default_locale || I18n.default_locale
+        nil
       end
     end
 

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

@@ -1,9 +1,20 @@
-<div class="row">
-  <!--  <div class="col-xs-12 col-sm-6 col-md-3"><%#= f.text_field :login, required: true %></div>-->
-  <div class="col-xs-12 col-sm-6 col-md-3"><%= f.email_field :mail, required: true %></div>
-  <div class="col-xs-12 col-sm-6 col-md-3"><%= f.text_field :first_name, required: true %></div>
-  <div class="col-xs-12 col-sm-6 col-md-3"><%= f.text_field :last_name, required: true %></div>
-  <% if f.object.external_id.blank? %>
-    <div class="col-xs-12 col-sm-6 col-md-3"><%= f.password_field :password, required: f.object.new_record?, prepend: icon('key') %></div>
-  <% end %>
+<div class="row justify-content-center">
+  <div class="col-lg-8">
+    <%= f.email_field :email, required: true %>
+  </div>
+  <div class="col-lg-8">
+    <%= f.text_field :first_name, required: true %>
+
+  </div>
+  <div class="col-lg-8">
+    <%= f.text_field :last_name, required: true %>
+
+  </div>
+  <div class="col-lg-8">
+    <% if f.object.external_id.blank? %>
+      <%= f.password_field :password, required: f.object.new_record?, prepend: icon('key') %>
+    <% end %>
+  </div>
 </div>
+
+

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

@@ -1,6 +1,6 @@
 <%= title(@user.name) %>
-<%= symphonia_form_for(@user, :url => {:action => 'update'}) do |f| %>
-  <%= render(:partial => @user.form_path, :locals => {:f => f}) %>
+<%= symphonia_form_for(@user, url: { action: 'update' }) do |f| %>
+  <%= render(partial: @user.form_path, locals: { f: f }) %>
 
   <div class="buttons">
     <%= link_to_back %>

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

@@ -1,13 +1,13 @@
-<%= render(partial: 'symphonia/accounts/form', locals: {f: f}) %>
-<div class="row">
-  <% if Symphonia::User.current.admin? %>
-    <div class="col-sm-6">
+<%= render(partial: 'symphonia/accounts/form', locals: { f: f }) %>
+<% if Symphonia::User.current.admin? %>
+  <div class="row justify-content-center">
+    <div class="col-8">
       <%= f.check_box :admin, id: 'user_admin', layout: :inline %>
     </div>
     <% if @roles.any? %>
-      <div class="col-sm-6">
+      <div class="col-9">
         <%= f.select(:role_id, options_from_collection_for_select(@roles, :id, :name, selected: @user.role_id), include_blank: true, layout: :horizontal) %>
       </div>
     <% end -%>
-  <% end %>
-</div>
+  </div>
+<% end %>

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

@@ -4,22 +4,24 @@
   <%= render(partial: 'form', locals: { f: f }) %>
 
   <% if @user && !@user.new_record? && Symphonia::User.current.logged_in? && (prefs = Symphonia::EmailPreference.visible.to_a).any? %>
-    <%= hidden_field_tag 'user[preference_ids][]' %>
-    <fieldset id="users-notifications-map" class="clearfix">
-      <%= content_tag(:legend, t(:label_user_notifications)) %>
-      <div class="row">
-        <% prefs.each do |pref| %>
-          <div class="col-md-3 col-sm-6">
-            <div class="form-check">
-              <label class="form-check-label">
-                <%= check_box_tag('user[preference_ids][]', pref.id, @user.preference_ids.include?(pref.id), class: 'form-check-input') %>
-                <%= t(pref.name, scope: :preferences) %>
-              </label>
+    <div class="row justify-content-center">
+      <%= hidden_field_tag 'user[preference_ids][]' %>
+      <fieldset id="users-notifications-map" class="col-8">
+        <%= content_tag(:legend, t(:label_user_notifications)) %>
+        <div class="row">
+          <% prefs.each do |pref| %>
+            <div class="col-6">
+              <div class="form-check">
+                <label class="form-check-label">
+                  <%= check_box_tag('user[preference_ids][]', pref.id, @user.preference_ids.include?(pref.id), class: 'form-check-input') %>
+                  <%= t(pref.name, scope: :preferences) %>
+                </label>
+              </div>
             </div>
-          </div>
-        <% end %>
-      </div>
-    </fieldset>
+          <% end %>
+        </div>
+      </fieldset>
+    </div>
   <% end %>
 
   <%= f.primary unless request.xhr? %>