sunrise-cms 1.1.1 → 2.0.0

data/config/locales/sunrise/uk.yml

@@ -13,7 +13,7 @@ uk:
         remember_me: "Запам'ятати мене"
         role_type_id: "Тип користувача"
         role: "Тип користувача"
-      
+
       structure:
         title: "Назва"
         title_ru: "Назва (рос.)"
@@ -24,7 +24,7 @@ uk:
         redirect_url: "Перенаправлення (URL)"
         position_type_id: "Позиція"
         slug: "URL"
-      
+
       header:
         title: "Заголовок сторінки"
         title_ru: "Заголовок сторінки (рос.)"
@@ -35,7 +35,7 @@ uk:
         description: "Опис сторінки"
         description_ru: "Опис сторінки (рос.)"
         description_en: "Опис сторінки (eng.)"
-      
+
       post:
         title: "Назва"
         title_ru: "Назва (рос.)"
@@ -46,7 +46,7 @@ uk:
         created_at: "Дата / Час"
         picture: "Зображення"
         published_at: "Дата публікації"
-      
+
       page:
         title: "Назва"
         title_ru: "Назва (рос.)"
@@ -54,10 +54,10 @@ uk:
         content: "Зміст"
         content_ru: "Зміст (рос.)"
         content_en: "Зміст (eng.)"
-      
+
       tag:
         name: "Назва"
-     
+
       feedback:
         name: "Ім'я"
         email: "Email"
@@ -66,14 +66,14 @@ uk:
         remote_ip: "IP адреса"
         user_agent: "Версія браузера"
         message: "Повідомлення"
-      
+
       activity:
         created_at: "Дата"
         owner: "Пользователь"
         key: "Что"
         trackable: "Объект"
         remote_address: "IP"
-              
+
   manage:
     title: "Система<br />управління"
     go_site: "Перегляд сайту"
@@ -106,7 +106,7 @@ uk:
     close: "Закрити"
     search: "Пошук"
     filter: "Фільтр"
-    
+
     menu:
       title: "Розділи та модулі"
       system_messages: "Системні повідомлення"
@@ -134,29 +134,29 @@ uk:
       panel:
         main: "Розділи та модулі"
         creates: "Створити"
-        
+
     settings:
       title: "Налаштування"
       mailer: "Пошта"
       route: "Домен"
       contacts: "Контакти"
-    
+
     locale:
       ru: "русский"
       en: "английский"
       uk: "украинский"
-    
-    model_filter: 
+
+    model_filter:
       title: "Фільтр даних"
       filter: "Фільтр"
       search: "Пошук"
       clear: "Очистити"
       total_count: "Всього"
-    
+
     position:
       down: "Опустити вниз"
       up: "Підняти вверх"
-    
+
     buttons:
       create_structure: "Створити розділ"
       table: "Таблиця"
@@ -168,7 +168,7 @@ uk:
       sort: "Сортувати"
       save: "Зберегти"
       cancel: "Скасувати"
-    
+
     user:
       actions: "дії"
       events:
@@ -179,7 +179,7 @@ uk:
         activate: "Активувати"
         unlock: "Розблокувати"
       roles: "Ролі"
-      
+
     users:
       activated_at: "активація"
       last_login_ip: "ip"
@@ -187,16 +187,16 @@ uk:
       category: "категорія"
       name: "Ім'я"
       export: "Експортувати"
-      
+
       sort:
         _: "-"
         created_at_desc: "по дате по убыванию"
         created_at_asc: "по дате по возрастанию"
         name_desc: "по имени по убыванию"
         name_asc: "по имени по возрастанию"
-    
+
     structure:
-      kind:
+      name:
         page: "Текстова сторінка"
         posts: "Блоги"
         main: "Головна сторінка"
@@ -208,20 +208,20 @@ uk:
         tracks: "Музика"
         wallpapers: "Шпалери"
         group: "Група сторінок"
-      
+
       position:
         default: "За замовчуванням"
         menu: "Головне меню"
         bottom: "Внизу"
-    
+
     role:
-      kind:
+      name:
         guest: "Гість"
         default: "Клієнт"
         moderator: "Модератор"
         admin: "Aдміністратор"
         redactor: "Редактор"
-        
+
     tags:
       sort:
         _: "-"
@@ -229,7 +229,7 @@ uk:
         created_at_asc: "по дате по возрастанию"
         name_desc: "по названию по убыванию"
         name_asc: "по названию по возрастанию"
-    
+
     posts:
       sort:
         _: "-"
@@ -237,7 +237,7 @@ uk:
         created_at_asc: "по дате по возрастанию"
         title_desc: "по названию по убыванию"
         title_asc: "по названию по возрастанию"
-    
+
     sort_columns:
       _: "-"
       created_at_desc: "по дате по убыванию"
@@ -252,11 +252,11 @@ uk:
       position_asc: "за позицией по возрастанию"
       sort_order_desc: "по сортировке по убыванию"
       sort_order_asc: "по сортировке по возрастанию"
-    
+
     fileupload:
       button: "Виберіть файл"
       max_size: "Макс. р."
-      
+
     icons:
       down: "Опустити вниз"
       up: "Підняти вгору"
@@ -266,7 +266,7 @@ uk:
 
     groups:
       meta_tags: "Мета теги"
-  
+
   views:
     pagination:
       previous: "Попередня"
@@ -274,9 +274,9 @@ uk:
       truncate: "..."
       last: "Остання"
       first: "Перша"
-  
+
   flash:
-    manage:      
+    manage:
       actions:
         create:
           success: "Запис успішно створено"
@@ -287,19 +287,19 @@ uk:
         destroy:
           success: "Запис успішно видалено"
           failure: "Виникли помилки при видаленні даних"
-        
+
       users:
         create:
           success: "Користувач успішно створений"
           failure: "Виникли помилки при створенні користувача"
         update:
           success: "Дані користувача успішно оновлено"
-      
+
       settings:
         create:
           success: "Параметри успішно оновлені"
           failure: "Виникли помилки при збереженні даних"
-      
+
       pages:
         create:
           success: "Сторінка успішно збережено"
@@ -307,7 +307,7 @@ uk:
         update:
           success: "Сторінка успішно збережено"
           failure: "Виникли помилки при збереженні даних"
-          
+
   errors:
     messages:
       wrong_size: "неправильний розмір (повинно бути %{file_size})"

data/db/migrate/20111216144515_create_assets.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateAssets < ActiveRecord::Migration
+class CreateAssets < ActiveRecord::Migration[7.2]
   def self.up
     create_table :assets do |t|
       t.string  :data_file_name, null: false

data/db/migrate/20111216144915_create_structures.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateStructures < ActiveRecord::Migration
+class CreateStructures < ActiveRecord::Migration[7.2]
   def self.up
     create_table :structures do |t|
       t.string    :title, null: false

data/db/migrate/20111216145015_create_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[7.2]
   def self.up
     create_table(:users) do |t|
       t.string :name, null: false, default: '', limit: 150

data/db/migrate/20120611095315_create_settings.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateSettings < ActiveRecord::Migration
+class CreateSettings < ActiveRecord::Migration[7.2]
   def self.up
     create_table(:settings) do |t|
       t.string  :var, limit: 50, null: false

data/lib/generators/sunrise/templates/config/active_record/sunrise.rb

@@ -32,10 +32,6 @@ Sunrise.setup do |config|
   # Set available locales in app (default: [])
   # config.available_locales = []
 
-  # Set transliteration for babosa gem
-  # more info here: https://github.com/norman/babosa (default: :russian)
-  # config.transliteration = :russian
-
   # Set list toolbar buttons (default: [:delete, :edit, :new, :sort, :export])
   # config.default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
 

data/lib/generators/sunrise/templates/config/mongoid/sunrise.rb

@@ -32,10 +32,6 @@ Sunrise.setup do |config|
   # Set available locales in app (default: [])
   # config.available_locales = []
 
-  # Set transliteration for babosa gem
-  # more info here: https://github.com/norman/babosa (default: :russian)
-  # config.transliteration = :russian
-
   # Set list toolbar buttons (default: [:delete, :edit, :new, :sort, :export])
   # config.default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
 

data/lib/generators/sunrise/templates/models/active_record/attachment_file.rb

@@ -2,6 +2,4 @@
 
 class AttachmentFile < Asset
   sunrise_uploader AttachmentFileUploader
-
-  validates_filesize_of :data, maximum: 100.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/active_record/avatar.rb

@@ -4,6 +4,4 @@ class Avatar < Asset
   sunrise_uploader AvatarUploader
 
   validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
-  validates_integrity_of :data
-  validates_filesize_of :data, maximum: 1.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/active_record/picture.rb

@@ -4,6 +4,4 @@ class Picture < Asset
   sunrise_uploader PictureUploader
 
   validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
-  validates_integrity_of :data
-  validates_filesize_of :data, maximum: 2.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/active_record/position_type.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class PositionType < Sunrise::Models::PositionType
-  define_enum do |builder|
-    builder.member :default,  object: new('default')
-    builder.member :menu,     object: new('menu')
-    builder.member :bottom,   object: new('bottom')
+  define_enum do
+    member :default
+    member :menu
+    member :bottom
   end
 end

data/lib/generators/sunrise/templates/models/active_record/role_type.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class RoleType < Sunrise::Models::RoleType
-  define_enum do |builder|
-    builder.member :default,   object: new('default')
-    builder.member :redactor,  object: new('redactor')
-    builder.member :moderator, object: new('moderator')
-    builder.member :admin,     object: new('admin')
+  define_enum do
+    member :default
+    member :redactor
+    member :moderator
+    member :admin
   end
 end

data/lib/generators/sunrise/templates/models/active_record/settings.rb

@@ -2,14 +2,26 @@
 
 require 'rails-settings-cached'
 
-class Settings < RailsSettings::CachedSettings
+class Settings < RailsSettings::Base
   include PublicActivity::Model
 
   tracked owner: ->(controller, _model) { controller.try(:current_user) }
 
-  def self.update_attributes(attributes)
+  scope :application do
+    field :app_name, type: :string, default: 'Rails application'
+  end
+
+  def self.update(attributes)
     attributes.each do |key, value|
       self[key] = value
     end
   end
+
+  def self.[](key)
+    public_send(key)
+  end
+
+  def self.[]=(key, value)
+    public_send("#{key}=", value)
+  end
 end

data/lib/generators/sunrise/templates/models/active_record/structure_type.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class StructureType < Sunrise::Models::StructureType
-  define_enum do |builder|
-    builder.member :page,     object: new('page')
-    builder.member :posts,    object: new('posts')
-    builder.member :main,     object: new('main')
-    builder.member :redirect, object: new('redirect')
-    builder.member :group,    object: new('group')
+  define_enum do
+    member :page
+    member :posts
+    member :main
+    member :redirect
+    member :group
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/attachment_file.rb

@@ -2,6 +2,4 @@
 
 class AttachmentFile < Asset
   sunrise_uploader AttachmentFileUploader
-
-  validates_filesize_of :data, maximum: 100.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/avatar.rb

@@ -4,6 +4,4 @@ class Avatar < Asset
   sunrise_uploader AvatarUploader
 
   validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
-  validates_integrity_of :data
-  validates_filesize_of :data, maximum: 1.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/picture.rb

@@ -4,6 +4,4 @@ class Picture < Asset
   sunrise_uploader PictureUploader
 
   validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
-  validates_integrity_of :data
-  validates_filesize_of :data, maximum: 2.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/position_type.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class PositionType < Sunrise::Models::PositionType
-  define_enum do |builder|
-    builder.member :default,  object: new('default')
-    builder.member :menu,     object: new('menu')
-    builder.member :bottom,   object: new('bottom')
+  define_enum do
+    member :default
+    member :menu
+    member :bottom
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/role_type.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class RoleType < Sunrise::Models::RoleType
-  define_enum do |builder|
-    builder.member :default,   object: new('default')
-    builder.member :redactor,  object: new('redactor')
-    builder.member :moderator, object: new('moderator')
-    builder.member :admin,     object: new('admin')
+  define_enum do
+    member :default
+    member :redactor
+    member :moderator
+    member :admin
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/structure_type.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class StructureType < Sunrise::Models::StructureType
-  define_enum do |builder|
-    builder.member :page,     object: new('page')
-    builder.member :posts,    object: new('posts')
-    builder.member :main,     object: new('main')
-    builder.member :redirect, object: new('redirect')
-    builder.member :group,    object: new('group')
+  define_enum do
+    member :page
+    member :posts
+    member :main
+    member :redirect
+    member :group
   end
 end

data/lib/generators/sunrise/templates/models/sunrise/sunrise_structure.rb

@@ -23,8 +23,8 @@ class SunriseStructure < Sunrise::AbstractModel
     field :redirect_url
     field :slug
     field :parent_id, collection: -> { Structure.nested_set_options { |i| "#{'–' * i.depth} #{i.title}" } }, if: ->(s) { s.moveable? }
-    field :structure_type_id, collection: -> { StructureType.all }, include_blank: false
-    field :position_type_id, collection: -> { PositionType.all }, include_blank: false
+    field :structure_type_id, collection: -> { StructureType.all }, include_blank: false, label_method: :title
+    field :position_type_id, collection: -> { PositionType.all }, include_blank: false, label_method: :title
     field :is_visible
 
     group :meta_tags, holder: :sidebar do

data/lib/generators/sunrise/templates/spec/controllers/pages_controller_spec.rb

@@ -6,11 +6,11 @@ describe PagesController, type: :controller do
   render_views
 
   before(:all) do
-    @root = FactoryGirl.create(:structure_main)
+    @root = FactoryBot.create(:structure_main)
   end
 
   context 'page' do
-    before(:each) { @page = FactoryGirl.create(:structure_page, parent: @root) }
+    before(:each) { @page = FactoryBot.create(:structure_page, parent: @root) }
 
     it 'should render show action' do
       get :show, id: @page.slug

data/lib/generators/sunrise/templates/spec/controllers/welcome_controller_spec.rb

@@ -6,7 +6,7 @@ describe WelcomeController, type: :controller do
   render_views
 
   before(:each) do
-    @root = FactoryGirl.create(:structure_main)
+    @root = FactoryBot.create(:structure_main)
   end
 
   it 'should render index action' do

data/lib/generators/sunrise/templates/spec/factories/structure_factory.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :structure_page, class: Structure do
     title 'Structure'
-    slug { FactoryGirl.generate(:slug) }
+    slug { FactoryBot.generate(:slug) }
     structure_type StructureType.page
     position_type PositionType.menu
     is_visible true

data/lib/generators/sunrise/templates/spec/factories/user_factory.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin_user, class: User do |user|
     user.name 'Admin'
-    user.email { FactoryGirl.generate(:email) }
+    user.email { FactoryBot.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
 
@@ -15,7 +15,7 @@ FactoryGirl.define do
 
   factory :redactor_user, class: User do |user|
     user.name 'Redactor'
-    user.email { FactoryGirl.generate(:email) }
+    user.email { FactoryBot.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
 
@@ -27,7 +27,7 @@ FactoryGirl.define do
 
   factory :moderator_user, class: User do |user|
     user.name 'Redactor'
-    user.email { FactoryGirl.generate(:email) }
+    user.email { FactoryBot.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
 
@@ -39,7 +39,7 @@ FactoryGirl.define do
 
   factory :default_user, class: User do |user|
     user.name 'Test'
-    user.email { FactoryGirl.generate(:email) }
+    user.email { FactoryBot.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
 
@@ -51,7 +51,7 @@ FactoryGirl.define do
 
   factory :user, class: User do |user|
     user.name 'Test'
-    user.email { FactoryGirl.generate(:email) }
+    user.email { FactoryBot.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
   end

data/lib/generators/sunrise/templates/spec/spec_helper.rb

@@ -19,7 +19,7 @@ RSpec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.extend ControllerMacros, type: :controller
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your

data/lib/generators/sunrise/templates/spec/support/helpers/controller_macros.rb

@@ -3,7 +3,7 @@
 module ControllerMacros
   def login_admin
     before(:all) do
-      @admin = FactoryGirl.create(:admin_user)
+      @admin = FactoryBot.create(:admin_user)
     end
 
     before(:each) do
@@ -14,7 +14,7 @@ module ControllerMacros
 
   def login_default
     before(:all) do
-      @user = FactoryGirl.create(:default_user)
+      @user = FactoryBot.create(:default_user)
     end
 
     before(:each) do
@@ -25,7 +25,7 @@ module ControllerMacros
 
   def login_redactor
     before(:all) do
-      @user = FactoryGirl.create(:redactor_user)
+      @user = FactoryBot.create(:redactor_user)
     end
 
     before(:each) do
@@ -36,7 +36,7 @@ module ControllerMacros
 
   def login_moderator
     before(:all) do
-      @user = FactoryGirl.create(:moderator_user)
+      @user = FactoryBot.create(:moderator_user)
     end
 
     before(:each) do

data/lib/generators/sunrise/templates/uploaders/attachment_file_uploader.rb

@@ -4,4 +4,8 @@ class AttachmentFileUploader < Sunrise::CarrierWave::BaseUploader
   def extension_white_list
     %w[pdf doc docx xls xlsx ppt pptx zip rar csv]
   end
+
+  def size_range
+    100...100.megabytes.to_i
+  end
 end

data/lib/generators/sunrise/templates/uploaders/avatar_uploader.rb

@@ -15,4 +15,8 @@ class AvatarUploader < Sunrise::CarrierWave::BaseUploader
   def extension_white_list
     %w[jpg jpeg gif png]
   end
+
+  def size_range
+    100..1.megabytes.to_i
+  end
 end

data/lib/generators/sunrise/templates/uploaders/picture_uploader.rb

@@ -15,4 +15,8 @@ class PictureUploader < Sunrise::CarrierWave::BaseUploader
   def extension_white_list
     %w[jpg jpeg gif png]
   end
+
+  def size_range
+    100..2.megabytes.to_i
+  end
 end