sunrise-cms 1.0.3 → 1.1.1

data/lib/sunrise/carrierwave/base_uploader.rb

@@ -1,32 +1,29 @@
+# frozen_string_literal: true
+
 require 'mime/types'
 require 'mini_magick'
+require 'carrierwave'
 require 'carrierwave/processing/mini_magick'
-require 'carrierwave/processing/mime_types'
 
 module Sunrise
   module CarrierWave
     class BaseUploader < ::CarrierWave::Uploader::Base
       include ::CarrierWave::MiniMagick
-      include ::CarrierWave::MimeTypes
       include Sunrise::Utils::EvalHelpers
-            
-      storage :file
-      
-      process :set_content_type
-      
-      with_options :if => :image? do |img|
+
+      process :set_model_info
+
+      with_options if: :image? do |img|
         img.process :strip
-        img.process :cropper => lambda { |model| model.cropper_geometry }
-        img.process :rotate => lambda { |model| model.rotate_degrees }
+        img.process cropper: ->(model) { model.cropper_geometry }
+        img.process rotate: ->(model) { model.rotate_degrees }
       end
-      
-      process :set_model_info
-       
-      # default store assets path 
+
+      # default store assets path
       def store_dir
         "uploads/#{model.class.to_s.underscore}/#{model.id}"
       end
-      
+
       # Strips out all embedded information from the image
       # process :strip
       #
@@ -37,14 +34,14 @@ module Sunrise
           img
         end
       end
-      
+
       # Reduces the quality of the image to the percentage given
       # process :quality => 85
       #
       def quality(percentage)
         percentage = normalize_param(percentage)
-        
-        unless percentage.blank?
+
+        if percentage.present?
           manipulate! do |img|
             img.quality(percentage.to_s)
             img = yield(img) if block_given?
@@ -52,14 +49,14 @@ module Sunrise
           end
         end
       end
-      
+
       # Rotate image by degress
       # process :rotate => "-90"
       #
       def rotate(degrees = nil)
         degrees = normalize_param(degrees)
-        
-        unless degrees.blank?
+
+        if degrees.present?
           manipulate! do |img|
             img.rotate(degrees.to_s)
             img = yield(img) if block_given?
@@ -67,7 +64,7 @@ module Sunrise
           end
         end
       end
-      
+
       # Crop image by specific coordinates
       # http://www.imagemagick.org/script/command-line-processing.php?ImageMagick=6ddk6c680muj4eu2vr54vdveb7#geometry
       # process :cropper => [size, offset]
@@ -75,52 +72,52 @@ module Sunrise
       #
       def cropper(*geometry)
         geometry = normalize_param(geometry[0]) if geometry.size == 1
-        
+
         if geometry && geometry.size == 4
           manipulate! do |img|
-            img.crop "%ix%i+%i+%i" % geometry
+            img.crop '%ix%i+%i+%i' % geometry
             img = yield(img) if block_given?
             img
           end
         end
       end
-      
+
       def default_url
         image_name = [model.class.to_s.underscore, version_name].compact.join('_')
         "/assets/defaults/#{image_name}.png"
       end
-      
+
       def image?(new_file = nil)
         _type = (file || new_file).content_type
-        _type.include?('image') && !['photoshop', 'psd'].any? {|p| _type.include?(p) }
+        _type.include?('image') && %w[photoshop psd].none? { |p| _type.include?(p) }
       end
-      
+
       def dimensions
         [magick[:width], magick[:height]]
       end
-      
+
       def magick
         @magick ||= ::MiniMagick::Image.new(current_path)
       end
-      
+
       protected
-        
-        def set_model_info
-          model.data_content_type = file.content_type
-          model.data_file_size = file.size
-          
-          if image? && model.has_dimensions?
-            model.width, model.height = dimensions
-          end
-        end
-        
-        def normalize_param(value)
-          if value.is_a?(Proc) || value.is_a?(Method)
-            evaluate_method(model, value, file)
-          else
-            value
-          end
+
+      def set_model_info
+        model.data_content_type = file.content_type
+        model.data_file_size = file.size
+      end
+
+      def set_dimensions
+        model.width, model.height = dimensions if image? && model.has_dimensions?
+      end
+
+      def normalize_param(value)
+        if value.is_a?(Proc) || value.is_a?(Method)
+          evaluate_method(model, value, file)
+        else
+          value
         end
+      end
     end
   end
 end

data/lib/sunrise/carrierwave/file_size_validator.rb

@@ -1,17 +1,20 @@
-# encoding: utf-8
+# 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
+      MESSAGES  = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
+      CHECKS    = { is: :==, minimum: :>=, maximum: :<= }.freeze
 
-      DEFAULT_TOKENIZER = lambda { |value| value.split(//) }
-      RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long]
+      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], options[:maximum] = range.begin, range.end
+          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
 
@@ -35,9 +38,11 @@ module Sunrise
       end
 
       def validate_each(record, attribute, value)
-        raise(ArgumentError, "A CarrierWave::Uploader::Base object was expected") unless value.kind_of? ::CarrierWave::Uploader::Base
-        
-        value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.kind_of?(String)
+        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]
@@ -56,7 +61,7 @@ module Sunrise
           record.errors.add(attribute, MESSAGES[key], errors_options)
         end
       end
-      
+
       def help
         Helper.instance
       end

data/lib/sunrise/carrierwave/glue.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Sunrise
   module CarrierWave
     module Glue
@@ -6,23 +7,22 @@ module Sunrise
         base.send(:extend, ClassMethods)
         base.send(:include, InstanceMethods)
       end
-      
+
       module ClassMethods
-        def sunrise_uploader(uploader=nil, options={}, &block)
-          options = { :mount_on => :data_file_name }.merge(options)
-          
+        def sunrise_uploader(uploader = nil, options = {}, &block)
+          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
-      
+
       module InstanceMethods
-        
       end
     end
   end

data/lib/sunrise/config.rb

@@ -1,39 +1,41 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Config
     autoload :Navigation, 'sunrise/config/navigation'
     autoload :PagePresenter, 'sunrise/config/page_presenter'
-    
+
     # Paginate records per page
     mattr_accessor :default_items_per_page
     @@default_items_per_page = 25
-    
+
     # Display audits events (dashboard)
     mattr_accessor :activities_per_page
     @@activities_per_page = 50
-    
+
     # By default show latest first
     mattr_accessor :default_sort_mode
     @@default_sort_mode = :desc
-    
+
     # The display for a model instance (i.e. a single database record).
     mattr_accessor :label_methods
     @@label_methods = [:title, :name]
-    
+
     # Default index template view
     mattr_accessor :default_index_view
     @@default_index_view = :thumbs
-    
+
     mattr_accessor :available_index_views
     @@available_index_views = [:tree, :thumbs, :table]
-    
+
     # Default sort column
     mattr_accessor :sort_column
     @@sort_column = :sort_order
-    
+
     # Find template before rendering
     mattr_accessor :scoped_views
     @@scoped_views = true
-    
+
     # Set available locales in app
     mattr_accessor :available_locales
     @@available_locales = []
@@ -46,19 +48,19 @@ module Sunrise
     # Set index toolbar buttons
     mattr_accessor :default_toolbar_buttons
     @@default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
-    
+
     # Index the formats that should be treated as navigational
     mattr_accessor :navigational_formats
     @@navigational_formats = [:html, :json]
 
     # Welcome root path options
     mattr_accessor :root_route_options
-    @@root_route_options = {to: "manager#index", model_name: "structures"}
+    @@root_route_options = { to: 'manager#index', model_name: 'structures' }
 
     def self.scoped_views?
       @@scoped_views === true
     end
-    
+
     def self.navigation
       ::SunriseNavigation.instance.navigations
     end

data/lib/sunrise/config/association.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'sunrise/config/base'
 
 module Sunrise
   module Config
     class Association < Base
-    
       def resource_name
         @resource_name ||= (@config_options[:class_name] || name)
       end
-    
+
       def model
         @model ||= Utils.lookup(resource_name.to_s.camelize)
       end
-    
+
       # Compare relation by model_type
       def is_this?(model_type)
         [name.to_s, resource_name].map(&:downcase).include?(model_type.to_s.downcase)

data/lib/sunrise/config/base.rb

@@ -1,35 +1,37 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Config
-    class Base      
+    class Base
       attr_reader :abstract_model, :parent, :name
 
       def initialize(abstract_model, parent = nil, options = nil)
         @abstract_model = abstract_model
         @parent = parent
         @config_options = (options || {}).symbolize_keys
-        @name = (@config_options.delete(:name) || "noname").to_s
+        @name = (@config_options.delete(:name) || 'noname').to_s
       end
-      
+
       # Register an instance option for this object only
       def register_instance_option(option_name, &default)
-        scope = class << self; self; end;
+        scope = class << self; self; end
         self.class.register_instance_option(option_name, scope, &default)
       end
-      
+
       class << self
         # Register an instance option. Instance option is a configuration
         # option that stores its value within an instance variable and is
         # accessed by an instance method. Both go by the name of the option.
         def register_instance_option(option_name, scope = self, &default)
-          unless options = scope.instance_variable_get("@config_options")
-            options = scope.instance_variable_set("@config_options", {})
+          unless options = scope.instance_variable_get('@config_options')
+            options = scope.instance_variable_set('@config_options', {})
           end
 
           option_name = option_name.to_s
           options[option_name] = nil
 
           # If it's a boolean create an alias for it and remove question mark
-          if "?" == option_name[-1, 1]
+          if option_name[-1, 1] == '?'
             scope.send(:define_method, "#{option_name.chop!}?") do
               send(option_name)
             end
@@ -45,7 +47,7 @@ module Sunrise
               value = instance_variable_get("@#{option_name}_registered")
 
               case value
-              when Proc then
+              when Proc
                 unless value.lambda?
                   # Track recursive invocation with an instance variable. This prevents run-away recursion
                   # and allows configurations such as
@@ -59,7 +61,7 @@ module Sunrise
                     instance_variable_set("@#{option_name}_recurring", false)
                   end
                 end
-              when nil then
+              when nil
                 value = instance_eval &default
               end
 
@@ -67,13 +69,13 @@ module Sunrise
             end
           end
         end
-        
+
         # Register a class option. Class option is a configuration
         # option that stores it's value within a class object's instance variable
         # and is accessed by a class method. Both go by the name of the option.
         def self.register_class_option(option_name, &default)
-          scope = class << self; self; end;
-          self.register_instance_option(option_name, scope, &default)
+          scope = class << self; self; end
+          register_instance_option(option_name, scope, &default)
         end
       end
     end

data/lib/sunrise/config/export.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sunrise/config/base'
 require 'sunrise/config/has_groups'
 require 'sunrise/config/has_fields'
@@ -6,17 +8,17 @@ module Sunrise
   module Config
     class Export < Base
       include Sunrise::Config::HasFields
-      
+
       # Column to sort
       register_instance_option :sort_column do
         abstract_model.model.primary_key
       end
-      
+
       # Sort direction
       register_instance_option :sort_mode do
         Sunrise::Config.default_sort_mode
       end
-      
+
       # Default scope
       register_instance_option(:scope) do
         nil