sunrise-cms 1.0.6 → 1.1.0

data/lib/sunrise/config/page_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Config
     # A simple object that gets used to present different aspects of views
@@ -20,7 +22,8 @@ module Sunrise
       delegate :has_key?, to: :options
 
       def initialize(options = {}, &block)
-        @options, @block = options, block
+        @options = options
+        @block = block
       end
 
       def [](key)
@@ -28,4 +31,4 @@ module Sunrise
       end
     end
   end
-end
+end

data/lib/sunrise/config/show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sunrise/config/base'
 require 'sunrise/config/has_fields'
 

data/lib/sunrise/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
   require "sunrise/core_ext/#{File.basename(path, '.rb')}"
 end

data/lib/sunrise/core_ext/i18n.rb

@@ -1,21 +1,21 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module I18n
   def self.name_for_locale(locale)
-    begin
-      I18n.backend.translate(locale, :name, :scope => [:language])
-    rescue I18n::MissingTranslationData
-      locale.to_s
-    end
+    I18n.backend.translate(locale, :name, scope: [:language])
+  rescue I18n::MissingTranslationData
+    locale.to_s
   end
-  
+
   def self.all_available_locales
     records = []
-    
+
     available_locales.each do |locale|
-      records << OpenStruct.new(:code => locale.to_s.downcase, :title => name_for_locale(locale))
+      records << OpenStruct.new(code: locale.to_s.downcase, title: name_for_locale(locale))
     end
-    
+
     records.sort_by(&:title)
   end
 end

data/lib/sunrise/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/inflector/inflections'
 
 class String
@@ -7,6 +9,6 @@ class String
   end
 
   def self.randomize(length = 8)
-    Array.new(length) { (rand(122-97) + 97).chr }.join
+    Array.new(length) { (rand(122 - 97) + 97).chr }.join
   end
-end
+end

data/lib/sunrise/engine.rb

@@ -1,34 +1,34 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'sunrise'
 
 module Sunrise
   class Engine < ::Rails::Engine
-    engine_name "sunrise"
+    engine_name 'sunrise'
     isolate_namespace Sunrise
-    
+
     config.i18n.load_path += Dir[Sunrise.root_path.join('config/locales/**', '*.{rb,yml}')]
-    
-    initializer "sunrise.setup" do
-      I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-      I18n::Backend::Simple.send(:include, I18n::Backend::Transliterator)
-      
+
+    initializer 'sunrise.setup' do
+      I18n::Backend::Simple.include I18n::Backend::Pluralization
+      I18n::Backend::Simple.include I18n::Backend::Transliterator
+
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send :include, Sunrise::CarrierWave::Glue
+        ActiveRecord::Base.include Sunrise::CarrierWave::Glue
       end
-      
+
       ActiveSupport.on_load :action_view do
-        ActionView::Base.send :include, Sunrise::Views::Helper
+        ActionView::Base.include Sunrise::Views::Helper
       end
 
-      if defined?(Mongoid::Document)
-        Mongoid::Criteria.send :include, Sunrise::Hooks::Adapters::Mongoid
-      end
+      Mongoid::Criteria.include Sunrise::Hooks::Adapters::Mongoid if defined?(Mongoid::Document)
     end
-    
-    initializer "sunrise.csv_renderer" do
+
+    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, type: Mime::CSV, disposition: 'attachment')
       end
     end
   end

data/lib/sunrise/hooks/adapters/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Hooks
     module Adapters
@@ -8,4 +10,4 @@ module Sunrise
       end
     end
   end
-end
+end

data/lib/sunrise/hooks/adapters/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Hooks
     module Adapters
@@ -10,7 +12,7 @@ module Sunrise
           only(*args)
         end
 
-        def find_each(*args)
+        def find_each(*_args)
           each do |record|
             yield record
           end
@@ -22,4 +24,4 @@ module Sunrise
       end
     end
   end
-end
+end

data/lib/sunrise/models/ability.rb

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
+
 require 'cancan_namespace'
 
 module Sunrise
   module Models
     class Ability
       include CanCanNamespace::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
         else
           guest
         end
       end
-      
+
       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
 
         # 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
       end
     end
   end

data/lib/sunrise/models/asset.rb

@@ -1,96 +1,98 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Models
     module Asset
       extend ActiveSupport::Concern
-      
+
       included do
         belongs_to :user
-        belongs_to :assetable, :polymorphic => true
-        
+        belongs_to :assetable, polymorphic: true
+
         # Store options for image manipulation
         attr_reader :cropper_geometry, :rotate_degrees
-        
+
         before_save :reprocess
-        
-        delegate :url, :original_filename, :to => :data
+
+        delegate :url, :original_filename, to: :data
       end
-      
+
       module ClassMethods
         def move_to(index, id)
-          update_all(["sort_order = ?", index], ["id = ?", id.to_i])
+          update_all(['sort_order = ?', index], ['id = ?', id.to_i])
         end
       end
-        
+
       def thumb_url
         data.thumb.url
       end
-      
+
       def filename
-        data_file_name        
+        data_file_name
       end
-      
+
       def size
         data_file_size
       end
-      
+
       def content_type
         data_content_type
       end
-      
+
       def format_created_at
-        I18n.l(created_at, :format => "%d.%m.%Y %H:%M")
+        I18n.l(created_at, format: '%d.%m.%Y %H:%M')
       end
-      
+
       def to_xml(options = {}, &block)
-        options = {:only => [:id], :root => 'asset'}.merge(options)
-        
-        options[:procs] ||= Proc.new do |options, record| 
+        options = { only: [:id], root: 'asset' }.merge(options)
+
+        options[:procs] ||= proc do |options, _record|
           options[:builder].tag!('filename', filename)
           options[:builder].tag!('path', url)
           options[:builder].tag!('size', data_file_size)
         end
-        
+
         super
       end
-      
+
       def as_json(options = nil)
         options = {
-          :root => "asset",
-          :only => [:id, :guid, :assetable_id, :assetable_type, :user_id, :public_token], 
-          :methods => [:filename, :url, :thumb_url, :size, :content_type]
+          root: 'asset',
+          only: [:id, :guid, :assetable_id, :assetable_type, :user_id, :public_token],
+          methods: [:filename, :url, :thumb_url, :size, :content_type]
         }.merge(options || {})
-        
+
         super(options)
       end
-      
+
       def has_dimensions?
         respond_to?(:width) && respond_to?(:height)
       end
-      
+
       def image?
         Sunrise::Utils::IMAGE_TYPES.include?(data_content_type)
       end
-      
+
       def cropper_geometry=(value)
         geometry = (value || '').to_s.split(',')
-        
+
         unless geometry.map(&:blank?).any?
           @cropper_geometry_changed = true
           @cropper_geometry = geometry
         end
       end
-      
+
       def cropper_geometry_changed?
         @cropper_geometry_changed === true
       end
-      
+
       def rotate_degrees=(value)
-        unless value.blank?
+        if value.present?
           @rotate_degrees_changed = true
           @rotate_degrees = value.to_s
         end
       end
-      
+
       def rotate_degrees_changed?
         @rotate_degrees_changed === true
       end
@@ -102,14 +104,14 @@ module Sunrise
       def uploader_create(params, request = nil)
         if uploader_can?(:create, request)
           self.user_id = uploader_user(request).try(:id)
-          params[:assetable_type] = "Noname" if params[:assetable_type].blank?
+          params[:assetable_type] = 'Noname' if params[:assetable_type].blank?
           params[:assetable_id] = 0 if params[:assetable_id].blank?
           super
         else
           errors.add(:id, :access_denied)
         end
       end
-      
+
       def uploader_destroy(params, request = nil)
         if uploader_can?(:delete, request)
           super
@@ -117,19 +119,17 @@ module Sunrise
           errors.add(:id, :access_denied)
         end
       end
-      
+
       def uploader_can?(action, request)
         ability = ::Ability.new(uploader_user(request))
         ability.can? action.to_sym, self
       end
-      
+
       protected
-      
-        def reprocess
-          if cropper_geometry_changed? || rotate_degrees_changed?
-            data.cache_stored_file!
-          end
-        end
+
+      def reprocess
+        data.cache_stored_file! if cropper_geometry_changed? || rotate_degrees_changed?
+      end
     end
   end
 end

data/lib/sunrise/models/position_type.rb

@@ -1,18 +1,19 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Sunrise
   module Models
     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])
-      end  
+        I18n.t(@code, scope: [:manage, :structure, :position])
+      end
     end
   end
 end

data/lib/sunrise/models/role_type.rb

@@ -1,22 +1,23 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Sunrise
   module Models
     class RoleType
       include EnumField::DefineEnum
-      
+
       attr_reader :code
-      
+
       def initialize(code)
         @code = code.to_sym
       end
-      
+
       def title
-        I18n.t(@code, :scope => [:manage, :role, :kind])
+        I18n.t(@code, scope: [:manage, :role, :kind])
       end
-      
+
       def self.legal?(value)
         all.map(&:id).include?(value)
-      end  
+      end
     end
   end
 end

data/lib/sunrise/models/structure.rb

@@ -1,70 +1,69 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'enum_field'
 
 module Sunrise
   module Models
     module Structure
       extend ActiveSupport::Concern
-      
+
       included do
         extend EnumField::EnumeratedAttribute
 
         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
-        
+
         acts_as_nested_set
 
         before_validation :generate_slug, if: :should_generate_new_slug?
-        
-        scope :visible, lambda { where(is_visible: true) }
-        scope :with_type, lambda {|structure_type| where(structure_type_id: structure_type.id) }
-        scope :with_depth, lambda {|level| where(depth: level.to_i) }
-        scope :with_position, lambda {|position_type| where(position_type_id: position_type.id) }
+
+        scope :visible, -> { where(is_visible: true) }
+        scope :with_type, ->(structure_type) { where(structure_type_id: structure_type.id) }
+        scope :with_depth, ->(level) { where(depth: level.to_i) }
+        scope :with_position, ->(position_type) { where(position_type_id: position_type.id) }
       end
-      
+
       module ClassMethods
         def nested_set_options(mover = nil)
           result = []
-          
+
           roots.each do |root|
             result += root.self_and_descendants.map do |i|
-              if mover.nil? || mover.new_record? || mover.move_possible?(i)
-                [yield(i), i.id]
-              end
+              [yield(i), i.id] if mover.nil? || mover.new_record? || mover.move_possible?(i)
             end.compact
           end
           result
         end
       end
-      
+
       def moveable?
         new_record? || !root?
       end
-      
+
       def descendants_count
         (right - left - 1) / 2
       end
 
       protected
 
-        def generate_slug
-          self.slug = Sunrise::Utils.normalize_friendly_id(title)
-        end
+      def generate_slug
+        self.slug = Sunrise::Utils.normalize_friendly_id(title)
+      end
 
-        def should_generate_new_slug?
-          base = self.title
-          slug_value = self.slug
+      def should_generate_new_slug?
+        base = title
+        slug_value = slug
 
-          # If the slug base is nil, and the slug field is nil, then we're going to leave the slug column NULL.
-          return false if base.nil? && slug_value.nil?
-          
-          # Otherwise, if this is a new record, we're definitely going to try to create a new slug.
-          slug_value.blank?
-        end
+        # If the slug base is nil, and the slug field is nil, then we're going to leave the slug column NULL.
+        return false if base.nil? && slug_value.nil?
+
+        # Otherwise, if this is a new record, we're definitely going to try to create a new slug.
+        slug_value.blank?
+      end
     end
   end
 end