rails_admin 1.0.0.rc → 1.0.0

data/app/assets/javascripts/rails_admin/ra.remote-form.js

@@ -91,10 +91,7 @@
           dialog.find('.modal-body').html(data.responseText);
           widget._bindFormEvents();
         } else {
-          // responseText may contain redundant try-catch clause added by remotipart
-          // https://github.com/JangoSteve/remotipart/blob/c08d61137ee18e0e78eb3cd9ca3030479fd101f1/lib/remotipart/render_overrides.rb#L17
-          var responseText = data.responseText.replace(/^try{[^}]+}catch\(err\){[^}]+}/, '');
-          var json = $.parseJSON(responseText);
+          var json = $.parseJSON(data.responseText);
           var option = '<option value="' + json.id + '" selected>' + json.label + '</option>';
           var select = widget.element.find('select').filter(":hidden");
 

data/app/controllers/rails_admin/application_controller.rb

@@ -21,13 +21,13 @@ module RailsAdmin
 
     def get_model
       @model_name = to_model_name(params[:model_name])
-      fail(RailsAdmin::ModelNotFound) unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
-      fail(RailsAdmin::ModelNotFound) if (@model_config = @abstract_model.config).excluded?
+      raise(RailsAdmin::ModelNotFound) unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
+      raise(RailsAdmin::ModelNotFound) if (@model_config = @abstract_model.config).excluded?
       @properties = @abstract_model.properties
     end
 
     def get_object
-      fail(RailsAdmin::ObjectNotFound) unless (@object = @abstract_model.get(params[:id]))
+      raise(RailsAdmin::ObjectNotFound) unless (@object = @abstract_model.get(params[:id]))
     end
 
     def to_model_name(param)
@@ -56,8 +56,8 @@ module RailsAdmin
       instance_eval(&RailsAdmin::Config.audit_with)
     end
 
-    def user_for_paper_trail
-      _current_user.try(:id) || _current_user
+    def rails_admin_controller?
+      true
     end
 
     rescue_from RailsAdmin::ObjectNotFound do

data/app/controllers/rails_admin/main_controller.rb

@@ -93,7 +93,7 @@ module RailsAdmin
       return unless target_params.present?
       fields = visible_fields(action, model_config)
       allowed_methods = fields.collect(&:allowed_methods).flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
-      fields.each { |field|  field.parse_input(target_params) }
+      fields.each { |field| field.parse_input(target_params) }
       target_params.slice!(*allowed_methods)
       target_params.permit! if target_params.respond_to?(:permit!)
       fields.select(&:nested_form).each do |association|
@@ -110,7 +110,7 @@ module RailsAdmin
 
       respond_to do |format|
         format.html { render whereto, status: :not_acceptable }
-        format.js   { render whereto, layout: false, status: :not_acceptable  }
+        format.js   { render whereto, layout: false, status: :not_acceptable }
       end
     end
 

data/app/helpers/rails_admin/application_helper.rb

@@ -47,8 +47,8 @@ module RailsAdmin
       if defined?(Devise)
         scope = Devise::Mapping.find_scope!(_current_user)
         main_app.send("destroy_#{scope}_session_path") rescue false
-      else
-        main_app.logout_path if main_app.respond_to?(:logout_path)
+      elsif main_app.respond_to?(:logout_path)
+        main_app.logout_path
       end
     end
 

data/app/helpers/rails_admin/form_builder.rb

@@ -20,10 +20,17 @@ module RailsAdmin
     end
 
     def fieldset_for(fieldset, nested_in)
-      return unless (fields = fieldset.with(form: self, object: @object, view: @template, controller: @template.controller).visible_fields).length > 0
+      fields = fieldset.with(
+        form: self,
+        object: @object,
+        view: @template,
+        controller: @template.controller,
+      ).visible_fields
+      return if fields.empty?
+
       @template.content_tag :fieldset do
         contents = []
-        contents << @template.content_tag(:legend, %(<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}).html_safe, style: "#{fieldset.name == :default ? 'display:none' : ''}")
+        contents << @template.content_tag(:legend, %(<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}).html_safe, style: fieldset.name == :default ? 'display:none' : '')
         contents << @template.content_tag(:p, fieldset.help) if fieldset.help.present?
         contents << fields.collect { |field| field_wrapper_for(field, nested_in) }.join
         contents.join.html_safe

data/app/helpers/rails_admin/main_helper.rb

@@ -63,7 +63,7 @@ module RailsAdmin
         filter_name = filter_for_field.keys.first
         filter_hash = filter_for_field.values.first
         unless (field = filterable_fields.find { |f| f.name == filter_name.to_sym })
-          fail "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
+          raise "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
         end
         case field.type
         when :enum

data/app/views/layouts/rails_admin/application.html.haml

@@ -3,6 +3,7 @@
   %head
     %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+    %meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
     %meta{content: "NONE,NOARCHIVE", name: "robots"}
     = csrf_meta_tag
     = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all

data/app/views/rails_admin/main/_delete_notice.html.haml

@@ -8,12 +8,17 @@
   - else
     = wording
   %ul
-    - @abstract_model.each_associated_children(object) do |association, child|
-      %li
-        - child_config = RailsAdmin.config(child)
-        = @abstract_model.model.human_attribute_name association.name
-        - wording = child.send(child_config.object_label_method)
-        - if child.id && (show_action = action(:show, child_config.abstract_model, child))
-          = link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id), class: 'pjax')
-        - else
-          = wording
+    - @abstract_model.each_associated_children(object) do |association, children|
+      - humanized_association = @abstract_model.model.human_attribute_name association.name
+      - limit = children.count > 12 ? 10 : children.count
+      - children.first(limit).each do |child|
+        = content_tag :li, class: dom_class(child) do
+          - child_config = RailsAdmin.config(child)
+          = humanized_association.singularize
+          - wording = child.send(child_config.object_label_method)
+          - if child.id && (show_action = action(:show, child_config.abstract_model, child))
+            = link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id), class: 'pjax')
+          - else
+            = wording
+      - if children.count > limit
+        %li= t('admin.misc.more', count: children.count - limit, models_name: humanized_association)

data/app/views/rails_admin/main/index.html.haml

@@ -51,9 +51,9 @@
       .input-group
         %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
         %span.input-group-btn
-          %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+          %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
             %i.icon-white.icon-refresh
-            = t("admin.misc.refresh")
+            = t('admin.misc.refresh')
           %button#remove_filter.btn.btn-info{title: "Reset filters"}
             %i.icon-white.icon-remove
       - if export_action

data/config/initializers/active_record_extensions.rb

@@ -6,11 +6,11 @@ if defined?(::ActiveRecord)
       end
 
       def rails_admin_default_object_label_method
-        self.new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
+        new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
       end
 
       def safe_send(value)
-        if self.has_attribute?(value)
+        if has_attribute?(value)
           read_attribute(value)
         else
           send(value)

data/config/locales/rails_admin.en.yml

@@ -44,6 +44,7 @@ en:
       navigation_static_label: "Links"
       log_out: "Log out"
       ago: "ago"
+      more: "Plus %{count} more %{models_name}"
     flash:
       successful: "%{name} successfully %{action}"
       error: "%{name} failed to be %{action}"

data/lib/rails_admin/abstract_model.rb

@@ -87,12 +87,11 @@ module RailsAdmin
         case association.type
         when :has_one
           if child = object.send(association.name)
-            yield(association, child)
+            yield(association, [child])
           end
         when :has_many
-          object.send(association.name).each do |child| # rubocop:disable ShadowingOuterLocalVariable
-            yield(association, child)
-          end
+          children = object.send(association.name)
+          yield(association, Array.new(children))
         end
       end
     end
@@ -147,7 +146,7 @@ module RailsAdmin
       end
 
       def build_statement_for_type
-        fail('You must override build_statement_for_type in your StatementBuilder')
+        raise('You must override build_statement_for_type in your StatementBuilder')
       end
 
       def build_statement_for_integer_decimal_or_float
@@ -185,11 +184,11 @@ module RailsAdmin
       end
 
       def unary_operators
-        fail('You must override unary_operators in your StatementBuilder')
+        raise('You must override unary_operators in your StatementBuilder')
       end
 
       def range_filter(_min, _max)
-        fail('You must override range_filter in your StatementBuilder')
+        raise('You must override range_filter in your StatementBuilder')
       end
 
       class FilteringDuration

data/lib/rails_admin/adapters/active_record.rb

@@ -6,7 +6,7 @@ require 'rails_admin/adapters/active_record/property'
 module RailsAdmin
   module Adapters
     module ActiveRecord
-      DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore, :geometry]
+      DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore, :geometry].freeze
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -56,8 +56,8 @@ module RailsAdmin
       def properties
         columns = model.columns.reject do |c|
           c.type.blank? ||
-          DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
-          c.try(:array)
+            DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
+            c.try(:array)
         end
         columns.collect do |property|
           Property.new(property, model)
@@ -99,11 +99,12 @@ module RailsAdmin
 
         def add(field, value, operator)
           field.searchable_columns.flatten.each do |column_infos|
-            if value.is_a?(Array)
-              value = value.map { |v| field.parse_value(v) }
-            else
-              value = field.parse_value(value)
-            end
+            value =
+              if value.is_a?(Array)
+                value.map { |v| field.parse_value(v) }
+              else
+                field.parse_value(value)
+              end
             statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator).to_statement
             @statements << statement if statement.present?
             @values << value1 unless value1.nil?
@@ -115,7 +116,7 @@ module RailsAdmin
 
         def build
           scope = @scope.where(@statements.join(' OR '), *@values)
-          scope = scope.references(*(@tables.uniq)) if @tables.any?
+          scope = scope.references(*@tables.uniq) if @tables.any?
           scope
         end
       end
@@ -154,6 +155,17 @@ module RailsAdmin
       protected
 
         def unary_operators
+          case @type
+          when :boolean
+            boolean_unary_operators
+          else
+            generic_unary_operators
+          end
+        end
+
+      private
+
+        def generic_unary_operators
           {
             '_blank' => ["(#{@column} IS NULL OR #{@column} = '')"],
             '_present' => ["(#{@column} IS NOT NULL AND #{@column} != '')"],
@@ -164,7 +176,14 @@ module RailsAdmin
           }
         end
 
-      private
+        def boolean_unary_operators
+          generic_unary_operators.merge(
+            '_blank' => ["(#{@column} IS NULL)"],
+            '_empty' => ["(#{@column} IS NULL)"],
+            '_present' => ["(#{@column} IS NOT NULL)"],
+            '_not_empty' => ["(#{@column} IS NOT NULL)"],
+          )
+        end
 
         def range_filter(min, max)
           if min && max
@@ -211,7 +230,7 @@ module RailsAdmin
             when 'ends_with'
               "%#{@value.downcase}"
             when 'is', '='
-              "#{@value.downcase}"
+              @value.downcase
             else
               return
             end

data/lib/rails_admin/adapters/mongoid.rb

@@ -8,7 +8,7 @@ require 'rails_admin/adapters/mongoid/bson'
 module RailsAdmin
   module Adapters
     module Mongoid
-      DISABLED_COLUMN_TYPES = %w(Range Moped::BSON::Binary BSON::Binary Mongoid::Geospatial::Point)
+      DISABLED_COLUMN_TYPES = %w(Range Moped::BSON::Binary BSON::Binary Mongoid::Geospatial::Point).freeze
 
       def parse_object_id(value)
         Bson.parse_object_id(value)
@@ -190,7 +190,7 @@ module RailsAdmin
         when String
           field_name, collection_name = options[:sort].split('.').reverse
           if collection_name && collection_name != table_name
-            fail('sorting by associated model column is not supported in Non-Relational databases')
+            raise('sorting by associated model column is not supported in Non-Relational databases')
           end
         when Symbol
           field_name = options[:sort].to_s

data/lib/rails_admin/adapters/mongoid/association.rb

@@ -28,7 +28,7 @@ module RailsAdmin
           when :has_and_belongs_to_many, :references_and_referenced_in_many
             :has_and_belongs_to_many
           else
-            fail("Unknown association type: #{macro.inspect}")
+            raise("Unknown association type: #{macro.inspect}")
           end
         end
 
@@ -83,7 +83,7 @@ module RailsAdmin
         def nested_options
           nested = nested_attributes_options.try { |o| o[name] }
           if !nested && [:embeds_one, :embeds_many].include?(macro.to_sym) && !association.cyclic
-            fail <<-MSG.gsub(/^\s+/, '')
+            raise <<-MSG.gsub(/^\s+/, '')
             Embbeded association without accepts_nested_attributes_for can't be handled by RailsAdmin,
             because embedded model doesn't have top-level access.
             Please add `accepts_nested_attributes_for :#{association.name}' line to `#{model}' model.

data/lib/rails_admin/adapters/mongoid/extension.rb

@@ -16,7 +16,7 @@ module RailsAdmin
         end
 
         def rails_admin_default_object_label_method
-          self.new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
+          new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
         end
 
         def safe_send(value)

data/lib/rails_admin/adapters/mongoid/property.rb

@@ -2,7 +2,7 @@ module RailsAdmin
   module Adapters
     module Mongoid
       class Property
-        STRING_TYPE_COLUMN_NAMES = [:name, :title, :subject]
+        STRING_TYPE_COLUMN_NAMES = [:name, :title, :subject].freeze
         attr_reader :property, :model
 
         def initialize(property, model)

data/lib/rails_admin/bootstrap-sass.rb

@@ -14,15 +14,13 @@ module RailsAdmin
       require 'sass-rails' if rails?
 
       unless rails? || compass?
-        fail(Bootstrap::FrameworkNotFound.new('bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'))
+        raise(Bootstrap::FrameworkNotFound.new('bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'))
       end
 
       stylesheets = File.expand_path(File.join('..', 'vendor', 'assets', 'stylesheets'))
       ::Sass.load_paths << stylesheets
     end
 
-  private
-
     def self.asset_pipeline?
       defined?(::Sprockets)
     end

data/lib/rails_admin/bootstrap-sass/compass_functions.rb

@@ -8,7 +8,7 @@ module Sass
           image_url(source, Sass::Script::Bool.new(true))
         else
           # Revert to the old compass-agnostic path determination
-          asset_sans_quotes = source.value.gsub('"', '')
+          asset_sans_quotes = source.value.delete('"')
           Sass::Script::String.new("/images/#{asset_sans_quotes}", :string)
         end
       end

data/lib/rails_admin/config.rb

@@ -110,11 +110,13 @@ module RailsAdmin
       def audit_with(*args, &block)
         extension = args.shift
         if extension
+          klass = RailsAdmin::AUDITING_ADAPTERS[extension]
+          klass.setup if klass.respond_to? :setup
           @audit = proc do
-            @auditing_adapter = RailsAdmin::AUDITING_ADAPTERS[extension].new(*([self] + args).compact)
+            @auditing_adapter = klass.new(*([self] + args).compact)
           end
-        else
-          @audit = block if block
+        elsif block
+          @audit = block
         end
         @audit || DEFAULT_AUDIT
       end
@@ -145,11 +147,13 @@ module RailsAdmin
       def authorize_with(*args, &block)
         extension = args.shift
         if extension
+          klass = RailsAdmin::AUTHORIZATION_ADAPTERS[extension]
+          klass.setup if klass.respond_to? :setup
           @authorize = proc do
-            @authorization_adapter = RailsAdmin::AUTHORIZATION_ADAPTERS[extension].new(*([self] + args).compact)
+            @authorization_adapter = klass.new(*([self] + args).compact)
           end
-        else
-          @authorize = block if block
+        elsif block
+          @authorize = block
         end
         @authorize || DEFAULT_AUTHORIZE
       end
@@ -193,7 +197,7 @@ module RailsAdmin
         if %w(default like starts_with ends_with is =).include? operator
           @default_search_operator = operator
         else
-          fail(ArgumentError.new("Search operator '#{operator}' not supported"))
+          raise(ArgumentError.new("Search operator '#{operator}' not supported"))
         end
       end
 
@@ -283,7 +287,7 @@ module RailsAdmin
         @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil
-        @parent_controller = '::ApplicationController'
+        @parent_controller = '::ActionController::Base'
         RailsAdmin::Config::Actions.reset
       end
 

data/lib/rails_admin/config/actions.rb

@@ -96,7 +96,7 @@ module RailsAdmin
           action.instance_eval(&block) if block
           @@actions ||= []
           if action.custom_key.in?(@@actions.collect(&:custom_key))
-            fail "Action #{action.custom_key} already exists. Please change its custom key."
+            raise "Action #{action.custom_key} already exists. Please change its custom key."
           else
             @@actions << action
           end

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

@@ -115,12 +115,11 @@ module RailsAdmin
 
         # Breadcrumb parent
         register_instance_option :breadcrumb_parent do
-          case
-          when root?
+          if root?
             [:dashboard]
-          when collection?
+          elsif collection?
             [:index, bindings[:abstract_model]]
-          when member?
+          elsif member?
             [:show, bindings[:abstract_model], bindings[:object]]
           end
         end