symphonia 3.1.5 → 3.3.0

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

@@ -1,7 +1,7 @@
 <%= title(t(:label_user_new), back: true) %>
 
-<%= symphonia_form_for(@user, html: {novalidate: true}) do |f| %>
-  <%= render(partial: 'form', locals: {f: f}) %>
+<%= symphonia_form_for(@user, html: { novalidate: true }) do |f| %>
+  <%= render(partial: 'form', locals: { f: f }) %>
   <%= f.form_group do %>
     <%= f.primary(t(:button_create)) %>
   <% end %>

data/config/routes.rb

@@ -1,4 +1,5 @@
 require 'sidekiq/web'
+require 'sidekiq/cron/web'
 require 'symphonia/admin_constraint'
 Symphonia::Engine.routes.draw do
 

data/db/migrate/20200428180001_add_uuid_to_users.rb

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

data/db/migrate/20200428180008_add_avatar_to_users.rb

@@ -0,0 +1,5 @@
+class AddAvatarToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :avatar_url, :string
+  end
+end

data/db/seeds.rb

@@ -6,7 +6,8 @@ u.attributes = {
   email: 'luk4s.pokorny@gmail.com',
   password: 'admin',
   # password_confirmation: 'admin',
-  admin: true
+  admin: true,
+  avatar_url: "https://secure.gravatar.com/avatar/3657d5f0e9747c1c21eb2b689a8dba0b?s=64"
 }
 u.single_access_token = SecureRandom.hex(20)
 u.save!(validate: false)

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

@@ -16,7 +16,8 @@ module Symphonia
     end
 
     def copy_assets
-      append_to_file 'app/assets/javascripts/application.js', '//= require symphonia/application'
+      template 'app/assets/javascripts/application.js'
+      append_to_file 'app/assets/config/manifest.js', '//= link symphonia_manifest.js'
       copy_file 'design.scss', 'app/assets/stylesheets/general.scss'
     end
 

data/lib/generators/symphonia/setup/templates/app/assets/javascripts/application.js.tt

@@ -0,0 +1 @@
+//= require symphonia/application

data/lib/symphonia.rb

@@ -2,7 +2,6 @@
 module Symphonia
   include ::ActiveSupport::Configurable
 
-  autoload :Attachable, 'symphonia/attachable'
   autoload :BaseController, 'symphonia/base_controller'
   autoload :BootstrapLinkRender, 'symphonia/bootstrap_link_render'
   autoload :ControllerExtensions, 'symphonia/controller_extensions'

data/lib/symphonia/action_cable/connection.rb

@@ -15,7 +15,7 @@ module Symphonia
         protected
 
         def find_verified_user_or_guest
-          if (credentials = request.cookie_jar['symphonia/user_credentials']).present?
+          if (credentials = request.session["symphonia/user_credentials"]).present?
             ::Symphonia::User.find_by_persistence_token(credentials.split(':')[0])
           else
             nil

data/lib/symphonia/admin_constraint.rb

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

data/lib/symphonia/base_controller.rb

@@ -6,10 +6,17 @@ module Symphonia
   # def model
   #   YourModel
   # end
+  # OR
+  # self.model = YourModel
   #
   # def safe_attributes
   #   %i[]
   # end
+  #
+  # def swagger_path
+  #  false # => for disable swagger
+  #   "/my-custom-path" # => for custom route
+  # end
   module BaseController
     extend ActiveSupport::Concern
 

data/lib/symphonia/engine.rb

@@ -6,6 +6,7 @@ require 'symphonia/user_management'
 require 'rails-i18n'
 require 'turbolinks'
 require 'authlogic'
+require 'scrypt'
 require 'bootstrap'
 
 require 'will_paginate'
@@ -15,14 +16,14 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'rdiscount'
 require 'sortable-table'
-require 'paperclip'
+# require 'paperclip'
 require 'awesome_nested_set'
-require 'acts_as_list'
+# require 'acts_as_list'
 require 'bootstrap_form'
 require 'the_sortable_tree'
 require 'bootstrap-datepicker-rails'
 # require 'wicked_pdf'
-require 'swagger/blocks'
+# require 'swagger/blocks'
 
 module Symphonia
 
@@ -31,7 +32,7 @@ module Symphonia
 
     config.generators do |g|
       g.test_framework :rspec, fixture: false
-      # g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
     end
 
     # Rails 5
@@ -83,10 +84,10 @@ module Symphonia
 
     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
+      #if defined?(::Ckeditor)
+      #  config.assets.precompile << 'ckeditor/**/*'
+      #  config.assets.precompile << 'symphonia/symphonia_ckeditor.js'
+      #end
     end
 
     initializer :symphonia_general_permissions do |_app|

data/lib/symphonia/model_attributes/attribute.rb

@@ -174,7 +174,7 @@ module Symphonia
 
     class DateTimeAttribute < Attribute
       def format_value(view, value, entity)
-        value && view.l(value, format_options)
+        value && view.l(value.localtime, format_options)
       end
     end
     class DatetimeAttribute < DateTimeAttribute

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.1.5'
+  VERSION = '3.3.0'
 end

data/spec/controllers/base_controller_spec.rb

@@ -17,16 +17,21 @@ class DummyBaseA < Symphonia::ApplicationController
   self.model = ModelA
 end
 class DummyBaseB < DummyBaseA
-  # include Symphonia::BaseController
   self.model = ModelB
 end
 
 RSpec.describe DummyBaseB do
-  # subject { described_class.new }
+
   controller do
+    before_action :set_locale, only: :index
+
     def show
       render plain: model.name
     end
+
+    def index
+      render plain: t(:language)
+    end
   end
   it "#model" do
     subject = DummyBaseA.new
@@ -39,4 +44,34 @@ RSpec.describe DummyBaseB do
     get :show, params: { id: 1 }
     expect(response.body).to eq "ModelB"
   end
+
+  describe "#set_locale" do
+    before do
+      I18n.locale = :cs
+    end
+    context "logged user", logged: true do
+      before { Symphonia::User.current.language = :cs }
+      it "enforce language of user" do
+        get :index
+        expect(response.body).to eq "Čeština"
+        Symphonia::User.current.language = :en
+        get :index
+        expect(response.body).to eq "English"
+      end
+
+      it "ignore :locale params" do
+        get :index, params: { locale: "en" }
+        expect(response.body).to eq "Čeština"
+      end
+    end
+    it "anonymous default language" do
+      get :index
+      expect(response.body).to eq "Čeština"
+    end
+
+    it "anonymous language by :locale" do
+      get :index, params: { locale: "en" }
+      expect(response.body).to eq "English"
+    end
+  end
 end

data/spec/factories/factories.rb

@@ -6,7 +6,6 @@ FactoryBot.define do
     login { email }
     admin { false }
     password { SecureRandom.hex(16) }
-    # password_confirmation { password }
     last_request_at { Time.now }
 
     trait :admin do
@@ -28,17 +27,17 @@ FactoryBot.define do
     sequence(:name) { |n| "#{Faker::Job.title} #{n}" }
   end
 
-  factory :attachment, class: 'Symphonia::Attachment' do
-    association :attachable, factory: :user
-  end
-
-  factory :file, parent: :attachment, class: 'Symphonia::CommonFile' do
-    attachment { File.new(File.expand_path('../../support/common_file.txt', __FILE__)) }
-  end
-
-  factory :image, parent: :attachment, class: 'Symphonia::Image' do
-    attachment { File.new(File.expand_path('../../support/symphonia.jpg', __FILE__)) }
-  end
+  # factory :attachment, class: 'Symphonia::Attachment' do
+  #   association :attachable, factory: :user
+  # end
+  #
+  # factory :file, parent: :attachment, class: 'Symphonia::CommonFile' do
+  #   attachment { File.new(File.expand_path('../../support/common_file.txt', __FILE__)) }
+  # end
+  #
+  # factory :image, parent: :attachment, class: 'Symphonia::Image' do
+  #   attachment { File.new(File.expand_path('../../support/symphonia.jpg', __FILE__)) }
+  # end
 
   factory :preference, class: 'Symphonia::Preference' do
 

data/spec/spec_helper.rb

@@ -11,9 +11,9 @@ Dir.glob(File.expand_path('../support/*.rb', __FILE__)).each do |file|
   require file
 end
 
-ActiveRecord::Migration.maintain_test_schema!
+# ActiveRecord::Migration.maintain_test_schema!
 
-Paperclip::Attachment.default_options[:path] = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"
+# Paperclip::Attachment.default_options[:path] = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # config.infer_spec_type_from_file_location!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.3.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: api-pagination
   requirement: !ruby/object:Gem::Requirement
@@ -192,62 +206,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
   requirement: !ruby/object:Gem::Requirement
@@ -282,42 +268,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: mini_racer
+  name: sidekiq-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: swagger-blocks
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -394,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +410,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -452,11 +439,8 @@ files:
 - app/controllers/base_controller.rb
 - app/controllers/symphonia/accounts_controller.rb
 - app/controllers/symphonia/admin_controller.rb
-- app/controllers/symphonia/api_controller.rb
 - app/controllers/symphonia/application_controller.rb
-- app/controllers/symphonia/attachments_controller.rb
 - app/controllers/symphonia/filters_controller.rb
-- app/controllers/symphonia/images_controller.rb
 - app/controllers/symphonia/login_controller.rb
 - app/controllers/symphonia/roles_controller.rb
 - app/controllers/symphonia/user_sessions_controller.rb
@@ -469,14 +453,9 @@ files:
 - app/mailers/symphonia/notifier.rb
 - app/models/symphonia/admin_module.rb
 - app/models/symphonia/application_record.rb
-- app/models/symphonia/attachment.rb
-- app/models/symphonia/common_file.rb
 - app/models/symphonia/email_preference.rb
-- app/models/symphonia/image.rb
 - app/models/symphonia/preference.rb
 - app/models/symphonia/role.rb
-- app/models/symphonia/swagger/error_model.rb
-- app/models/symphonia/swagger/responses.rb
 - app/models/symphonia/user.rb
 - app/models/symphonia/user_session.rb
 - app/views/base/_form.html.erb
@@ -545,6 +524,8 @@ files:
 - db/migrate/20130828175114_create_attachments.rb
 - db/migrate/20141213204351_create_admin_modules.rb
 - db/migrate/20190706130409_add_external_id_to_users.rb
+- db/migrate/20200428180001_add_uuid_to_users.rb
+- db/migrate/20200428180008_add_avatar_to_users.rb
 - db/seeds.rb
 - lib/generators/symphonia/entity_controller/entity_controller_generator.rb
 - lib/generators/symphonia/entity_controller/templates/controller.rb
@@ -553,6 +534,7 @@ files:
 - lib/generators/symphonia/setup/templates/404.html
 - lib/generators/symphonia/setup/templates/500.html
 - lib/generators/symphonia/setup/templates/Gemfile
+- lib/generators/symphonia/setup/templates/app/assets/javascripts/application.js.tt
 - lib/generators/symphonia/setup/templates/base_layout.html.erb
 - lib/generators/symphonia/setup/templates/design.scss
 - lib/generators/symphonia/setup/templates/settings.rb
@@ -560,7 +542,6 @@ files:
 - lib/symphonia.rb
 - lib/symphonia/action_cable/connection.rb
 - lib/symphonia/admin_constraint.rb
-- lib/symphonia/attachable.rb
 - lib/symphonia/base_controller.rb
 - lib/symphonia/bootstrap_link_render.rb
 - lib/symphonia/controller_extensions.rb
@@ -588,10 +569,8 @@ files:
 - lib/symphonia/version.rb
 - spec/controllers/account_controller_spec.rb
 - spec/controllers/admin_controller_spec.rb
-- spec/controllers/api_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/filters_controller_spec.rb
-- spec/controllers/images_controller_spec.rb
 - spec/controllers/login_controller_spec.rb
 - spec/controllers/roles_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
@@ -601,7 +580,6 @@ files:
 - spec/helpers/symphonia/renderer_helper_spec.rb
 - spec/mailers/previews/symphonia/notifier_preview.rb
 - spec/mailers/symphonia/notifier_spec.rb
-- spec/models/attachment_spec.rb
 - spec/models/query/attribute_spec.rb
 - spec/models/query/filters_spec.rb
 - spec/models/query/symphonia_query_spec.rb
@@ -609,7 +587,6 @@ files:
 - spec/models/user_spec.rb
 - spec/rails_helper.rb
 - spec/requests/accounts_spec.rb
-- spec/requests/attachments_controller_spec.rb
 - spec/requests/login_spec.rb
 - spec/requests/roles_spec.rb
 - spec/requests/users_spec.rb
@@ -652,7 +629,6 @@ test_files:
 - spec/mailers/symphonia/notifier_spec.rb
 - spec/mailers/previews/symphonia/notifier_preview.rb
 - spec/version_spec.rb
-- spec/models/attachment_spec.rb
 - spec/models/query/attribute_spec.rb
 - spec/models/query/symphonia_query_spec.rb
 - spec/models/query/filters_spec.rb
@@ -660,7 +636,6 @@ test_files:
 - spec/models/role_spec.rb
 - spec/requests/roles_spec.rb
 - spec/requests/login_spec.rb
-- spec/requests/attachments_controller_spec.rb
 - spec/requests/accounts_spec.rb
 - spec/requests/users_spec.rb
 - spec/support/symphonia.jpg
@@ -675,12 +650,10 @@ test_files:
 - spec/controllers/roles_controller_spec.rb
 - spec/controllers/login_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
-- spec/controllers/api_controller_spec.rb
 - spec/controllers/filters_controller_spec.rb
 - spec/controllers/admin_controller_spec.rb
 - spec/controllers/account_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
-- spec/controllers/images_controller_spec.rb
 - spec/views/filters/options.html.erb_spec.rb
 - spec/rails_helper.rb
 - spec/helpers/symphonia/application_helper_spec.rb