rails_admin 1.0.0.rc → 1.0.0

data/lib/rails_admin/config/actions/bulk_delete.rb

@@ -43,13 +43,11 @@ module RailsAdmin
 
               if destroyed.nil?
                 flash[:error] = t('admin.flash.error', name: pluralize(0, @model_config.label), action: t('admin.actions.delete.done'))
-                redirect_to back_or_index
               else
                 flash[:success] = t('admin.flash.successful', name: pluralize(destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless destroyed.empty?
                 flash[:error] = t('admin.flash.error', name: pluralize(not_destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless not_destroyed.empty?
-                redirect_to back_or_index
               end
-
+              redirect_to back_or_index
             end
           end
         end

data/lib/rails_admin/config/actions/index.rb

@@ -76,12 +76,10 @@ module RailsAdmin
                   send_data output,
                             type: "text/csv; charset=#{encoding}; #{'header=present' if header}",
                             disposition: "attachment; filename=#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.csv"
+                elsif Rails.version.to_s >= '5'
+                  render plain: output
                 else
-                  if Rails.version.to_s >= '5'
-                    render plain: output
-                  else
-                    render text: output
-                  end
+                  render text: output
                 end
               end
             end

data/lib/rails_admin/config/configurable.rb

@@ -43,7 +43,7 @@ module RailsAdmin
 
           # Define getter/setter by the option name
           scope.send(:define_method, option_name) do |*args, &block|
-            if !args[0].nil? || block # rubocop:disable NonNilCheck
+            if !args[0].nil? || block
               # Invocation with args --> This is the declaration of the option, i.e. setter
               instance_variable_set("@#{option_name}_registered", args[0].nil? ? block : args[0])
             else
@@ -75,12 +75,10 @@ module RailsAdmin
             if replacement_option_name
               ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
               send(replacement_option_name, *args, &block)
+            elsif block_given?
+              yield
             else
-              if block_given?
-                yield
-              else
-                fail("The #{option_name} configuration option is removed without replacement.")
-              end
+              raise("The #{option_name} configuration option is removed without replacement.")
             end
           end
         end

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

@@ -10,7 +10,7 @@ module RailsAdmin
         end
 
         # Reader for the association information hash
-        def association # rubocop:disable TrivialAccessors
+        def association
           @properties
         end
 

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

@@ -2,6 +2,7 @@ require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
 require 'rails_admin/config/groupable'
+require 'rails_admin/config/inspectable'
 
 module RailsAdmin
   module Config
@@ -11,11 +12,17 @@ module RailsAdmin
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
         include RailsAdmin::Config::Groupable
+        include RailsAdmin::Config::Inspectable
 
         attr_reader :name, :properties, :abstract_model
         attr_accessor :defined, :order, :section
         attr_reader :parent, :root
 
+        NAMED_INSTANCE_VARIABLES = [
+          :@parent, :@root, :@section, :@children_fields_registered,
+          :@associated_model_config, :@group, :@bindings
+        ].freeze
+
         def initialize(parent, name, properties)
           @parent = parent
           @root = parent.root
@@ -57,7 +64,7 @@ module RailsAdmin
         end
 
         register_instance_option :filterable? do
-          !!searchable # rubocop:disable DoubleNegation
+          !!searchable
         end
 
         register_instance_option :search_operator do
@@ -92,7 +99,7 @@ module RailsAdmin
                   property = am && am.properties.detect { |p| p.name == f.values.first.to_sym }
                   type = property && property.type
                 else                                                             #  <attribute|column>
-                  am = (self.association? ? associated_model_config.abstract_model : abstract_model)
+                  am = (association? ? associated_model_config.abstract_model : abstract_model)
                   table_name = am.table_name
                   column = f
                   property = am.properties.detect { |p| p.name == f.to_sym }
@@ -172,12 +179,12 @@ module RailsAdmin
               :nil
             end
           end
-          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name| # rubocop:disable DoubleNegation
+          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name|
             abstract_model.model.validators_on(column_name).detect do |v|
               !(v.options[:allow_nil] || v.options[:allow_blank]) &&
-              [:presence, :numericality, :attachment_presence].include?(v.kind) &&
-              (v.options[:on] == context || v.options[:on].blank?) &&
-              (v.options[:if].blank? && v.options[:unless].blank?)
+                [:presence, :numericality, :attachment_presence].include?(v.kind) &&
+                (v.options[:on] == context || v.options[:on].blank?) &&
+                (v.options[:if].blank? && v.options[:unless].blank?)
             end
           end
         end
@@ -247,8 +254,8 @@ module RailsAdmin
         #
         # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional(state = nil, &block)
-          if !state.nil? || block # rubocop:disable NonNilCheck
-            required state.nil? ? proc { false == (instance_eval(&block)) } : false == state
+          if !state.nil? || block
+            required state.nil? ? proc { false == instance_eval(&block) } : false == state
           else
             optional?
           end
@@ -324,24 +331,6 @@ module RailsAdmin
         def form_value
           form_default_value.nil? ? formatted_value : form_default_value
         end
-
-        def inspect
-          "#<#{self.class.name}[#{name}] #{
-            instance_variables.collect do |v|
-              value = instance_variable_get(v)
-              if [:@parent, :@root, :@section, :@children_fields_registered,
-                  :@associated_model_config, :@group, :@bindings].include? v
-                if value.respond_to? :name
-                  "#{v}=#{value.name.inspect}"
-                else
-                  "#{v}=#{value.class.name}"
-                end
-              else
-                "#{v}=#{value.inspect}"
-              end
-            end.join(', ')
-          }>"
-        end
       end
     end
   end

data/lib/rails_admin/config/fields/factories/carrierwave.rb

@@ -4,7 +4,7 @@ require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   model = parent.abstract_model.model
-  if defined?(::CarrierWave) && (model).is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
+  if defined?(::CarrierWave) && model.is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
     columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
     field = RailsAdmin::Config::Fields::Types.load(:carrierwave).new(parent, attachment_name, properties)
     fields << field

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

@@ -9,7 +9,7 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] || fail("Unsupported field datatype: #{type}")
+          @@registry[type.to_sym] || raise("Unsupported field datatype: #{type}")
         end
 
         def self.register(type, klass = nil)

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

@@ -28,7 +28,12 @@ module RailsAdmin
           end
 
           def parse_value(value)
-            value.present? ? enum.invert[value.to_i] : nil
+            return unless value.present?
+            if ::Rails.version >= '5'
+              abstract_model.model.attribute_types[name.to_s].deserialize(value)
+            else
+              enum.invert[type_cast_value(value)]
+            end
           end
 
           def parse_input(params)
@@ -36,7 +41,17 @@ module RailsAdmin
           end
 
           def form_value
-            ::Rails.version >= '5' ? enum[super] : super
+            enum[super] || super
+          end
+
+        private
+
+          def type_cast_value(value)
+            if ::Rails.version >= '4.2'
+              abstract_model.model.column_types[name.to_s].type_cast_from_user(value)
+            else
+              abstract_model.model.column_types[name.to_s].type_cast(value)
+            end
           end
         end
       end

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

@@ -57,7 +57,7 @@ module RailsAdmin
 
           # virtual class
           def resource_url
-            fail('not implemented')
+            raise('not implemented')
           end
 
           def virtual?

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

@@ -22,7 +22,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym  # name_ids
+            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym # name_ids
           end
 
           # Reader for validation errors of the bound object

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

@@ -16,7 +16,7 @@ module RailsAdmin
           # association checks that any of the child models are included in
           # configuration.
           register_instance_option :visible? do
-            associated_model_config.length > 0
+            associated_model_config.any?
           end
 
           register_instance_option :formatted_value do

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

@@ -27,11 +27,12 @@ module RailsAdmin
               max_length = [length, valid_length[:maximum] || nil].compact.min
               min_length = [0, valid_length[:minimum] || nil].compact.max
               if max_length
-                if min_length == 0
-                  text += "#{I18n.translate('admin.form.char_length_up_to').capitalize} #{max_length}."
-                else
-                  text += "#{I18n.translate('admin.form.char_length_of').capitalize} #{min_length}-#{max_length}."
-                end
+                text +=
+                  if min_length == 0
+                    "#{I18n.translate('admin.form.char_length_up_to').capitalize} #{max_length}."
+                  else
+                    "#{I18n.translate('admin.form.char_length_of').capitalize} #{min_length}-#{max_length}."
+                  end
               end
             end
             text

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

@@ -10,19 +10,19 @@ module RailsAdmin
 
           [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
             register_deprecated_instance_option key do
-              fail("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
+              raise("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
             end
           end
 
           [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
             register_deprecated_instance_option key do
-              fail("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
+              raise("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
             end
           end
 
           [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
             register_deprecated_instance_option key do
-              fail("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
+              raise("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
             end
           end
 

data/lib/rails_admin/config/hideable.rb

@@ -16,7 +16,7 @@ module RailsAdmin
 
       # Writer to hide object.
       def hide(&block)
-        visible block ? proc { false == (instance_eval(&block)) } : false
+        visible block ? proc { false == instance_eval(&block) } : false
       end
 
       # Writer to show field.

data/lib/rails_admin/config/inspectable.rb

@@ -0,0 +1,39 @@
+module RailsAdmin
+  module Config
+    module Inspectable
+      def inspect
+        set_named_instance_variables
+
+        instance_name = try(:name) || try(:abstract_model).try(:model).try(:name)
+        instance_name = instance_name ? "[#{instance_name}]" : ''
+
+        instance_vars = instance_variables.collect do |v|
+          instance_variable_name(v)
+        end.join(', ')
+
+        "#<#{self.class.name}#{instance_name} #{instance_vars}>"
+      end
+
+    private
+
+      def instance_variable_name(variable)
+        value = instance_variable_get(variable)
+        if self.class::NAMED_INSTANCE_VARIABLES.include?(variable)
+          if value.respond_to?(:name)
+            "#{variable}=#{value.name.inspect}"
+          else
+            "#{variable}=#{value.class.name}"
+          end
+        else
+          "#{variable}=#{value.inspect}"
+        end
+      end
+
+      def set_named_instance_variables
+        unless defined?(self.class::NAMED_INSTANCE_VARIABLES)
+          self.class.const_set('NAMED_INSTANCE_VARIABLES', [])
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/model.rb

@@ -9,6 +9,7 @@ require 'rails_admin/config/has_fields'
 require 'rails_admin/config/has_description'
 require 'rails_admin/config/sections'
 require 'rails_admin/config/actions'
+require 'rails_admin/config/inspectable'
 
 module RailsAdmin
   module Config
@@ -18,11 +19,14 @@ module RailsAdmin
       include RailsAdmin::Config::Configurable
       include RailsAdmin::Config::Hideable
       include RailsAdmin::Config::Sections
+      include RailsAdmin::Config::Inspectable
 
       attr_reader :abstract_model
       attr_accessor :groups
       attr_reader :parent, :root
 
+      NAMED_INSTANCE_VARIABLES = [:@parent, :@root].freeze
+
       def initialize(entity)
         @parent = nil
         @root = self
@@ -98,23 +102,6 @@ module RailsAdmin
       def method_missing(m, *args, &block)
         send(:base).send(m, *args, &block)
       end
-
-      def inspect
-        "#<#{self.class.name}[#{abstract_model.model.name}] #{
-          instance_variables.collect do |v|
-            value = instance_variable_get(v)
-            if [:@parent, :@root].include? v
-              if value.respond_to? :name
-                "#{v}=#{value.name.inspect}"
-              else
-                "#{v}=#{value.class.name}"
-              end
-            else
-              "#{v}=#{value.inspect}"
-            end
-          end.join(', ')
-        }>"
-      end
     end
   end
 end

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

@@ -1,5 +1,6 @@
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
+require 'rails_admin/config/inspectable'
 require 'rails_admin/config/has_fields'
 require 'rails_admin/config/has_groups'
 require 'rails_admin/config/has_description'
@@ -11,6 +12,7 @@ module RailsAdmin
       class Base
         include RailsAdmin::Config::Proxyable
         include RailsAdmin::Config::Configurable
+        include RailsAdmin::Config::Inspectable
 
         include RailsAdmin::Config::HasFields
         include RailsAdmin::Config::HasGroups
@@ -19,29 +21,14 @@ module RailsAdmin
         attr_reader :abstract_model
         attr_reader :parent, :root
 
+        NAMED_INSTANCE_VARIABLES = [:@parent, :@root, :@abstract_model].freeze
+
         def initialize(parent)
           @parent = parent
           @root = parent.root
 
           @abstract_model = root.abstract_model
         end
-
-        def inspect
-          "#<#{self.class.name} #{
-            instance_variables.collect do |v|
-              value = instance_variable_get(v)
-              if [:@parent, :@root, :@abstract_model].include? v
-                if value.respond_to? :name
-                  "#{v}=#{value.name.inspect}"
-                else
-                  "#{v}=#{value.class.name}"
-                end
-              else
-                "#{v}=#{value.inspect}"
-              end
-            end.join(', ')
-          }>"
-        end
       end
     end
   end

data/lib/rails_admin/engine.rb

@@ -12,7 +12,7 @@ module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
 
-    config.action_dispatch.rescue_responses.merge!('RailsAdmin::ActionNotAllowed' => :forbidden)
+    config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
 
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       app.config.assets.precompile += %w(
@@ -23,7 +23,8 @@ module RailsAdmin
       )
     end
 
-    initializer 'RailsAdmin pjax hook' do |app|
+    initializer 'RailsAdmin setup middlewares' do |app|
+      app.config.middleware.use ActionDispatch::Flash
       app.config.middleware.use Rack::Pjax
     end