rails_admin 0.6.0 → 0.6.1

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

@@ -17,7 +17,7 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             @general = true
             @history = @auditing_adapter && @auditing_adapter.listing_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
 

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

@@ -17,7 +17,7 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             @general = false
             @history = @auditing_adapter && @auditing_adapter.listing_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
 

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

@@ -26,36 +26,46 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             @objects ||= list_entries
 
+            unless @model_config.list.scopes.empty?
+              if params[:scope].blank?
+                unless @model_config.list.scopes.first.nil?
+                  @objects = @objects.send(@model_config.list.scopes.first)
+                end
+              elsif @model_config.list.scopes.collect(&:to_s).include?(params[:scope])
+                @objects = @objects.send(params[:scope].to_sym)
+              end
+            end
+
             respond_to do |format|
 
               format.html do
-                render @action.template_name, :status => (flash[:error].present? ? :not_found : 200)
+                render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
               end
 
               format.json do
                 output = if params[:compact]
                   primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
                   label_method = @model_config.object_label_method
-                  @objects.map{ |o| { :id => o.send(primary_key_method).to_s, :label => o.send(label_method).to_s } }
+                  @objects.collect { |o| {id: o.send(primary_key_method).to_s, label: o.send(label_method).to_s} }
                 else
                   @objects.to_json(@schema)
                 end
                 if params[:send_data]
-                  send_data output, :filename => "#{params[:model_name]}_#{DateTime.now.strftime("%Y-%m-%d_%Hh%Mm%S")}.json"
+                  send_data output, filename: "#{params[:model_name]}_#{DateTime.now.strftime("%Y-%m-%d_%Hh%Mm%S")}.json"
                 else
-                  render :json => output, :root => false
+                  render json: output, root: false
                 end
               end
 
               format.xml do
                 output = @objects.to_xml(@schema)
                 if params[:send_data]
-                  send_data output, :filename => "#{params[:model_name]}_#{DateTime.now.strftime("%Y-%m-%d_%Hh%Mm%S")}.xml"
+                  send_data output, filename: "#{params[:model_name]}_#{DateTime.now.strftime("%Y-%m-%d_%Hh%Mm%S")}.xml"
                 else
-                  render :xml => output
+                  render xml: output
                 end
               end
 
@@ -63,10 +73,10 @@ module RailsAdmin
                 header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options])
                 if params[:send_data]
                   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"
+                            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"
                 else
-                  render :text => output
+                  render text: output
                 end
               end
 
@@ -75,7 +85,6 @@ module RailsAdmin
           end
         end
 
-
         register_instance_option :link_icon do
           'icon-th-list'
         end

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

@@ -14,7 +14,7 @@ module RailsAdmin
 
         register_instance_option :controller do
 
-          Proc.new do
+          proc do
 
             if request.get? # NEW
 
@@ -27,7 +27,7 @@ module RailsAdmin
               end
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, :layout => false }
+                format.js   { render @action.template_name, layout: false }
               end
 
             elsif request.post? # CREATE
@@ -46,7 +46,7 @@ module RailsAdmin
                 @auditing_adapter && @auditing_adapter.create_object(@object, @abstract_model, _current_user)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js   { render :json => { :id => @object.id.to_s, :label => @model_config.with(:object => @object).object_label } }
+                  format.js   { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
                 end
               else
                 handle_save_error

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

@@ -17,9 +17,9 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             respond_to do |format|
-              format.json { render :json => @object }
+              format.json { render json: @object }
               format.html { render @action.template_name }
             end
           end

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

@@ -13,7 +13,7 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             redirect_to main_app.url_for(@object)
           end
         end

data/lib/rails_admin/config/configurable.rb

@@ -7,19 +7,19 @@ module RailsAdmin
         base.send :extend, ClassMethods
       end
 
-      def has_option?(name)
-        options = self.class.instance_variable_get("@config_options")
-        options && options.has_key?(name)
+      def has_option?(name) # rubocop:disable PredicateName
+        options = self.class.instance_variable_get('@config_options')
+        options && options.key?(name)
       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
 
-      def register_deprecated_instance_option(option_name, replacement_option_name=nil, &custom_error)
-        scope = class << self; self; end;
+      def register_deprecated_instance_option(option_name, replacement_option_name = nil, &custom_error)
+        scope = class << self; self; end
         self.class.register_deprecated_instance_option(option_name, replacement_option_name, scope, &custom_error)
       end
 
@@ -28,14 +28,14 @@ module RailsAdmin
         # 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)
-          options = scope.instance_variable_get("@config_options") ||
-                      scope.instance_variable_set("@config_options", {})
+          options = scope.instance_variable_get('@config_options') ||
+                      scope.instance_variable_set('@config_options', {})
 
           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.end_with?("?")
+          if option_name.end_with?('?')
             scope.send(:define_method, "#{option_name.chop!}?") do
               send(option_name)
             end
@@ -50,27 +50,27 @@ module RailsAdmin
               # Invocation without args nor block --> It's the use of the option, i.e. getter
               value = instance_variable_get("@#{option_name}_registered")
               case value
-                when Proc
-                  # Track recursive invocation with an instance variable. This prevents run-away recursion
-                  # and allows configurations such as
-                  # label { "#{label}".upcase }
-                  # This will use the default definition when called recursively.
-                  if instance_variable_get("@#{option_name}_recurring")
-                    value = instance_eval &default
-                  else
-                    instance_variable_set("@#{option_name}_recurring", true)
-                    value = instance_eval &value
-                    instance_variable_set("@#{option_name}_recurring", false)
-                  end
-                when nil
-                  value = instance_eval &default
+              when Proc
+                # Track recursive invocation with an instance variable. This prevents run-away recursion
+                # and allows configurations such as
+                # label { "#{label}".upcase }
+                # This will use the default definition when called recursively.
+                if instance_variable_get("@#{option_name}_recurring")
+                  value = instance_eval(&default)
+                else
+                  instance_variable_set("@#{option_name}_recurring", true)
+                  value = instance_eval(&value)
+                  instance_variable_set("@#{option_name}_recurring", false)
+                end
+              when nil
+                value = instance_eval(&default)
               end
               value
             end
           end
         end
 
-        def register_deprecated_instance_option(option_name, replacement_option_name=nil, scope = self)
+        def register_deprecated_instance_option(option_name, replacement_option_name = nil, scope = self)
           scope.send(:define_method, option_name) do |*args, &block|
             if replacement_option_name
               ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
@@ -79,7 +79,7 @@ module RailsAdmin
               if block_given?
                 yield
               else
-                raise "The #{option_name} configuration option is removed without replacement."
+                fail("The #{option_name} configuration option is removed without replacement.")
               end
             end
           end
@@ -89,8 +89,8 @@ module RailsAdmin
         # 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 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/rails_admin/config/fields.rb

@@ -8,8 +8,8 @@ module RailsAdmin
       mattr_reader :default_factory
       @@default_factory = lambda do |parent, properties, fields|
         # If it's an association
-        if properties.has_key?(:model_proc)
-          association = parent.abstract_model.associations.find {|a| a[:name].to_s == properties[:name].to_s}
+        if properties.key?(:model_proc)
+          association = parent.abstract_model.associations.detect { |a| a[:name].to_s == properties[:name].to_s }
           field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : properties[:type]}_association").new(parent, properties[:name], association)
         else
           field = RailsAdmin::Config::Fields::Types.load(properties[:type]).new(parent, properties[:name], properties)
@@ -49,17 +49,17 @@ module RailsAdmin
 
         parent.abstract_model.properties.each do |properties|
           # Unless a previous factory has already loaded current field as well
-          unless fields.find {|f| f.name == properties[:name] }
+          unless fields.detect { |f| f.name == properties[:name] }
             # Loop through factories until one returns true
-            @@registry.find {|factory| factory.call(parent, properties, fields) }
+            @@registry.detect { |factory| factory.call(parent, properties, fields) }
           end
         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.select { |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
-          unless fields.find {|f| f.name == association[:name] }
+          unless fields.detect { |f| f.name == association[:name] }
             # Loop through factories until one returns true
-            @@registry.find {|factory| factory.call(parent, association, fields) }
+            @@registry.detect { |factory| factory.call(parent, association, fields) }
           end
         end
         fields

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

@@ -5,24 +5,23 @@ module RailsAdmin
   module Config
     module Fields
       class Association < RailsAdmin::Config::Fields::Base
-
         def self.inherited(klass)
           super(klass)
         end
 
         # Reader for the association information hash
-        def association
+        def association # rubocop:disable TrivialAccessors
           @properties
         end
 
         register_instance_option :pretty_value do
           v = bindings[:view]
-          [value].flatten.select(&:present?).map do |associated|
+          [value].flatten.select(&:present?).collect do |associated|
             amc = polymorphic? ? RailsAdmin.config(associated) : associated_model_config # perf optimization for non-polymorphic associations
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
             can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
-            can_see ? v.link_to(wording, v.url_for(:action => show_action.action_name, :model_name => am.to_param, :id => associated.id), :class => 'pjax') : wording
+            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : wording
           end.to_sentence.html_safe
         end
 
@@ -30,7 +29,7 @@ module RailsAdmin
         # association checks whether the child model is excluded in
         # configuration or not.
         register_instance_option :visible? do
-          @visible ||= !self.associated_model_config.excluded?
+          @visible ||= !associated_model_config.excluded?
         end
 
         # use the association name as a key, not the association key anymore!
@@ -41,8 +40,8 @@ module RailsAdmin
         # scope for possible associable records
         register_instance_option :associated_collection_scope do
           # bindings[:object] & bindings[:controller] available
-          associated_collection_scope_limit = (self.associated_collection_cache_all ? nil : 30)
-          Proc.new do |scope|
+          associated_collection_scope_limit = (associated_collection_cache_all ? nil : 30)
+          proc do |scope|
             scope.limit(associated_collection_scope_limit)
           end
         end

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

@@ -71,16 +71,16 @@ module RailsAdmin
 
         # list of columns I should search for that field [{ :column => 'table_name.column', :type => field.type }, {..}]
         register_instance_option :searchable_columns do
-          @searchable_columns ||= case self.searchable
+          @searchable_columns ||= case searchable
           when true
-            [{ :column => "#{self.abstract_model.table_name}.#{self.name}", :type => self.type }]
+            [{column: "#{abstract_model.table_name}.#{name}", type: type}]
           when false
             []
           when :all # valid only for associations
-            table_name = self.associated_model_config.abstract_model.table_name
-            self.associated_model_config.list.fields.map { |f| { :column => "#{table_name}.#{f.name}", :type => f.type } }
+            table_name = associated_model_config.abstract_model.table_name
+            associated_model_config.list.fields.collect { |f| {column: "#{table_name}.#{f.name}", type: f.type} }
           else
-            [self.searchable].flatten.map do |f|
+            [searchable].flatten.collect do |f|
               if f.is_a?(String) && f.include?('.')                            #  table_name.column
                 table_name, column = f.split '.'
                 type = nil
@@ -88,17 +88,17 @@ module RailsAdmin
                 am = f.keys.first.is_a?(Class) && AbstractModel.new(f.keys.first)
                 table_name = am && am.table_name || f.keys.first
                 column = f.values.first
-                property = am && am.properties.find{ |p| p[:name] == f.values.first.to_sym }
+                property = am && am.properties.detect { |p| p[:name] == f.values.first.to_sym }
                 type = property && property[:type]
               else                                                             #  <attribute|column>
-                am = (self.association? ? self.associated_model_config.abstract_model : self.abstract_model)
+                am = (self.association? ? associated_model_config.abstract_model : abstract_model)
                 table_name = am.table_name
                 column = f
-                property = am.properties.find{ |p| p[:name] == f.to_sym }
+                property = am.properties.detect { |p| p[:name] == f.to_sym }
                 type = property && property[:type]
               end
 
-              { :column => "#{table_name}.#{column}", :type => (type || :string) }
+              {column: "#{table_name}.#{column}", type: (type || :string)}
             end
           end
         end
@@ -117,7 +117,6 @@ module RailsAdmin
           pretty_value
         end
 
-
         # Accessor for field's help text displayed below input field.
         register_instance_option :help do
           (@help ||= {})[::I18n.locale] ||= generic_field_help
@@ -139,7 +138,7 @@ module RailsAdmin
         end
 
         register_instance_option :hint do
-          (@hint ||= "")
+          (@hint ||= '')
         end
 
         # Accessor for field's maximum length per database.
@@ -152,8 +151,7 @@ module RailsAdmin
         # Accessor for field's length restrictions per validations
         #
         register_instance_option :valid_length do
-          @valid_length ||= abstract_model.model.validators_on(name).find{|v|
-            v.kind == :length }.try{|v| v.options} || {}
+          @valid_length ||= abstract_model.model.validators_on(name).detect { |v| v.kind == :length }.try { |v| v.options } || {}
         end
 
         register_instance_option :partial do
@@ -164,12 +162,16 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :required? do
-          context = (bindings && bindings[:object] ? (bindings[:object].persisted? ? :update : :create) : :nil)
-          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.find do |column_name|
-            !!abstract_model.model.validators_on(column_name).find do |v|
-              !v.options[:allow_nil] and
-              [:presence, :numericality, :attachment_presence].include?(v.kind) and
-              (v.options[:on] == context or v.options[:on].blank?)
+          context = if bindings && bindings[:object]
+            bindings[:object].persisted? ? :update : :create
+          else
+            :nil
+          end
+          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name|
+            !!abstract_model.model.validators_on(column_name).detect do |v|
+              !v.options[:allow_nil] &&
+              [:presence, :numericality, :attachment_presence].include?(v.kind) &&
+              (v.options[:on] == context || v.options[:on].blank?)
             end
           end
         end
@@ -186,7 +188,7 @@ module RailsAdmin
         end
 
         register_instance_option :read_only? do
-          not editable?
+          !editable?
         end
 
         # init status in the view
@@ -198,7 +200,7 @@ module RailsAdmin
           returned = true
           (RailsAdmin.config.default_hidden_fields || {}).each do |section, fields|
             if self.section.is_a?("RailsAdmin::Config::Sections::#{section.to_s.camelize}".constantize)
-              returned = false if fields.include?(self.name)
+              returned = false if fields.include?(name)
             end
           end
           returned
@@ -210,7 +212,7 @@ module RailsAdmin
         end
 
         register_instance_option :render do
-          bindings[:view].render :partial => "rails_admin/main/#{partial}", :locals => {:field => self, :form => bindings[:form] }
+          bindings[:view].render partial: "rails_admin/main/#{partial}", locals: {field: self, form: bindings[:form]}
         end
 
         def editable?
@@ -224,7 +226,7 @@ module RailsAdmin
 
         # Reader for validation errors of the bound object
         def errors
-          ([name] + children_fields).uniq.map do |column_name|
+          ([name] + children_fields).uniq.collect do |column_name|
             bindings[:object].errors[column_name]
           end.uniq.flatten
         end
@@ -233,7 +235,7 @@ module RailsAdmin
         #
         # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional?
-          not required?
+          !required?
         end
 
         # Inverse accessor whether this field is required.
@@ -241,7 +243,7 @@ module RailsAdmin
         # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional(state = nil, &block)
           if !state.nil? || block
-            required state.nil? ? proc { false == (instance_eval &block) } : false == state
+            required state.nil? ? proc { false == (instance_eval(&block)) } : false == state
           else
             optional?
           end
@@ -275,13 +277,13 @@ module RailsAdmin
         end
 
         def generic_help
-          (required? ? I18n.translate("admin.form.required") : I18n.translate("admin.form.optional")) + '. '
+          (required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '
         end
 
         def generic_field_help
           model = abstract_model.model_name.underscore
           model_lookup = "admin.help.#{model}.#{name}".to_sym
-          translated = I18n.translate(model_lookup, :help => generic_help, :default => [generic_help])
+          translated = I18n.translate(model_lookup, help: generic_help, default: [generic_help])
           (translated.is_a?(Hash) ? translated.to_a.first[1] : translated).html_safe
         end
 
@@ -298,16 +300,16 @@ module RailsAdmin
         end
 
         def form_default_value
-          (self.default_value if bindings[:object].new_record? && self.value.nil? && !self.default_value.nil?)
+          (default_value if bindings[:object].new_record? && value.nil? && !default_value.nil?)
         end
 
         def form_value
-          self.form_default_value.nil? ? self.formatted_value : self.form_default_value
+          form_default_value.nil? ? formatted_value : form_default_value
         end
 
         def inspect
           "#<#{self.class.name}[#{name}] #{
-            instance_variables.map do |v|
+            instance_variables.collect do |v|
               value = instance_variable_get(v)
               if [:@parent, :@root, :@section, :@children_fields_registered,
                   :@associated_model_config, :@group, :@bindings].include? v