sunrise-cms 1.0.6 → 1.1.0

data/app/controllers/sunrise/settings_controller.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Sunrise
   class SettingsController < Sunrise::ApplicationController
-    authorize_resource :class => false
-    
+    authorize_resource class: false
+
     def edit
       @settings = Settings.get_all
       respond_with(@settings)
     end
-    
+
     def update
       Settings.update_attributes(params[:settings])
       redirect_to root_path

data/app/helpers/sunrise/activities_helper.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Sunrise
   module ActivitiesHelper
-
     # For generating time tags calculated using jquery.timeago
     def timeago_tag(time, options = {})
-      options[:class] ||= "timeago"
-      content_tag(:abbr, time.to_s, options.merge(:title => time.getutc.iso8601)) if time
+      options[:class] ||= 'timeago'
+      content_tag(:abbr, time.to_s, options.merge(title: time.getutc.iso8601)) if time
     end
 
     def activity_icon_tag(key, options = {})
@@ -12,8 +13,8 @@ module Sunrise
       image = image_path("sunrise/icons/#{icon}.svg")
 
       options = {
-        :class => "mega-icon",
-        :style => "background-image: url(#{image});"
+        class: 'mega-icon',
+        style: "background-image: url(#{image});"
       }.merge(options)
 
       content_tag(:div, nil, options)
@@ -27,10 +28,10 @@ module Sunrise
       model_name = object_type.downcase
 
       if object
-        link_to(model_name, edit_path(:model_name => model_name.pluralize, :id => object.id))
+        link_to(model_name, edit_path(model_name: model_name.pluralize, id: object.id))
       else
         "a #{model_name} which does not exist anymore"
       end
     end
   end
-end
+end

data/app/helpers/sunrise/application_helper.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 module Sunrise
   module ApplicationHelper
     def manage_icon(image, options = {})
-      options = { :alt => t(image, :scope => 'manage.icons'), :title => t(image, :scope => 'manage.icons') }.merge(options)
+      options = { alt: t(image, scope: 'manage.icons'), title: t(image, scope: 'manage.icons') }.merge(options)
       image_tag("sunrise/ico_#{image}.gif", options)
     end
-    
-    def manage_render_header(options={})
+
+    def manage_render_header(options = {})
       action = controller.action_name
       action = 'new' if action == 'create'
       action = 'edit' if action == 'update'
-    
+
       partials = options[:partials] || []
       partials << "sunrise/#{controller.controller_name}/header_#{action}"
       partials << "sunrise/#{controller.controller_name}/header"
-      partials << "sunrise/shared/header"
-      
+      partials << 'sunrise/shared/header'
+
       partials.each do |pname|
-        return render(:partial => pname) if lookup_context.exists?(pname, [], true)
+        return render(partial: pname) if lookup_context.exists?(pname, [], true)
       end
-      
-      return ''
+
+      ''
     end
   end
 end

data/app/helpers/sunrise/dashboard_helper.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Sunrise
   module DashboardHelper
   end
-end
+end

data/app/helpers/sunrise/manager_helper.rb

@@ -1,29 +1,30 @@
+# frozen_string_literal: true
+
 module Sunrise
   module ManagerHelper
-    
     def manage_form_for(object, *args, &block)
       options = args.extract_options!
-      
+
       options[:builder] ||= Sunrise::Views::FormBuilder
-      options[:url] ||= (object.new_record? ? new_path : edit_path(:id => object.id))
-      
+      options[:url] ||= (object.new_record? ? new_path : edit_path(id: object.id))
+
       simple_form_for(object, *(args << options), &block)
     end
-    
-    def manage_date_tag(datetime, options={})
-      options = {:hide_time => datetime.is_a?(Date) }.merge(options)
+
+    def manage_date_tag(datetime, options = {})
+      options = { hide_time: datetime.is_a?(Date) }.merge(options)
       tags = []
-      
-      tags << content_tag(:div, datetime.strftime("%d.%m.%Y"), :class => 'date')
-      tags << content_tag(:div, datetime.strftime("%H:%M"), :class => 'time') unless options[:hide_time]
-      
-      content_tag(:div, tags.join.html_safe, :class => 'date-time')
+
+      tags << content_tag(:div, datetime.strftime('%d.%m.%Y'), class: 'date')
+      tags << content_tag(:div, datetime.strftime('%H:%M'), class: 'time') unless options[:hide_time]
+
+      content_tag(:div, tags.join.html_safe, class: 'date-time')
     end
-    
+
     def manage_render_field(field, record)
       item = record.send(field.name)
-      
-      if [Date, DateTime, Time].detect{|klass| item.is_a?(klass)}
+
+      if [Date, DateTime, Time].detect { |klass| item.is_a?(klass) }
         manage_date_tag(item)
       elsif item.is_a?(String)
         item =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i ? mail_to(item) : item
@@ -33,32 +34,32 @@ module Sunrise
     end
 
     def manage_remove_child_link(name, form, options = {})
-      options[:onclick] = h("sunrise.remove_fields(this);")
-      form.hidden_field(:_destroy) + link_to(name, "javascript:void(0);", options)
+      options[:onclick] = h('sunrise.remove_fields(this);')
+      form.hidden_field(:_destroy) + link_to(name, 'javascript:void(0);', options)
     end
 
-    def manage_add_child_link(name, form, field, options={})
+    def manage_add_child_link(name, form, field, options = {})
       options.symbolize_keys!
-      
+
       method = field.name.to_sym
       html_options = (options.delete(:html) || {})
       fields = manage_new_child_fields(form, field, options)
-      
-      html_options[:class] ||= "button"
+
+      html_options[:class] ||= 'button'
       html_options[:onclick] = h("sunrise.insert_fields(this, \"#{method}\", \"#{escape_javascript(fields)}\");")
-      
-      link_to(name, "javascript:void(0);", html_options)
+
+      link_to(name, 'javascript:void(0);', html_options)
     end
-    
+
     def manage_new_child_fields(form_builder, field, options = {})
       method = field.name.to_sym
 
       options[:object] ||= form_builder.object.class.reflect_on_association(method).klass.new
       options[:partial] ||= method.to_s.singularize
       options[:form_builder_local] ||= :form
-      
-      form_builder.fields_for(method, options[:object], :child_index => "new_#{method}") do |f|
-        render(:partial => options[:partial], :locals => { options[:form_builder_local] => f, :field => field })
+
+      form_builder.fields_for(method, options[:object], child_index: "new_#{method}") do |f|
+        render(partial: options[:partial], locals: { options[:form_builder_local] => f, :field => field })
       end
     end
   end

data/app/helpers/sunrise/structure_helper.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module Sunrise
   module StructureHelper
     def manage_structure_path(record, options = {})
-      return "#" if record.nil?
-      options = {:parent_id => record.id, :parent_type => 'Structure'}.merge(options)
-      
+      return '#' if record.nil?
+
+      options = { parent_id: record.id, parent_type: 'Structure' }.merge(options)
+
       case record.structure_type.kind
-      when :page then edit_path(:model_name => "pages", :id => record.id)
-      when :posts then index_path(options.merge({:model_name => record.structure_type.kind}))
-      else edit_path(:model_name => "structures", :id => record.id)
+      when :page then edit_path(model_name: 'pages', id: record.id)
+      when :posts then index_path(options.merge(model_name: record.structure_type.kind))
+      else edit_path(model_name: 'structures', id: record.id)
       end
     end
 
@@ -15,8 +18,8 @@ module Sunrise
       model_name = abstract_model.plural
 
       case model_name
-      when :some_collection then index_path(:model_name => :stores, :parent_type => :some_collection, :parent_id => record.id)
-      else show_path(:id => record.id)
+      when :some_collection then index_path(model_name: :stores, parent_type: :some_collection, parent_id: record.id)
+      else show_path(id: record.id)
       end
     end
   end

data/config/locales/defaults/datetime.rb

@@ -1,28 +1,28 @@
-# -*- encoding: utf-8 -*- 
+# frozen_string_literal: true
 
 date_hash = {
-  :abbr_day_names => lambda { |key, options|
+  abbr_day_names: lambda { |_key, options|
     if options[:format] && options[:format] =~ Sunrise::LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH
       :'date.common_abbr_day_names'
     else
       :'date.standalone_abbr_day_names'
     end
   },
-  :day_names => lambda { |key, options|
+  day_names: lambda { |_key, options|
     if options[:format] && options[:format] =~ Sunrise::LOCALIZE_STANDALONE_DAY_NAMES_MATCH
       :'date.standalone_day_names'
     else
       :'date.common_day_names'
     end
   },
-  :abbr_month_names => lambda { |key, options|
+  abbr_month_names: lambda { |_key, options|
     if options[:format] && options[:format] =~ Sunrise::LOCALIZE_ABBR_MONTH_NAMES_MATCH
       :'date.common_abbr_month_names'
     else
       :'date.standalone_abbr_month_names'
     end
   },
-  :month_names => lambda { |key, options|
+  month_names: lambda { |_key, options|
     if options[:format] && options[:format] =~ Sunrise::LOCALIZE_MONTH_NAMES_MATCH
       :'date.common_month_names'
     else
@@ -35,6 +35,6 @@ date_hash = {
 #
 # Названия месяцев и дней недели в зависимости от контекста ("1 декабря", но "Декабрь 1985")
 {
-  :uk => { :date => date_hash },
-  :ru => { :date => date_hash }
+  uk: { date: date_hash },
+  ru: { date: date_hash }
 }

data/config/locales/defaults/pluralize.rb

@@ -1,6 +1,8 @@
-proc = lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other }
+# frozen_string_literal: true
+
+proc = ->(n) { n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other }
 
 {
-  :ru => {:i18n => {:plural => { :rule => proc, :keys => [:one, :few, :many, :other]}}},
-  :uk => {:i18n => {:plural => { :rule => proc, :keys => [:one, :few, :many, :other]}}}
+  ru: { i18n: { plural: { rule: proc, keys: [:one, :few, :many, :other] } } },
+  uk: { i18n: { plural: { rule: proc, keys: [:one, :few, :many, :other] } } }
 }

data/config/routes.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 Sunrise::Engine.routes.draw do
   root Sunrise::Config.root_route_options
-  
-  get "/activities/p/:page", to: "activities#index", page: /\d+/
-  get "/dashboard", to: "dashboard#index", as: :dashboard
-  
+
+  get '/activities/p/:page', to: 'activities#index', page: /\d+/
+  get '/dashboard', to: 'dashboard#index', as: :dashboard
+
   resource :settings, only: [:edit, :update]
   resources :activities, only: [:index]
-  
-  controller "manager" do
-    scope ":model_name" do
-      get "/", to: :index, as: :index
-      get "/export.:format", to: :export, as: :export
-      post "/sort", to: :sort, as: :sort
-      get "/new", to: :new, as: :new
-      post "/new", to: :create, as: :create
-      delete "/mass_destroy", to: :mass_destroy, as: :mass_destroy
-      
-      scope ":id" do
-        get "/", to: :show, as: :show
-        get "/edit", to: :edit, as: :edit
-        patch "/edit", to: :update, as: :update
-        get "/delete", to: :delete, as: :delete
-        delete "/delete", to: :destroy, as: :destroy
+
+  controller 'manager' do
+    scope ':model_name' do
+      get '/', action: :index, as: :index
+      get '/export.:format', action: :export, as: :export
+      post '/sort', action: :sort, as: :sort
+      get '/new', action: :new, as: :new
+      post '/new', action: :create, as: :create
+      delete '/mass_destroy', action: :mass_destroy, as: :mass_destroy
+
+      scope ':id' do
+        get '/', action: :show, as: :show
+        get '/edit', action: :edit, as: :edit
+        patch '/edit', action: :update, as: :update
+        get '/delete', action: :delete, as: :delete
+        delete '/delete', action: :destroy, as: :destroy
       end
     end
   end

data/db/migrate/20111216144515_create_assets.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 class CreateAssets < ActiveRecord::Migration
   def self.up
     create_table :assets do |t|
-      t.string  :data_file_name, :null => false
+      t.string  :data_file_name, null: false
       t.string  :data_content_type
       t.integer :data_file_size
 
-      t.integer :assetable_id, :null => false
-      t.string  :assetable_type, :limit => 30, :null => false
-      t.string  :type, :limit => 30
+      t.integer :assetable_id, null: false
+      t.string  :assetable_type, limit: 30, null: false
+      t.string  :type, limit: 30
 
-      t.string  :guid, :limit => 20
-      t.string  :public_token, :limit => 20
+      t.string  :guid, limit: 20
+      t.string  :public_token, limit: 20
 
       t.integer :user_id
-      t.integer :sort_order, :default => 0
+      t.integer :sort_order, default: 0
       t.integer :width
       t.integer :height
 

data/db/migrate/20111216144915_create_structures.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 class CreateStructures < ActiveRecord::Migration
   def self.up
     create_table :structures do |t|
-      t.string    :title, :null => false
-      t.string    :slug, :null => false, :limit => 25
-      t.integer   :structure_type_id, :limit => 1, :default => 0
-      t.integer   :position_type_id, :limit => 2, :default => 0
-      t.boolean   :is_visible, :default => true
+      t.string    :title, null: false
+      t.string    :slug, null: false, limit: 25
+      t.integer   :structure_type_id, limit: 1, default: 0
+      t.integer   :position_type_id, limit: 2, default: 0
+      t.boolean   :is_visible, default: true
       t.string    :redirect_url
-      
-      t.integer  "parent_id"
-      t.integer  "lft",                          :default => 0
-      t.integer  "rgt",                          :default => 0
-      t.integer  "depth",                        :default => 0
-      
+
+      t.integer  'parent_id'
+      t.integer  'lft',                          default: 0
+      t.integer  'rgt',                          default: 0
+      t.integer  'depth',                        default: 0
+
       t.timestamps
     end
-    
+
     add_index :structures, :structure_type_id
     add_index :structures, :position_type_id
     add_index :structures, :parent_id

data/db/migrate/20111216145015_create_users.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table(:users) do |t|
-      t.string :name, :null => false, :default => "", :limit => 150
-      
+      t.string :name, null: false, default: '', limit: 150
+
       ## Database authenticatable
-      t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
-  
+      t.string :email,              null: false, default: ''
+      t.string :encrypted_password, null: false, default: ''
+
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
-  
+
       ## Rememberable
       t.datetime :remember_created_at
-      
+
       ## Trackable
-      t.integer  :sign_in_count, :default => 0
+      t.integer  :sign_in_count, default: 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -26,17 +28,17 @@ class CreateUsers < ActiveRecord::Migration
       t.datetime :confirmed_at
       t.datetime :confirmation_sent_at
       # t.string   :unconfirmed_email # Only if using reconfirmable
-  
+
       ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.integer  :failed_attempts, default: 0 # Only if lock strategy is :failed_attempts
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
-      
+
       ## Encryptable
       t.string :password_salt
 
-      t.integer :role_type_id, :limit => 1, :default => 1
-      
+      t.integer :role_type_id, limit: 1, default: 1
+
       # Token authenticatable
       # t.string :authentication_token
 
@@ -45,11 +47,11 @@ class CreateUsers < ActiveRecord::Migration
 
       t.timestamps
     end
-    
-    add_index :users, :email,                :unique => true
-    add_index :users, :reset_password_token, :unique => true
-    add_index :users, :confirmation_token,   :unique => true
-    add_index :users, :unlock_token,         :unique => true    
+
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    add_index :users, :confirmation_token,   unique: true
+    add_index :users, :unlock_token,         unique: true
     add_index :users, :role_type_id
   end