rails_admin 2.2.1 → 3.1.2

data/lib/rails_admin/config/fields/types/timestamp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -7,10 +9,6 @@ module RailsAdmin
         class Timestamp < RailsAdmin::Config::Fields::Types::Datetime
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
-
-          @format = :long
-          @i18n_scope = [:time, :formats]
-          @js_plugin_options = {}
         end
       end
     end

data/lib/rails_admin/config/fields/types/uuid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/wysihtml5.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/association'
@@ -9,7 +11,7 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] || raise("Unsupported field datatype: #{type}")
+          @@registry.fetch(type.to_sym) { raise "Unsupported field datatype: #{type}" }
         end
 
         def self.register(type, klass = nil)

data/lib/rails_admin/config/fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -20,7 +22,7 @@ module RailsAdmin
 
       # Registry of field factories.
       #
-      # Field factory is an anonymous function that recieves the parent object,
+      # Field factory is an anonymous function that receives the parent object,
       # an array of field properties and an array of fields already instantiated.
       #
       # If the factory returns true then that property will not be run through
@@ -50,13 +52,15 @@ module RailsAdmin
         parent.abstract_model.properties.each do |properties|
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == properties.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, properties, fields) }
         end
         # Load fields for all associations (relations)
-        parent.abstract_model.associations.select { |a| a.type != :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
+        parent.abstract_model.associations.reject { |a| a.type == :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == association.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, association, fields) }
         end

data/lib/rails_admin/config/groupable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin

data/lib/rails_admin/config/has_description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessor and autoregistering of model's description.

data/lib/rails_admin/config/has_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessors and autoregistering of model's fields.
@@ -8,9 +10,7 @@ module RailsAdmin
 
         # some fields are hidden by default (belongs_to keys, has_many associations in list views.)
         # unhide them if config specifically defines them
-        if field
-          field.show unless field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
-        end
+        field.show if field && !field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
         # Specify field as virtual if type is not specifically set and field was not
         # found in default stack
         if field.nil? && type.nil?
@@ -39,17 +39,18 @@ module RailsAdmin
         field
       end
 
-      # configure a field without adding it.
+      # configure field(s) from the default group in a section without changing the original order.
       def configure(name, type = nil, &block)
-        field(name, type, false, &block)
+        [*name].each { |field_name| field(field_name, type, false, &block) }
       end
 
-      # include fields by name and apply an optionnal block to each (through a call to fields),
+      # include fields by name and apply an optional block to each (through a call to fields),
       # or include fields by conditions if no field names
       def include_fields(*field_names, &block)
         if field_names.empty?
           _fields.select { |f| f.instance_eval(&block) }.each do |f|
             next if f.defined
+
             f.defined = true
             f.order = _fields.count(&:defined)
           end
@@ -117,6 +118,10 @@ module RailsAdmin
         all_fields.collect { |f| f.with(bindings) }.select(&:visible?).sort_by { |f| [f.order, i += 1] } # stable sort, damn
       end
 
+      def possible_fields
+        _fields(true)
+      end
+
     protected
 
       # Raw fields.
@@ -126,7 +131,7 @@ module RailsAdmin
         return @_fields if @_fields
         return @_ro_fields if readonly && @_ro_fields
 
-        if self.class == RailsAdmin::Config::Sections::Base
+        if instance_of?(RailsAdmin::Config::Sections::Base)
           @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         else
           # parent is RailsAdmin::Config::Model, recursion is on Section's classes

data/lib/rails_admin/config/has_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin

data/lib/rails_admin/config/hideable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Defines a visibility configuration
@@ -16,7 +18,7 @@ module RailsAdmin
 
       # Writer to hide object.
       def hide(&block)
-        visible block ? proc { false == instance_eval(&block) } : false
+        visible block ? proc { instance_eval(&block) == false } : false
       end
 
       # Writer to show field.

data/lib/rails_admin/config/inspectable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Inspectable
@@ -30,9 +32,7 @@ module RailsAdmin
       end
 
       def set_named_instance_variables
-        unless defined?(self.class::NAMED_INSTANCE_VARIABLES)
-          self.class.const_set('NAMED_INSTANCE_VARIABLES', [])
-        end
+        self.class.const_set('NAMED_INSTANCE_VARIABLES', []) unless defined?(self.class::NAMED_INSTANCE_VARIABLES)
       end
     end
   end

data/lib/rails_admin/config/lazy_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/model'
 
 module RailsAdmin
@@ -6,11 +8,15 @@ module RailsAdmin
       def initialize(entity, &block)
         @entity = entity
         @deferred_blocks = [*block]
-        @existing_blocks = []
+        @initialized = false
       end
 
       def add_deferred_block(&block)
-        @deferred_blocks << block
+        if @initialized
+          @model.instance_eval(&block)
+        else
+          @deferred_blocks << block
+        end
       end
 
       def target
@@ -42,17 +48,17 @@ module RailsAdmin
         #       :
         #     end
         #
-        # Thus, sort all blocks to excute for a resource by Proc.source_path,
+        # Thus, sort all blocks to execute for a resource by Proc.source_path,
         # to guarantee that blocks from 'config/initializers' evaluate before
         # blocks defined within a model class.
         unless @deferred_blocks.empty?
-          @existing_blocks += @deferred_blocks
-          @existing_blocks.
-            partition { |block| block.source_location.first =~ %r{config\/initializers} }.
+          @deferred_blocks.
+            partition { |block| block.source_location.first =~ %r{config/initializers} }.
             flatten.
             each { |block| @model.instance_eval(&block) }
           @deferred_blocks = []
         end
+        @initialized = true
         @model
       end
 
@@ -60,7 +66,7 @@ module RailsAdmin
         target.send(method_name, *args, &block)
       end
 
-      def respond_to?(method_name, include_private = false)
+      def respond_to_missing?(method_name, include_private = false)
         super || target.respond_to?(method_name, include_private)
       end
     end

data/lib/rails_admin/config/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config'
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
@@ -21,30 +23,33 @@ module RailsAdmin
       include RailsAdmin::Config::Sections
       include RailsAdmin::Config::Inspectable
 
-      attr_reader :abstract_model
+      attr_reader :abstract_model, :parent, :root
       attr_accessor :groups
-      attr_reader :parent, :root
 
-      NAMED_INSTANCE_VARIABLES = [:@parent, :@root].freeze
+      NAMED_INSTANCE_VARIABLES = %i[@parent @root].freeze
 
       def initialize(entity)
         @parent = nil
         @root = self
 
-        @abstract_model = begin
-          if entity.is_a?(RailsAdmin::AbstractModel)
+        @abstract_model =
+          case entity
+          when RailsAdmin::AbstractModel
             entity
-          elsif entity.is_a?(Class) || entity.is_a?(String) || entity.is_a?(Symbol)
+          when Class, String
             RailsAdmin::AbstractModel.new(entity)
+          when Symbol
+            RailsAdmin::AbstractModel.new(entity.to_s)
           else
             RailsAdmin::AbstractModel.new(entity.class)
           end
-        end
+
         @groups = [RailsAdmin::Config::Fields::Group.new(self, :default).tap { |g| g.label { I18n.translate('admin.form.basic_info') } }]
       end
 
       def excluded?
         return @excluded if defined?(@excluded)
+
         @excluded = !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
       end
 
@@ -81,23 +86,30 @@ module RailsAdmin
       register_instance_option :parent do
         @parent_model ||= begin
           klass = abstract_model.model.superclass
-          klass = nil if klass.to_s.in?(%w(Object BasicObject ActiveRecord::Base))
+          klass = nil if klass.to_s.in?(%w[Object BasicObject ActiveRecord::Base])
           klass
         end
       end
 
       register_instance_option :navigation_label do
-        @navigation_label ||= begin
+        @navigation_label ||=
           if (parent_module = abstract_model.model.try(:module_parent) || abstract_model.model.try!(:parent)) != Object
             parent_module.to_s
           end
-        end
       end
 
       register_instance_option :navigation_icon do
         nil
       end
 
+      register_instance_option :scope do
+        abstract_model.scoped
+      end
+
+      register_instance_option :last_created_at do
+        abstract_model.model.last.try(:created_at) if abstract_model.properties.detect { |c| c.name == :created_at }
+      end
+
       # Act as a proxy for the base section configuration that actually
       # store the configurations.
       def method_missing(method_name, *args, &block)

data/lib/rails_admin/config/proxyable/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Proxyable

data/lib/rails_admin/config/proxyable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable/proxy'
 module RailsAdmin
   module Config

data/lib/rails_admin/config/sections/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/inspectable'
@@ -18,10 +20,9 @@ module RailsAdmin
         include RailsAdmin::Config::HasGroups
         include RailsAdmin::Config::HasDescription
 
-        attr_reader :abstract_model
-        attr_reader :parent, :root
+        attr_reader :abstract_model, :parent, :root
 
-        NAMED_INSTANCE_VARIABLES = [:@parent, :@root, :@abstract_model].freeze
+        NAMED_INSTANCE_VARIABLES = %i[@parent @root @abstract_model].freeze
 
         def initialize(parent)
           @parent = parent

data/lib/rails_admin/config/sections/create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/edit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/export.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin
@@ -28,12 +30,12 @@ module RailsAdmin
           nil
         end
 
-        register_instance_option :sort_by do
-          parent.abstract_model.primary_key
+        register_instance_option :search_help do
+          nil
         end
 
-        register_instance_option :sort_reverse? do
-          true # By default show latest first
+        register_instance_option :sort_by do
+          parent.abstract_model.primary_key
         end
 
         register_instance_option :scopes do
@@ -44,23 +46,16 @@ module RailsAdmin
           ''
         end
 
-        register_instance_option :sidescroll do
-          nil
+        register_deprecated_instance_option :sidescroll do
+          ActiveSupport::Deprecation.warn('The sidescroll configuration option was removed, it is always enabled now.')
+        end
+
+        def fields_for_table
+          visible_fields.partition(&:sticky?).flatten
         end
 
-        def sidescroll_frozen_columns
-          global_config = RailsAdmin::Config.sidescroll
-          model_config = sidescroll
-          enabled = model_config.nil? ? global_config : model_config
-          if enabled
-            num_frozen = model_config[:num_frozen_columns] if model_config.is_a?(Hash)
-            unless num_frozen
-              num_frozen = global_config[:num_frozen_columns] if global_config.is_a?(Hash)
-              num_frozen ||= 3 # by default, freeze checkboxes, links & first property (usually primary key / id?)
-              num_frozen -= 1 unless checkboxes? # model config should be explicit about this, only adjust if using global config
-            end
-            num_frozen
-          end
+        register_deprecated_instance_option :sort_reverse do
+          ActiveSupport::Deprecation.warn('The sort_reverse configuration option is deprecated and has no effect.')
         end
       end
     end

data/lib/rails_admin/config/sections/modal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/nested.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/sections/base'
 require 'rails_admin/config/sections/edit'
@@ -25,7 +27,7 @@ module RailsAdmin
           section = RailsAdmin::Config::Sections.const_get(name)
           name = name.to_s.underscore.to_sym
           klass.send(:define_method, name) do |&block|
-            @sections = {} unless @sections
+            @sections ||= {}
             @sections[name] = section.new(self) unless @sections[name]
             @sections[name].instance_eval(&block) if block
             @sections[name]