sunrise-cms 1.1.0 → 2.0.0

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

data/lib/sunrise/abstract_model.rb

@@ -50,14 +50,14 @@ module Sunrise
     delegate :label, to: 'self.class.config'
     delegate :param_key, :singular, :plural, :route_key, to: :model_name
 
-    define_model_callbacks :sort, :mass_destroy, only: [:before, :after]
+    define_model_callbacks :sort, :mass_destroy, only: %i[before after]
 
     def initialize(params = {})
       @model_name = model.model_name
       @current_list = config.default_index_view
       @available_index_views = config.available_index_views
       @sort_column = config.sort_column
-      @request_params = params.symbolize_keys
+      @request_params = params.try(:symbolize_keys) || params
       self.current_list = params[:view]
     end
 
@@ -65,6 +65,16 @@ module Sunrise
       @request_params[param_key.to_sym] || {}
     end
 
+    def permit_model_params(*filters)
+      params = @request_params[param_key.to_sym]
+
+      if params
+        filters.empty? ? params.permit! : params.permit(*filters)
+      else
+        {}
+      end
+    end
+
     # Save current list view
     def current_list=(value)
       @current_list = value.to_sym if value && @available_index_views.include?(value.to_sym)
@@ -183,7 +193,7 @@ module Sunrise
       if model.respond_to?(:sunrise_search) && params[:search].present?
         scope = model.sunrise_search(params[:search])
       end
-      scope ||= model.where(nil)
+      scope ||= model.all
 
       scope = scope.merge(association_scope) unless parent_record.nil?
       scope = scope.merge(sort_scope(params[:sort])) if params[:sort].present?

data/lib/sunrise/carrierwave/glue.rb

@@ -10,15 +10,9 @@ module Sunrise
 
       module ClassMethods
         def sunrise_uploader(uploader = nil, options = {}, &block)
-          options = { mount_on: :data_file_name }.merge(options)
+          options = { mount_on: :data_file_name }.merge!(options)
 
           mount_uploader(:data, uploader, options, &block)
-
-          validates_processing_of :data
-        end
-
-        def validates_filesize_of(*attr_names)
-          validates_with FileSizeValidator, _merge_attributes(attr_names)
         end
       end
 

data/lib/sunrise/config/model.rb

@@ -38,6 +38,10 @@ module Sunrise
         Config.available_index_views
       end
 
+      register_instance_option(:available_import) do
+        Config.available_import
+      end
+
       register_instance_option(:sort_column) do
         Config.sort_column
       end

data/lib/sunrise/config.rb

@@ -40,11 +40,6 @@ module Sunrise
     mattr_accessor :available_locales
     @@available_locales = []
 
-    # Set transliteration for babosa gem
-    # more info here: https://github.com/norman/babosa
-    mattr_accessor :transliteration
-    @@transliteration = :russian
-
     # Set index toolbar buttons
     mattr_accessor :default_toolbar_buttons
     @@default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]

data/lib/sunrise/core_ext/string.rb

@@ -3,11 +3,6 @@
 require 'active_support/inflector/inflections'
 
 class String
-  def parameterize(sep = '-')
-    value = Sunrise::Utils::Transliteration.transliterate(self)
-    ActiveSupport::Inflector.parameterize(value, sep)
-  end
-
   def self.randomize(length = 8)
     Array.new(length) { (rand(122 - 97) + 97).chr }.join
   end

data/lib/sunrise/engine.rb

@@ -2,6 +2,7 @@
 
 require 'rails'
 require 'sunrise'
+require 'jquery-ui-rails'
 
 module Sunrise
   class Engine < ::Rails::Engine
@@ -10,6 +11,11 @@ module Sunrise
 
     config.i18n.load_path += Dir[Sunrise.root_path.join('config/locales/**', '*.{rb,yml}')]
 
+    config.assets.precompile += %w[sunrise/application.css sunrise/application.js]
+    config.assets.precompile += Dir[Sunrise.root_path.join('app/assets/images/sunrise/**/*')].map do |file|
+      Pathname.new(file).relative_path_from(Sunrise.root_path.join('app/assets/images')).to_s
+    end
+
     initializer 'sunrise.setup' do
       I18n::Backend::Simple.include I18n::Backend::Pluralization
       I18n::Backend::Simple.include I18n::Backend::Transliterator
@@ -28,7 +34,7 @@ module Sunrise
     initializer 'sunrise.csv_renderer' do
       ::ActionController::Renderers.add :csv do |collection, options|
         doc = Sunrise::Utils::CsvDocument.new(collection, options)
-        send_data(doc.render, filename: doc.filename, type: Mime::CSV, disposition: 'attachment')
+        send_data(doc.render, filename: doc.filename, disposition: 'attachment')
       end
     end
   end

data/lib/sunrise/models/ability.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-require 'cancan_namespace'
-
 module Sunrise
   module Models
     class Ability
-      include CanCanNamespace::Ability
+      include CanCan::Ability
 
       attr_accessor :context, :user
 
       def initialize(user, context = nil)
-        alias_action :delete, to: :destroy
+        # alias_action :delete, to: :destroy
 
         @user = (user || ::User.new) # guest user (not logged in)
         @context = context
 
         if @user.persisted? && @user.role_type
-          send @user.role_type.code
+          send @user.role_type.name
         else
           guest
         end
@@ -24,13 +22,15 @@ module Sunrise
 
       def admin
         can :manage, :all
-        can :manage, :all, context: :sunrise
+        # can :manage, :all, context: :sunrise
 
         # User cannot destroy self account
-        cannot :destroy, ::User, id: @user.id, context: :sunrise
+        # cannot :destroy, ::User, id: @user.id, context: :sunrise
+        cannot :destroy, ::User, id: @user.id
 
         # User cannot destroy root structure
-        cannot :destroy, ::Structure, structure_type_id: ::StructureType.main.id, context: :sunrise
+        # cannot :destroy, ::Structure, structure_type_id: ::StructureType.main.id, context: :sunrise
+        cannot :destroy, ::Structure, structure_type_id: ::StructureType.main.id
       end
     end
   end

data/lib/sunrise/models/position_type.rb

@@ -5,14 +5,8 @@ module Sunrise
     class PositionType
       include EnumField::DefineEnum
 
-      attr_reader :code
-
-      def initialize(code)
-        @code = code.to_sym
-      end
-
       def title
-        I18n.t(@code, scope: [:manage, :structure, :position])
+        I18n.t(name, scope: 'manage.structure.position')
       end
     end
   end

data/lib/sunrise/models/role_type.rb

@@ -5,14 +5,12 @@ module Sunrise
     class RoleType
       include EnumField::DefineEnum
 
-      attr_reader :code
-
-      def initialize(code)
-        @code = code.to_sym
+      def title
+        I18n.t(name, scope: 'manage.role.name')
       end
 
-      def title
-        I18n.t(@code, scope: [:manage, :role, :kind])
+      def code
+        name
       end
 
       def self.legal?(value)

data/lib/sunrise/models/structure.rb

@@ -13,9 +13,9 @@ module Sunrise
         enumerated_attribute :structure_type
         enumerated_attribute :position_type
 
-        validates_presence_of :title
-        validates_numericality_of :position_type_id, only_integer: true
-        validates_numericality_of :structure_type_id, only_integer: true
+        validates :title, presence: true
+        validates :position_type_id, numericality: { only_integer: true }
+        validates :structure_type_id, numericality: { only_integer: true }
 
         acts_as_nested_set
 

data/lib/sunrise/models/structure_type.rb

@@ -5,14 +5,8 @@ module Sunrise
     class StructureType
       include EnumField::DefineEnum
 
-      attr_reader :kind
-
-      def initialize(value)
-        @kind = value.to_sym
-      end
-
       def title
-        I18n.t(@kind, scope: [:manage, :structure, :kind])
+        I18n.t(name, scope: 'manage.structure.name')
       end
     end
   end

data/lib/sunrise/models/user.rb

@@ -15,10 +15,10 @@ module Sunrise
 
         has_one :avatar, as: :assetable, dependent: :destroy, autosave: true
 
-        after_initialize :set_default_role
+        before_create :set_default_role
 
         validates :name, presence: true
-        validate :check_role
+        validate :ensure_role_is_allowed
 
         scope :with_email, ->(email) { where(email: email) }
         scope :with_name, ->(name) { where(name: name) }
@@ -84,10 +84,10 @@ module Sunrise
       protected
 
       def set_default_role
-        self.role_type ||= ::RoleType.default
+        self.role_type_id ||= ::RoleType.default.id
       end
 
-      def check_role
+      def ensure_role_is_allowed
         errors.add(:role_type_id, :invalid) unless ::RoleType.legal?(role_type_id)
       end
     end

data/lib/sunrise/utils.rb

@@ -2,7 +2,6 @@
 
 module Sunrise
   module Utils
-    autoload :Transliteration, 'sunrise/utils/transliteration'
     autoload :EvalHelpers, 'sunrise/utils/eval_helpers'
     autoload :CsvDocument, 'sunrise/utils/csv_document'
     autoload :SearchWrapper, 'sunrise/utils/search_wrapper'
@@ -48,7 +47,7 @@ module Sunrise
     # Convert input to friendly slug using babosa gem
     #
     def self.normalize_friendly_id(input)
-      input.to_s.to_slug.normalize(transliterations: Sunrise::Config.transliteration).to_s
+      input.to_s.parameterize
     end
   end
 end

data/lib/sunrise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sunrise
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'.freeze
 end

data/lib/sunrise/views/search_wrapper.rb

@@ -9,7 +9,7 @@ module Sunrise
 
       def self.model_name
         @_model_name ||= begin
-          namespace = parents.detect { |n| n.respond_to?(:_railtie) }
+          namespace = module_parents.detect { |n| n.respond_to?(:_railtie) }
           ActiveModel::Name.new(self, namespace, 'search')
         end
       end

data/sunrise-cms.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = 'Sunrise is a Open Source CMS'
   s.authors = ['Igor Galeta', 'Pavlo Galeta']
   s.email = 'galeta.igor@gmail.com'
-  s.rubyforge_project = 'sunrise-cms'
   s.homepage = 'https://github.com/galetahub/sunrise'
   s.license = 'MIT'
 
@@ -26,27 +25,23 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency('kaminari')
   s.add_dependency('rails', '>= 4.0.0')
+  s.add_dependency('kaminari')
   s.add_dependency('simple_form')
-
-  s.add_dependency('babosa')
-  s.add_dependency('cancan')
-  s.add_dependency('cancan_namespace')
+  s.add_dependency('cancancan')
   s.add_dependency('carrierwave')
   s.add_dependency('galetahub-enum_field')
-  s.add_dependency('jquery-ui-rails', '>= 5.0.0')
-  s.add_dependency('meta_manager', '>= 0.2.0')
+  s.add_dependency('jquery-ui-rails')
+  s.add_dependency('meta_manager')
   s.add_dependency('mime-types')
   s.add_dependency('mini_magick')
-  s.add_dependency('page_parts', '>= 0.1.3')
-  s.add_dependency('public_activity', '>= 1.0.0')
-  s.add_dependency('rails-settings-cached', '>= 0.4.0')
+  s.add_dependency('page_parts')
+  s.add_dependency('public_activity')
+  s.add_dependency('rails-settings-cached')
   s.add_dependency('rails-uploader')
-  s.add_dependency('select2-rails')
 
   s.add_development_dependency('capybara')
   s.add_development_dependency('database_cleaner')
-  s.add_development_dependency('factory_girl_rails')
+  s.add_development_dependency('factory_bot_rails')
   s.add_development_dependency('rspec-rails')
 end

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Igor Galeta
 - Pavlo Galeta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -40,21 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: simple_form
-  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: babosa
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancan_namespace
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,28 +101,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: meta_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -185,44 +157,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: public_activity
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-settings-cached
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: rails-uploader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -236,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: select2-rails
+  name: rails-uploader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -278,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -311,8 +269,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.rdoc
@@ -321,6 +279,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/assets/images/alert.png
 - app/assets/images/cross_ico.png
 - app/assets/images/gravatar-140.png
@@ -362,6 +321,8 @@ files:
 - app/assets/images/sunrise/icons/commented.svg
 - app/assets/images/sunrise/icons/create.svg
 - app/assets/images/sunrise/icons/destroy.svg
+- app/assets/images/sunrise/icons/export.svg
+- app/assets/images/sunrise/icons/import.svg
 - app/assets/images/sunrise/icons/update.svg
 - app/assets/images/sunrise/note_pointer.png
 - app/assets/images/sunrise/page_arr_hover.png
@@ -446,6 +407,7 @@ files:
 - app/views/sunrise/manager/buttons/_delete.html.erb
 - app/views/sunrise/manager/buttons/_edit.html.erb
 - app/views/sunrise/manager/buttons/_export.html.erb
+- app/views/sunrise/manager/buttons/_import.html.erb
 - app/views/sunrise/manager/buttons/_new.html.erb
 - app/views/sunrise/manager/buttons/_sort.html.erb
 - app/views/sunrise/manager/edit.html.erb
@@ -543,7 +505,6 @@ files:
 - lib/sunrise.rb
 - lib/sunrise/abstract_model.rb
 - lib/sunrise/carrierwave/base_uploader.rb
-- lib/sunrise/carrierwave/file_size_validator.rb
 - lib/sunrise/carrierwave/glue.rb
 - lib/sunrise/config.rb
 - lib/sunrise/config/association.rb
@@ -578,7 +539,6 @@ files:
 - lib/sunrise/utils/csv_document.rb
 - lib/sunrise/utils/eval_helpers.rb
 - lib/sunrise/utils/search_wrapper.rb
-- lib/sunrise/utils/transliteration.rb
 - lib/sunrise/version.rb
 - lib/sunrise/views/date_time_input.rb
 - lib/sunrise/views/form_builder.rb
@@ -593,7 +553,7 @@ homepage: https://github.com/galetahub/sunrise
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -608,9 +568,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunrise-cms
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.5.23
+signing_key:
 specification_version: 4
 summary: Rails CMS
 test_files: []

data/.rspec

@@ -1,2 +0,0 @@
---format Fuubar 
---color

data/lib/sunrise/carrierwave/file_size_validator.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Sunrise
-  module CarrierWave
-    class FileSizeValidator < ActiveModel::EachValidator
-      MESSAGES  = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
-      CHECKS    = { is: :==, minimum: :>=, maximum: :<= }.freeze
-
-      DEFAULT_TOKENIZER = ->(value) { value.split(//) }
-      RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
-
-      def initialize(options)
-        if range = (options.delete(:in) || options.delete(:within))
-          raise ArgumentError, ':in and :within must be a Range' unless range.is_a?(Range)
-
-          options[:minimum] = range.begin
-          options[:maximum] = range.end
-          options[:maximum] -= 1 if range.exclude_end?
-        end
-
-        super
-      end
-
-      def check_validity!
-        keys = CHECKS.keys & options.keys
-
-        if keys.empty?
-          raise ArgumentError, 'Range unspecified. Specify the :within, :maximum, :minimum, or :is option.'
-        end
-
-        keys.each do |key|
-          value = options[key]
-
-          unless value.is_a?(Integer) && value >= 0
-            raise ArgumentError, ":#{key} must be a nonnegative Integer"
-          end
-        end
-      end
-
-      def validate_each(record, attribute, value)
-        unless value.is_a? ::CarrierWave::Uploader::Base
-          raise(ArgumentError, 'A CarrierWave::Uploader::Base object was expected')
-        end
-
-        value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.is_a?(String)
-
-        CHECKS.each do |key, validity_check|
-          next unless check_value = options[key]
-
-          value ||= [] if key == :maximum
-
-          value_size = value.size
-          next if value_size.send(validity_check, check_value)
-
-          errors_options = options.except(*RESERVED_OPTIONS)
-          errors_options[:file_size] = help.number_to_human_size check_value
-
-          default_message = options[MESSAGES[key]]
-          errors_options[:message] ||= default_message if default_message
-
-          record.errors.add(attribute, MESSAGES[key], errors_options)
-        end
-      end
-
-      def help
-        Helper.instance
-      end
-
-      class Helper
-        include Singleton
-        include ActionView::Helpers::NumberHelper
-      end
-    end
-  end
-end