symphonia 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690d5654253b68fefb5088b8938130e37baf32e2ac3a533af0ded29909f66a01
-  data.tar.gz: 208b3dac35095799df42c565300f8c7877dad70a52ce966c6c7ad8e75048c710
+  metadata.gz: 68c44e1f10ceb644917147a7e5cd28caa1a6054a8bffed6e85fa7e76a90d9956
+  data.tar.gz: dfaa2c7d6d6e0c6960a59722998542af1e16ca644fdeefbe6ffcc5be5087ef96
 SHA512:
-  metadata.gz: c23c2f1972886ac602da1fcd7fc0259b998a53787999bab18b7c320044b64a176a77227d20ec7d896868d74829464812f8a95a6910216e295f5b263dd65c3e65
-  data.tar.gz: caa04002e0307779c75a0542124e6ca09a76463fb27b23aec0aa079b81d0af0b8c8cfabed6541472bc146ac1c086087910196969b85c83251b7a865eb906e4fe
+  metadata.gz: 0f9b8fca0586ade8130cf789e367b5724a38f7cf44597f48b15819098034a53b3e2d42007d05a13fd73e70e91922e3cd681fffef284abc70a67b1fef868586ca
+  data.tar.gz: '08bc13b2b16c0001c9389238771b2dfc0c1c97400fecad96540f6fdadcd9ac343a2c918bcd8699b8c7bf11fe9c862b0826ae6be62628fbec54518b9b6480ff95'

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines_special
@@ -12,15 +13,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,18 @@ 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
+- 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/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/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/settings.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/{404.html → public/404.html.tt}

@@ -4,8 +4,8 @@
   <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" />
+  <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>

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

@@ -26,10 +26,10 @@
           <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>
+          <i class="fa fa-li fa-envelope"></i>e-mail: <a href="mailto:admin@lagrace.cz">admin@luk4s.cz</a>
         </li>
         <li>
-          <i class="fa fa-li fa fa-mobile-phone"></i>tel: 604484983
+          <i class="fa fa-li fa-mobile-phone"></i>tel: 604484983
         </li>
       </ul>
     </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.rb

@@ -1,5 +1,5 @@
-# Dir[File.dirname(__FILE__) + '/symphonia/*.rb'].each {|file| require file }
 module Symphonia
+
   include ::ActiveSupport::Configurable
 
   autoload :BaseController, 'symphonia/base_controller'
@@ -13,8 +13,11 @@ module Symphonia
   autoload :QueryColumns, 'symphonia/query_columns'
 
   module ActionCable
+
     autoload :Connection, 'symphonia/action_cable/connection'
+
   end
+
 end
 
 require 'symphonia/engine'

data/lib/symphonia/model_attributes/attribute.rb

@@ -1,9 +1,9 @@
 module Symphonia
   module ModelAttributes
+
     class Attribute
 
-      attr_reader :name, :options
-      attr_reader :format_options, :sort_column
+      attr_reader :name, :options, :format_options, :sort_column
       attr_accessor :filter
 
       def initialize(name, klass, options, formatter)
@@ -78,27 +78,34 @@ module Symphonia
       def format_value(_view, value, _entity)
         value.to_s
       end
+
     end
 
 
     class TextAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         view.format_text(value)
       end
 
       def input_field
         :text_area
       end
+
     end
+
     class DecimalAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         view.format_price(value)
       end
+
     end
 
     class EnumAttribute < Attribute
+
       # TODO: @klass.name || @klass.base_class.name || entity.class.name
-      def format_value(view, value, entity)
+      def format_value(view, value, _entity)
         view.t("#{@klass.name.underscore}.#{name.to_s.pluralize}.#{value}", format_options)
       end
 
@@ -109,26 +116,27 @@ module Symphonia
       def input_options
         []
       end
+
     end
 
     class LinkAttribute < Attribute
+
       def format_value(view, value, entity)
         view.link_to value.to_s, entity, format_options
       end
+
     end
 
     class MailAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         view.mail_to value.to_s, value.to_s, format_options
       end
+
     end
 
     class ReferenceAttribute < Attribute
 
-      def initialize(name, klass, options, formatter)
-        super
-      end
-
       def title
         if (ref = @klass.reflect_on_association(name)).macro == :belongs_to
           @klass.human_attribute_name(ref.foreign_key, @options[:i18n] || {})
@@ -138,7 +146,7 @@ module Symphonia
 
       end
 
-      def format_value(view, value, entity)
+      def format_value(view, value, _entity)
         if value.is_a?(ActiveRecord::Associations::CollectionProxy) || value.is_a?(Array)
           value.collect { |v| view.link_to v.to_s, v, format_options }.join("\n").html_safe
         else
@@ -153,7 +161,8 @@ module Symphonia
     end
 
     class BooleanAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         if value.to_boolean
           view.icon('true', view.t(:true))
         else
@@ -164,21 +173,28 @@ module Symphonia
       def input_field
         :check_box
       end
+
     end
 
     class DateAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         value && view.l(value.to_date, format_options)
       end
+
     end
 
     class DateTimeAttribute < Attribute
-      def format_value(view, value, entity)
+
+      def format_value(view, value, _entity)
         value && view.l(value.localtime, format_options)
       end
+
     end
+
     class DatetimeAttribute < DateTimeAttribute
       # alias
     end
+
   end
 end

data/lib/symphonia/model_filters/base.rb

@@ -1,7 +1,7 @@
 module Symphonia
   module ModelFilters
     class Base
-      attr_reader :name, :type, :caption, :options, :query, :value, :operator
+      attr_reader :name, :type, :options, :query, :value, :operator
 
       # @param [Symphonia::ModelAttributes::Attribute] attribute
       # @param [Symphonia::Query] query
@@ -24,7 +24,7 @@ module Symphonia
         @caption ||= query.model.human_attribute_name(name)
       end
 
-      def form_field(_c)
+      def form_field(_context)
         raise NotImplementError
       end
 
@@ -36,20 +36,18 @@ module Symphonia
         !!query.active_filters[name]
       end
 
-      def value=(q)
-        if (m = q.downcase.match(/^([!~><]+)(.*)/))
-          @value = m[2]
-          self.operator = m[1]
-        else
-          @operator ||= 'eq'
-          @value = q
-        end
-
-        @value
+      def value=(to)
+        @value = if (m = to.downcase.match(/^([!~><]+)(.*)/))
+                   self.operator = m[1]
+                   m[2]
+                 else
+                   @operator ||= 'eq'
+                   to
+                 end
       end
 
-      def operator=(o)
-        @operator = case o
+      def operator=(to)
+        @operator = case to
                     when '!'
                       'not_eq'
                     when '~'
@@ -79,4 +77,4 @@ module Symphonia
 
     end
   end
-end
+end