sunrise-cms 1.0.6 → 1.1.0

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

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe PagesController do
+describe PagesController, type: :controller do
   render_views
-  
+
   before(:all) do
     @root = FactoryGirl.create(:structure_main)
   end
-    
-  context "page" do
-    before(:each) { @page = FactoryGirl.create(:structure_page, :parent => @root) }
-    
-    it "should render show action" do
-      get :show, :id => @page.slug
-      
+
+  context 'page' do
+    before(:each) { @page = FactoryGirl.create(:structure_page, parent: @root) }
+
+    it 'should render show action' do
+      get :show, id: @page.slug
+
       assigns(:structure).should == @page
-      
+
       response.should be_success
       response.should render_template('show')
     end

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

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe WelcomeController do
+describe WelcomeController, type: :controller do
   render_views
-  
+
   before(:each) do
     @root = FactoryGirl.create(:structure_main)
   end
-  
-  it "should render index action" do
+
+  it 'should render index action' do
     get :index
-    
+
     assigns(:structure).should == @root
-    
+
     response.should be_success
     response.should render_template('index')
   end

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

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 FactoryGirl.define do
-  factory :structure_page, :class => Structure do
+  factory :structure_page, class: Structure do
     title 'Structure'
     slug { FactoryGirl.generate(:slug) }
     structure_type StructureType.page
@@ -8,9 +9,9 @@ FactoryGirl.define do
     is_visible true
   end
 
-  factory :structure_main, :class => Structure do
-    title "Main page"
-    slug "main-page"
+  factory :structure_main, class: Structure do
+    title 'Main page'
+    slug 'main-page'
     structure_type StructureType.main
     position_type PositionType.default
     is_visible true

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

@@ -1,54 +1,55 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 FactoryGirl.define do
-  factory :admin_user, :class => User do |user|
+  factory :admin_user, class: User do |user|
     user.name 'Admin'
     user.email { FactoryGirl.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
-    
-    user.after(:build) do |u| 
-      u.roles.build(:role_type => RoleType.admin)
+
+    user.after(:build) do |u|
+      u.roles.build(role_type: RoleType.admin)
       u.skip_confirmation!
     end
   end
 
-  factory :redactor_user, :class => User do |user|
+  factory :redactor_user, class: User do |user|
     user.name 'Redactor'
     user.email { FactoryGirl.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
-    
-    user.after(:build) do |u| 
-      u.roles.build(:role_type => RoleType.redactor)
+
+    user.after(:build) do |u|
+      u.roles.build(role_type: RoleType.redactor)
       u.skip_confirmation!
     end
   end
 
-  factory :moderator_user, :class => User do |user|
+  factory :moderator_user, class: User do |user|
     user.name 'Redactor'
     user.email { FactoryGirl.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
-    
-    user.after(:build) do |u| 
-      u.roles.build(:role_type => RoleType.moderator)
+
+    user.after(:build) do |u|
+      u.roles.build(role_type: RoleType.moderator)
       u.skip_confirmation!
     end
   end
 
-  factory :default_user, :class => User do |user|
+  factory :default_user, class: User do |user|
     user.name 'Test'
     user.email { FactoryGirl.generate(:email) }
     user.password               'password'
     user.password_confirmation  'password'
-    
-    user.after(:build) do |u| 
-      u.roles.build(:role_type => RoleType.default)
+
+    user.after(:build) do |u|
+      u.roles.build(role_type: RoleType.default)
       u.skip_confirmation!
     end
   end
 
-  factory :user, :class => User do |user|
+  factory :user, class: User do |user|
     user.name 'Test'
     user.email { FactoryGirl.generate(:email) }
     user.password               'password'

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -16,15 +18,15 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-  
-  config.include Devise::TestHelpers, :type => :controller
-  config.extend ControllerMacros, :type => :controller
+
+  config.include Devise::TestHelpers, type: :controller
+  config.extend ControllerMacros, type: :controller
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = false
-  
+
   require 'database_cleaner'
   config.before(:suite) do
     DatabaseCleaner.strategy = :truncation

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

@@ -1,49 +1,50 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module ControllerMacros
   def login_admin
     before(:all) do
       @admin = FactoryGirl.create(:admin_user)
     end
-    
+
     before(:each) do
       sign_out :user
       sign_in @admin
     end
   end
-  
+
   def login_default
     before(:all) do
       @user = FactoryGirl.create(:default_user)
     end
-    
+
     before(:each) do
       sign_out :user
       sign_in @user
     end
   end
-  
+
   def login_redactor
     before(:all) do
       @user = FactoryGirl.create(:redactor_user)
     end
-    
+
     before(:each) do
       sign_out :user
       sign_in @user
     end
   end
-  
+
   def login_moderator
     before(:all) do
       @user = FactoryGirl.create(:moderator_user)
     end
-    
+
     before(:each) do
       sign_out :user
       sign_in @user
     end
   end
-  
+
   def user_logout
     before(:each) do
       sign_out :user

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

@@ -1,5 +1,7 @@
-class AttachmentFileUploader < Sunrise::CarrierWave::BaseUploader  
+# frozen_string_literal: true
+
+class AttachmentFileUploader < Sunrise::CarrierWave::BaseUploader
   def extension_white_list
-    %w(pdf doc docx xls xlsx ppt pptx zip rar csv)
+    %w[pdf doc docx xls xlsx ppt pptx zip rar csv]
   end
 end

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

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 class AvatarUploader < Sunrise::CarrierWave::BaseUploader
-  process :quality => 90
-  
+  process quality: 90
+  process :set_dimensions
+
   version :thumb do
-    process :resize_to_fill => [100, 100]
+    process resize_to_fill: [100, 100]
   end
-  
+
   version :small do
-    process :resize_to_fill => [32, 32]
+    process resize_to_fill: [32, 32]
   end
-  
+
   def extension_white_list
-    %w(jpg jpeg gif png)
+    %w[jpg jpeg gif png]
   end
 end

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

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 class PictureUploader < Sunrise::CarrierWave::BaseUploader
-  process :quality => 90
-  
+  process quality: 90
+  process :set_dimensions
+
   version :thumb do
-    process :resize_to_fill => [50, 50]
+    process resize_to_fill: [50, 50]
   end
 
   version :content do
-    process :resize_to_fit => [575, 500]
+    process resize_to_fit: [575, 500]
   end
-  
+
   def extension_white_list
-    %w(jpg jpeg gif png)
+    %w[jpg jpeg gif png]
   end
 end

data/lib/sunrise-cms.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'sunrise'

data/lib/sunrise.rb

@@ -1,5 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'pathname'
+require 'meta_manager'
+require 'page_parts'
+require 'public_activity'
+require 'rails-uploader'
+require 'cancan'
+
 require 'sunrise/core_ext'
 require 'sunrise/version'
 
@@ -7,7 +14,7 @@ module Sunrise
   autoload :Utils, 'sunrise/utils'
   autoload :Config, 'sunrise/config'
   autoload :AbstractModel, 'sunrise/abstract_model'
-  
+
   module Models
     autoload :Asset, 'sunrise/models/asset'
     autoload :Structure, 'sunrise/models/structure'
@@ -20,13 +27,13 @@ module Sunrise
     autoload :Ability, 'sunrise/models/ability'
     autoload :Settings, 'sunrise/models/settings'
   end
-  
+
   module CarrierWave
     autoload :Glue, 'sunrise/carrierwave/glue'
     autoload :BaseUploader, 'sunrise/carrierwave/base_uploader'
     autoload :FileSizeValidator, 'sunrise/carrierwave/file_size_validator'
   end
-  
+
   module Views
     autoload :FormBuilder, 'sunrise/views/form_builder'
     autoload :SearchWrapper, 'sunrise/views/search_wrapper'
@@ -39,17 +46,17 @@ module Sunrise
       autoload :Mongoid, 'sunrise/hooks/adapters/mongoid'
     end
   end
-  
+
   # Regexp machers for context-based russian month names and day names translation
-  LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%[-\d]?d|%e)(.*)(%b)/
-  LOCALIZE_MONTH_NAMES_MATCH = /(%[-\d]?d|%e)(.*)(%B)/
-  LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH = /^%a/
-  LOCALIZE_STANDALONE_DAY_NAMES_MATCH = /^%A/
-  
+  LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%[-\d]?d|%e)(.*)(%b)/.freeze
+  LOCALIZE_MONTH_NAMES_MATCH = /(%[-\d]?d|%e)(.*)(%B)/.freeze
+  LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH = /^%a/.freeze
+  LOCALIZE_STANDALONE_DAY_NAMES_MATCH = /^%A/.freeze
+
   def self.root_path
-    @root_path ||= Pathname.new(File.dirname(File.expand_path('../', __FILE__)))
+    @root_path ||= Pathname.new(File.dirname(File.expand_path(__dir__)))
   end
-  
+
   def self.setup
     yield Config
   end
@@ -58,7 +65,7 @@ module Sunrise
     if defined?(Mongoid::Document)
       PublicActivity::Activity.desc(:created_at)
     else
-      PublicActivity::Activity.order("created_at DESC")
+      PublicActivity::Activity.order('created_at DESC')
     end
   end
 end

data/lib/sunrise/abstract_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sunrise/config/model'
 require 'ostruct'
 
@@ -6,7 +8,6 @@ module Sunrise
     extend ::ActiveModel::Callbacks
 
     class << self
-      
       # Gets the resource_name
       def resource_name
         # Not using superclass_delegating_reader. See +site+ for explanation
@@ -16,24 +17,22 @@ module Sunrise
           superclass.proxy.dup.freeze
         end
       end
-      
+
       # Set resource_name
-      def resource_name=(name)
-        @resource_name = name
-      end
-      
+      attr_writer :resource_name
+
       def config
         @config ||= Config::Model.new(self)
       end
-      
+
       def model
         @model ||= Utils.lookup(resource_name.to_s.camelize)
       end
-      
+
       def abstract_class?
         defined?(@abstract_class) && @abstract_class == true
       end
-      
+
       # Act as a proxy for the section configurations that actually
       # store the configurations.
       def method_missing(m, *args, &block)
@@ -44,15 +43,15 @@ module Sunrise
         end
       end
     end
-    
+
     attr_accessor :model_name, :current_list, :sort_column, :available_list_view
-        
-    delegate :config, :model, :to => 'self.class'
-    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]
-    
+    delegate :config, :model, to: 'self.class'
+    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]
+
     def initialize(params = {})
       @model_name = model.model_name
       @current_list = config.default_index_view
@@ -65,60 +64,59 @@ module Sunrise
     def model_params
       @request_params[param_key.to_sym] || {}
     end
-    
+
     # Save current list view
     def current_list=(value)
-      if value && @available_index_views.include?(value.to_sym)
-        @current_list = value.to_sym
-      end
+      @current_list = value.to_sym if value && @available_index_views.include?(value.to_sym)
     end
-    
+
     # Load association record
     def parent_record
       @parent_record ||= find_parent_record
     end
-    
+
     # Convert parent id and class name into hash
     def parent_hash
-      @parent_hash ||= { :parent_id => parent_record.id, :parent_type => parent_record.class.name.underscore } if parent_record
+      if parent_record
+        @parent_hash ||= { parent_id: parent_record.id, parent_type: parent_record.class.name.underscore }
+      end
       @parent_hash ||= {}
     end
-    
+
     # Get current list settings
     def list
       return false if without_index?
+
       config.index(current_list)
     end
-    
+
     # Is index config disabled
     def without_index?
       config.index === false
     end
-    
+
     def search_available?
       list && !list.groups[:search].nil?
     end
-    
+
     def sort_available?
       list && !list.groups[:sort].nil?
     end
-    
+
     def sort_fields
-      @sort_fields ||= list.groups[:sort].fields.inject([]) do |items, field|
+      @sort_fields ||= list.groups[:sort].fields.each_with_object([]) do |field, items|
         [:desc, :asc].each do |direction|
           name = [field.name, direction].join('_')
-          items << OpenStruct.new(:name => I18n.t(name, :scope => [:manage, :sort_columns]), :value => name)
+          items << OpenStruct.new(name: I18n.t(name, scope: [:manage, :sort_columns]), value: name)
         end
-        
-        items
       end
     end
-    
+
     def update_sort(params)
       run_callbacks :sort do
-        if !params[:ids].blank?
+        if params[:ids].present?
           update_sort_column(params[:ids])
-        elsif !params[:tree].blank?
+        elsif params[:tree].present?
           update_sort_tree(params[:tree])
         end
       end
@@ -128,31 +126,31 @@ module Sunrise
       return if params[:ids].blank?
 
       run_callbacks :mass_destroy do
-        model.where(:id => params[:ids]).destroy_all
+        model.where(id: params[:ids]).destroy_all
       end
     end
-    
+
     # Update nested tree
     # {"id"=>{"parent_id"=>"root", "depth"=>"0", "left"=>"1", "right"=>"22"}
     #
     def update_sort_tree(ids)
       return nil if ids.empty?
-      
+
       ids.each do |key, value|
-        hash = { :parent_id => nil, :depth => value[:depth], :lft => value[:left], :rgt => value[:right] }
-        hash[:parent_id] = value[:parent_id] unless value[:parent_id] == "root"
-        model.where(:id => key).update_all(hash)
+        hash = { parent_id: nil, depth: value[:depth], lft: value[:left], rgt: value[:right] }
+        hash[:parent_id] = value[:parent_id] unless value[:parent_id] == 'root'
+        model.where(id: key).update_all(hash)
       end
     end
-    
+
     def update_sort_column(ids)
       return nil if ids.empty?
 
-      ids.each do |key, value| 
-        model.where(:id => key).update_all(@sort_column => value)
+      ids.each do |key, value|
+        model.where(id: key).update_all(@sort_column => value)
       end
     end
-    
+
     # Initialize new model, sets parent record and call build_defaults method
     def build_record
       record = model.new
@@ -160,12 +158,13 @@ module Sunrise
       record.build_defaults if record.respond_to?(:build_defaults)
       record
     end
-    
+
     # Convert request params to model scopes
     def apply_scopes(params = nil, pagination = true)
-      raise ::AbstractController::ActionNotFound.new("List config is turn off") if without_index?
+      raise ::AbstractController::ActionNotFound, 'List config is turn off' if without_index?
+
       params ||= @request_params
-      
+
       scope = default_scope(params)
 
       if current_list == :tree
@@ -176,61 +175,61 @@ module Sunrise
 
       scope
     end
-    
+
     # Apply default scopes: sort, search and association.
     def default_scope(params = nil)
       params ||= @request_params
-      
-      scope = model.sunrise_search(params[:search]) if model.respond_to?(:sunrise_search) && !params[:search].blank?
+
+      if model.respond_to?(:sunrise_search) && params[:search].present?
+        scope = model.sunrise_search(params[:search])
+      end
       scope ||= model.where(nil)
-      
+
       scope = scope.merge(association_scope) unless parent_record.nil?
-      scope = scope.merge(sort_scope(params[:sort])) unless params[:sort].blank?
+      scope = scope.merge(sort_scope(params[:sort])) if params[:sort].present?
       scope = scope.merge(list.scope) unless list.scope.nil?
-      
+
       scope
     end
-    
+
     def association_scope
-      if parent_record
-        parent_record.send(parent_association.relation_name)
-      end
+      parent_record&.send(parent_association.relation_name)
     end
-    
+
     def page_scope(scope, page = 1, per_page = nil)
       page = 1 if page.blank? || page.to_i <= 0
       per_page ||= list.items_per_page
-      
+
       scope.page(page).per(per_page)
     end
-    
+
     def sort_scope(options = nil)
       options = Utils.sort_to_hash(options) if options.is_a?(String)
-      options = { :column => list.sort_column, :mode => list.sort_mode }.merge(options || {})
-      
+      options = { column: list.sort_column, mode: list.sort_mode }.merge(options || {})
+
       options[:column] = list.sort_column if options[:column].blank?
       options[:mode] = list.sort_mode     if options[:mode].blank?
-      
+
       model.order([options[:column], options[:mode]].join(' '))
     end
-    
+
     # List of columns names to be exported
     def export_columns
       @export_columns ||= (config.export ? config.export.fields.map(&:name) : model.column_names)
     end
-    
+
     # Filename for export data
     def export_filename
-      @export_filename ||= [plural, Time.now.strftime("%Y-%m-%d_%Hh%Mm%S")].join('_')
+      @export_filename ||= [plural, Time.zone.now.strftime('%Y-%m-%d_%Hh%Mm%S')].join('_')
     end
 
     def export_options
-      { 
-        :filename => export_filename,
-        :columns => export_columns 
+      {
+        filename: export_filename,
+        columns: export_columns
       }
     end
-    
+
     def form_fields
       config.form.fields || []
     end
@@ -239,9 +238,9 @@ module Sunrise
       value = config.form.permited_attributes
 
       attrs = case value
-      when Proc then value.call(user)
-      when String then value.to_sym
-      else value
+              when Proc then value.call(user)
+              when String then value.to_sym
+              else value
       end
 
       if attrs == :all
@@ -251,54 +250,52 @@ module Sunrise
         params.require(param_key).permit(*attrs)
       end
     end
-    
+
     # Has translated columns
     def translate?
-      !config.form.groups[:translate].blank?
+      config.form.groups[:translate].present?
     end
-    
+
     # Files to translate
     def translate_fields
       config.form.groups[:translate].try(:fields) || []
     end
-    
+
     # Find sidebar groups
     def sidebar_groups
       @sidebar_groups ||= config.form.groups.values.select { |v| v.sidebar? }
     end
-    
+
     # Check if sidebar groups exists
     def sidebar_groups?
       !sidebar_groups.empty?
     end
-    
+
     # Find bottom groups
     def bottom_groups
       @bottom_groups ||= config.form.groups.values.select { |v| v.bottom? }
     end
-    
+
     protected
-      
-      # Try to find parent object if any association present
-      def find_parent_record
-        if parent_present? && parent_valid?
-          parent_association.model.find(@request_params[:parent_id])
-        end
-      end
-      
-      # Find related association in model config
-      def parent_association
-        @parent_association ||= config.associations.detect { |relation| relation.is_this?(@request_params[:parent_type]) }
-      end
-      
-      # Parent association exists
-      def parent_valid?
-        !parent_association.nil?
-      end
-      
-      # Check parent record in request params
-      def parent_present?
-        !(@request_params[:parent_id].blank? || @request_params[:parent_type].blank?)
-      end
+
+    # Try to find parent object if any association present
+    def find_parent_record
+      parent_association.model.find(@request_params[:parent_id]) if parent_present? && parent_valid?
+    end
+
+    # Find related association in model config
+    def parent_association
+      @parent_association ||= config.associations.detect { |relation| relation.is_this?(@request_params[:parent_type]) }
+    end
+
+    # Parent association exists
+    def parent_valid?
+      !parent_association.nil?
+    end
+
+    # Check parent record in request params
+    def parent_present?
+      !(@request_params[:parent_id].blank? || @request_params[:parent_type].blank?)
+    end
   end
 end