symphonia 3.4.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690d5654253b68fefb5088b8938130e37baf32e2ac3a533af0ded29909f66a01
-  data.tar.gz: 208b3dac35095799df42c565300f8c7877dad70a52ce966c6c7ad8e75048c710
+  metadata.gz: 37c5df664c5d4a4e23242972efcb37a44a97b0000c943aba8ff68ac7ebd4d2ec
+  data.tar.gz: 1636c08f1a1aa674319a19172cf0291d5fa910a9930056f8598ac96b7bf65937
 SHA512:
-  metadata.gz: c23c2f1972886ac602da1fcd7fc0259b998a53787999bab18b7c320044b64a176a77227d20ec7d896868d74829464812f8a95a6910216e295f5b263dd65c3e65
-  data.tar.gz: caa04002e0307779c75a0542124e6ca09a76463fb27b23aec0aa079b81d0af0b8c8cfabed6541472bc146ac1c086087910196969b85c83251b7a865eb906e4fe
+  metadata.gz: f2716c183798fd2acc14702ac79d44f4f210e4d4b770c6670ff78267c2ada056d3c331229371f02a66ca32d7496618a65972b1405860aace5fd7fc433161b94b
+  data.tar.gz: dbeff2e27c22f063183e6eecd395ba895cf8c6986841281d1914f2e3997ee4a833fd3e78c7a38dca24e49041083f3398a876ea8a4bd476b11ec57cf9830c1734

data/.rubocop.yml

@@ -1,5 +1,10 @@
+require:
+  - rubocop-rails
+  - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines_special
@@ -12,15 +17,13 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-#Metrics/LineLength:
-#  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 
-#Style/BracesAroundHashParameters:
-#  EnforcedStyle: context_dependent
 Style/Documentation:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/MutableConstant:
   Enabled: false
 Style/NegatedIf:

data/CHANGELOG.md

@@ -5,6 +5,33 @@ 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.1.1] - 2021-12-26
+### Fixed
+- user activation
+## [4.1.0] - 2021-10-23
+### Fixed
+- missing default settings template in generator:setup
+### Added
+- rubocop-rails
+- rubocop-rspec
+### Removed
+- mini_racer
+### Changed
+- split SASS files
+
+## [4.0.0] - 2021-05-18
+### Removed
+- development dependency in gemspec replaced by `symphonia_spec` gem
+- GenericColumn in Query
+- AdminModule class/table = its not used, its not working
+### Changed
+- Rails 6.1 support
+- Query#to_params boolean argument to named
+- update generators
+- use native JSON columns instead of serializations
+### Added
+- Gemfile.lock
+
 ## [3.4.0] - 2021-03-22
 ### Changed
 - upgrade authlogic to 6.4.1 (rails6.1 compatible)

data/README.md

@@ -14,3 +14,19 @@ 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.
 
 
+## Upgrade to v4.0
+1. update Gemfile:
+```ruby
+gem 'rails', '~> 6.1'
+gem 'symphonia', '~> 4.0'
+source "https://gems.luk4s.cz" do
+  gem 'symphonia_spec', group: %i[development test]
+end
+```
+And `bundle update`
+2. upgrade rails:
+   https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+```bash
+export THOR_MERGE=vimdiff
+rails app:update
+```

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

@@ -0,0 +1,29 @@
+@import 'font-awesome';
+/* Font awesome aliases */
+.fa-add {
+  @extend .fa-plus-circle !optional;
+}
+.fa-delete, .fa-del {
+  @extend .fa-trash-o !optional;
+}
+.fa-back {
+  @extend .fa-chevron-left !optional;
+}
+.fa-true {
+  @extend .fa-check !optional;
+}
+.fa-false {
+  @extend .fa-times !optional;
+}
+.fa-notice {
+  @extend .fa-check-circle !optional;
+}
+.fa-error {
+  @extend .fa-times-circle !optional;
+}
+.alert .fa-info {
+  @extend .fa-info-circle !optional;
+}
+[class^="fa-"]:before:hover, a[class*=" fa-"]:before:hover {
+  text-decoration: none
+}

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

@@ -0,0 +1,40 @@
+@import "bootstrap";
+
+// fixed navbar
+body > .container {
+  padding-top: 80px;
+}
+
+@media print {
+  body > .container {
+    padding-top: 0 !important;
+  }
+}
+
+footer.footer {
+  height: 40px;
+  line-height: 40px;
+  bottom: 0;
+  width: 100%;
+}
+
+@keyframes highlight {
+  from {
+    background-color: map-get($theme-colors, warning);
+  }
+  to {
+    background-color: inherit;
+  }
+}
+
+@media print {
+  .contextual {
+    @extend .d-print-none;
+  }
+  a[href]:after {
+    content: none
+  }
+  .btn {
+    @extend .d-print-none;
+  }
+}

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

@@ -1,37 +1,5 @@
-@import 'font-awesome';
- /* Font awesome aliases */
-.fa-add {
-  //@extend .fa-plus-circle:before;
-  @extend .fa-plus-circle !optional;
-}
-.fa-delete, .fa-del {
-  @extend .fa-trash-o !optional;
-}
-.fa-back {
-  @extend .fa-chevron-left !optional;
-}
-.fa-true {
-  @extend .fa-check !optional;
-}
-.fa-false {
-  @extend .fa-times !optional;
-}
+@import "_font_awesome";
 
-.fa-notice {
-  @extend .fa-check-circle !optional;
-}
-.fa-error {
-  @extend .fa-times-circle !optional;
-}
-.alert .fa-info {
-  @extend .fa-info-circle !optional;
-}
-[class^="fa-"]:before, [class*=" fa-"]:before {
-  //padding-right: 5px;
-}
-[class^="fa-"]:before:hover, a[class*=" fa-"]:before:hover {
-  text-decoration: none
-}
 .page-header.title, .page-header.title h1 {
   margin-top: 0;
 }
@@ -40,7 +8,6 @@
 }
 .reorder, .reorder label {
   cursor: move;
-  cursor: -webkit-grabbing;
 }
 
 .flash {
@@ -217,4 +184,4 @@ table.table {
 .sortable-ghost {
   //border: 2px solid black;
   box-shadow: inset 0 0 5px #000000;
-}
+}

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

@@ -1,47 +1,2 @@
-//  require _bootstrap
-// *= require rails_bootstrap_forms
-// *= require bootstrap-datepicker3
-//@import "bootstrap-sprockets";
-
-@import "bootstrap";
+@import "layout";
 @import "bootstrap-datepicker3";
-
-
-// fixed navbar
-body > .container {
-  padding-top: 80px;
-}
-
-@media print {
-  body > .container {
-    padding-top: 0 !important;
-  }
-}
-
-footer.footer {
-  height: 40px;
-  line-height: 40px;
-  bottom: 0;
-  width: 100%;
-}
-
-@keyframes highlight {
-  from {
-    background-color: map-get($theme-colors, warning);
-  }
-  to {
-    background-color: inherit;
-  }
-}
-
-@media print {
-  .contextual {
-    @extend .d-print-none;
-  }
-  a[href]:after {
-    content: none
-  }
-  .btn {
-    @extend .d-print-none;
-  }
-}

data/app/controllers/symphonia/accounts_controller.rb

@@ -32,7 +32,7 @@ module Symphonia
         if @user.valid? && verify_registration && @user.save(validate: false)
           Notifier.activation_user(@user).deliver_later
           Notifier.user_registered(@user).deliver_later
-          format.html { redirect_to '/', notice: t(:text_user_registered) }
+          format.html { redirect_to login_path, notice: t(:text_user_registered) }
           format.json { render status: :created }
         else
           format.html { render action: 'register' }
@@ -71,14 +71,14 @@ module Symphonia
       @user = find_account_by_mail(params.require(:email))
       if @user
         if @user.active?
-          redirect_to root_path, flash: { error: t(:text_user_alerady_active) }
+          redirect_to login_path, flash: { error: t(:text_user_alerady_active) }
         else
           @user.reset_perishable_token!
           Notifier.activation_user(@user).deliver_later
-          redirect_to root_path, notice: t(:text_activation_resend)
+          redirect_to login_path, notice: t(:text_activation_resend)
         end
       else
-        redirect_to root_path, flash: { error: t(:text_user_not_found) }
+        redirect_to login_path, flash: { error: t(:text_user_not_found) }
       end
     end
 
@@ -88,7 +88,7 @@ module Symphonia
         @user.activate!
         redirect_to login_path, notice: t(:text_activation_success)
       else
-        redirect_to root_path, flash: { error: t(:text_user_not_found_or_token_invalid) }
+        redirect_to login_path, flash: { error: t(:text_user_not_found_or_token_invalid) }
       end
     end
 

data/app/controllers/symphonia/admin_controller.rb

@@ -3,9 +3,6 @@ module Symphonia
     before_action :login_require
 
     def index
-      @admin_modules = AdminModule.where(user_id: [nil, current_user.id]).order(:position).all
-      @modules_count = @admin_modules.count
-
       respond_to do |format|
         format.html
       end
@@ -19,4 +16,4 @@ module Symphonia
 
   end
 
-end
+end

data/app/helpers/symphonia/application_helper.rb

@@ -28,7 +28,7 @@ module Symphonia
         end
       end
 
-      return s.html_safe
+      s.html_safe
     end
 
     def render_menu(menu, options = {})
@@ -38,7 +38,7 @@ module Symphonia
       end
       options[:container_class] ||= 'mr-auto'
 
-      return content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      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/views/layouts/symphonia/application.html.erb

@@ -5,9 +5,9 @@
     <title><%= html_title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= yield :meta_tags %>
-    <%= stylesheet_link_tag 'application', :media => 'all', 'data-turbolinks-track' => true %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true %>
     <%= yield :stylesheet_tags %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': true %>
     <script type="text/javascript">
       Symphonia.routes.reorderImagesPath = '<%= symphonia.reorder_attachment_path %>';
     </script>

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

@@ -1,15 +1,5 @@
 <%= title 'Administrace' %>
-<% @admin_modules.each_with_index do |admin_module, _index| %>
-  <div class="col-lg-<%= @modules_count == 1 ? '12' : '6' %>" id="<%= dom_id(admin_module) %>">
-    <h3><%= t(admin_module.title, scope: [:admin_module, :titles], default: admin_module.title) %></h3>
-    <% if admin_module.body_path.is_a?(Symbol) %>
-      <%= render(partial: "admin_modules/#{admin_module.body_path}", locals: { admin_module: admin_module }) -%>
-    <% else %>
-      <%= format_text(admin_module.body_path) -%>
-    <% end -%>
-  </div>
-<% end -%>
 
 <%= content_for :meta_tags do %>
     <meta name="turbolinks-root" content="/admin">
-<% end %>
+<% end %>

data/db/migrate/20130714140501_create_roles.rb

@@ -1,10 +1,11 @@
-class CreateRoles < ActiveRecord::Migration[5.1]
+class CreateRoles < ActiveRecord::Migration[6.1]
+
   def up
     create_table :roles do |t|
-      t.string  :name, :null => false
-      t.text    :description, :null => true
+      t.string :name, null: false
+      t.text :description, null: true
 
-      t.text    :permissions
+      t.text :permissions
 
       t.timestamps
     end
@@ -13,4 +14,5 @@ class CreateRoles < ActiveRecord::Migration[5.1]
   def down
     drop_table :roles
   end
+
 end

data/db/migrate/20200428180001_add_uuid_to_users.rb

@@ -1,6 +1,8 @@
 class AddUuidToUsers < ActiveRecord::Migration[6.0]
+
   def change
-    uuid_type = connection.adapter_name =~ /PostgreSQL/i ? :uuid : :string
-    add_column :users, :uuid, uuid_type
+    # uuid_type = connection.adapter_name =~ /PostgreSQL/i ? :uuid : :string
+    add_column :users, :uuid, :uuid
   end
+
 end

data/db/migrate/20210509141420_roles_change_permissions_to_json.rb

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

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

data/lib/generators/symphonia/setup/setup_generator.rb

@@ -2,17 +2,16 @@ require 'rails/generators'
 
 module Symphonia
   class SetupGenerator < Rails::Generators::Base
-    # include Rails::Generators::Migration
 
     source_root File.expand_path('templates', __dir__)
 
     def create_settings
-      copy_file 'settings.rb', 'config/initializers/settings.rb'
+      template 'config/initializers/symphonia.rb'
     end
 
     def copy_static
-      copy_file '404.html', 'public/404.html'
-      copy_file '500.html', 'public/500.html'
+      template 'public/404.html'
+      template 'public/500.html'
     end
 
     def copy_assets
@@ -22,16 +21,14 @@ module Symphonia
     end
 
     def copy_rspec
-      copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
+      template 'spec/spec_helper.rb'
 
       create_file '.rspec' do
-        '--require spec_helper'
-        '--format documentation'
+        "--require spec_helper"
       end
     end
 
     def copy_setup_file
-
       copy_file 'base_layout.html.erb', 'app/views/layouts/application.html.erb'
 
       append_to_file 'db/seeds.rb', 'Symphonia::Engine.load_seed'
@@ -40,14 +37,20 @@ module Symphonia
       inject_into_file 'config/routes.rb', after: "Rails.application.routes.draw do\n" do
         "  mount Symphonia::Engine => '/'"
       end
+    end
+
+    def rubocop
+      create_file '.rubocop.yml' do
+        "inherit_gem:\n  symphonia: .rubocop.yml"
+      end
+    end
+
+    def setup_gemfile
+      append_to_file 'Gemfile' do
+        "gem 'symphonia_spec', source: 'https://gems.luk4s.cz', group: %w[development test]"
+      end
 
     end
 
-    # def setup_gemfile
-    #   append_to_file 'Gemfile' do
-    #     File.read(File.join(File.dirname(__FILE__), 'templates/Gemfile'))
-    #   end
-    #
-    # end
   end
 end

data/lib/generators/symphonia/setup/templates/config/initializers/symphonia.rb.tt

@@ -0,0 +1,48 @@
+Symphonia.configure do |config|
+  config.after_login_path = ->(h) { h.symphonia.user_current_path }
+  config.allow_registrations = false
+  config.default_locale = :cs
+end
+
+# Symphonia::MenuManager.map :top_menu do |m|
+#   m[:home] = {
+#     label: :label_home,
+#     icon: 'fa fa-home',
+#     url: '/'
+#   }
+#   m[:users] = {
+#     label: :label_users,
+#     icon: 'fa fa-user',
+#     url: ->(h) { h.symphonia.users_path },
+#     if: proc { Symphonia::User.current.admin? }
+#   }
+#   m[:roles] = {
+#     label: :label_roles,
+#     icon: 'fa fa-key',
+#     url: ->(h) { h.symphonia.roles_path },
+#     if: proc { Symphonia::User.current.admin? }
+#   }
+#
+# end
+# Symphonia::MenuManager.map :top_menu_account do |m|
+#   # -----
+#   m[:my_account] = {
+#     label: :label_my_account,
+#     icon: 'fa fa-wrench',
+#     url: ->(h) { h.symphonia.account_path },
+#     if: proc { Symphonia::User.current.logged_in? }
+#   }
+#   m[:logout] = {
+#     label: :button_logout,
+#     icon: 'fa fa-sign-out',
+#     url: ->(h) { h.symphonia.logout_path },
+#     method: 'delete',
+#     if: proc { Symphonia::User.current.logged_in? }
+#   }
+#   m[:login] = {
+#     label: :button_login,
+#     icon: 'fa fa-signin',
+#     url: ->(h) { h.symphonia.login_path },
+#     if: proc { !Symphonia::User.current.logged_in? }
+#   }
+# end

data/lib/generators/symphonia/setup/templates/{404.html → public/404.html.tt}

@@ -3,13 +3,13 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>404 STránka nenalezena</title>
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
+  <title>404 Stránka nenalezena</title>
+  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
+  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 </head>
 
 <body>
-  <!-- This file lives in public/500.html -->
+  <!-- This file lives in public/404.html -->
   <br />
   <div class="rows">
     <p class="col-sm-6 col-md-3">

data/lib/generators/symphonia/setup/templates/{500.html → public/500.html.tt}

@@ -21,17 +21,6 @@
       <p>
         Při zpracování požadavku došlo k vnitřní chybě serveru. Kontaktujte prosím administrátora.
       </p>
-      <ul class="fa-ul">
-        <li>
-          <h3>Lukáš Pokorný</h3>
-        </li>
-        <li>
-          <i class="fa fa-li fa fa-envelope"></i>e-mail: <a href="mailto:admin@lagrace.cz">admin@lagrace.cz</a>
-        </li>
-        <li>
-          <i class="fa fa-li fa fa-mobile-phone"></i>tel: 604484983
-        </li>
-      </ul>
     </div>
   </div>
 </div>

data/lib/generators/symphonia/setup/templates/{spec_helper.rb → spec/spec_helper.rb.tt}

@@ -1,11 +1,11 @@
 ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require_relative '../../config/environment'
 # Prevent database truncation if the environment is production
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 
 # require 'symphonia'
 RSpec.configure do |config|
-  Dir.glob(File.join(__dir__, 'support', '*.rb')).each { |f| require f }
+  Dir.glob(File.join(__dir__, 'support', '*.rb')).sort.each { |f| require f }
 
   require 'symphonia/spec_helper'
 
@@ -15,4 +15,5 @@ RSpec.configure do |config|
 
   config.infer_spec_type_from_file_location!
   config.filter_rails_from_backtrace!
+  config.profile_examples = true
 end

data/lib/symphonia/action_cable/connection.rb

@@ -9,17 +9,15 @@ module Symphonia
 
         def connect
           self.current_user = find_verified_user_or_guest
-          logger.add_tags 'ActionCable', self.current_user.login unless self.current_user.nil?
+          logger.add_tags 'ActionCable', current_user.login unless current_user.nil?
         end
 
         protected
 
         def find_verified_user_or_guest
-          if (credentials = request.session["symphonia/user_credentials"]).present?
-            ::Symphonia::User.find_by_persistence_token(credentials.split(':')[0])
-          else
-            nil
-          end
+          return if (credentials = request.session["symphonia/user_credentials"]).blank?
+
+          ::Symphonia::User.find_by(persistence_token: credentials.split(':')[0])
         end
       end
 
@@ -28,4 +26,4 @@ module Symphonia
 
     end
   end
-end
+end

data/lib/symphonia/admin_constraint.rb

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