rails_admin 0.6.0 → 0.6.1

data/lib/rails_admin/config/has_groups.rb

@@ -8,15 +8,17 @@ module RailsAdmin
       # If group with given name does not yet exist it will be created. If a
       # block is passed it will be evaluated in the context of the group
       def group(name, &block)
-        group = parent.groups.find {|g| name == g.name }
+        group = parent.groups.detect { |g| name == g.name }
         group ||= (parent.groups << RailsAdmin::Config::Fields::Group.new(self, name)).last
-        group.tap{|g| g.section = self}.instance_eval &block if block
+        group.tap { |g| g.section = self }.instance_eval(&block) if block
         group
       end
 
       # Reader for groups that are marked as visible
       def visible_groups
-        parent.groups.map {|f| f.section = self; f.with(bindings) }.select(&:visible?).select{|g| g.visible_fields.present?}
+        parent.groups.collect { |f| f.section = self; f.with(bindings) }.select(&:visible?).select do |g| # rubocop:disable Semicolon
+          g.visible_fields.present?
+        end
       end
     end
   end

data/lib/rails_admin/config/hideable.rb

@@ -11,12 +11,12 @@ module RailsAdmin
 
       # Reader whether object is hidden.
       def hidden?
-        not visible
+        !visible
       end
 
       # 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/lazy_model.rb

@@ -9,7 +9,7 @@ module RailsAdmin
       end
 
       def method_missing(method, *args, &block)
-        if !@model
+        unless @model
           @model = RailsAdmin::Config::Model.new(@entity)
           @model.instance_eval(&@deferred_block) if @deferred_block
         end

data/lib/rails_admin/config/model.rb

@@ -9,7 +9,6 @@ require 'rails_admin/config/has_fields'
 require 'rails_admin/config/sections'
 require 'rails_admin/config/actions'
 
-
 module RailsAdmin
   module Config
     # Model specific configuration object.
@@ -36,11 +35,11 @@ module RailsAdmin
             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")} } ]
+        @groups = [RailsAdmin::Config::Fields::Group.new(self, :default).tap { |g| g.label { I18n.translate('admin.form.basic_info') } }]
       end
 
       def excluded?
-        @excluded ||= !RailsAdmin::AbstractModel.all.map(&:model_name).include?(abstract_model.try(:model_name))
+        @excluded ||= !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
       end
 
       def object_label
@@ -52,7 +51,7 @@ module RailsAdmin
       # any methods that may have been added to the label_methods array via Configuration.
       # Failing all of these, it'll return the class name followed by the model's id.
       register_instance_option :object_label_method do
-        @object_label_method ||= Config.label_methods.find { |method| (@dummy_object ||= abstract_model.model.new).respond_to? method } || :rails_admin_default_object_label_method
+        @object_label_method ||= Config.label_methods.detect { |method| (@dummy_object ||= abstract_model.model.new).respond_to? method } || :rails_admin_default_object_label_method
       end
 
       register_instance_option :label do
@@ -60,7 +59,7 @@ module RailsAdmin
       end
 
       register_instance_option :label_plural do
-        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:count => Float::INFINITY, :default => label.pluralize)
+        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(count: Float::INFINITY, default: label.pluralize)
       end
 
       def pluralize(count)
@@ -93,12 +92,12 @@ module RailsAdmin
       # Act as a proxy for the base section configuration that actually
       # store the configurations.
       def method_missing(m, *args, &block)
-        self.send(:base).send(m, *args, &block)
+        send(:base).send(m, *args, &block)
       end
 
       def inspect
         "#<#{self.class.name}[#{abstract_model.model.name}] #{
-          instance_variables.map do |v|
+          instance_variables.collect do |v|
             value = instance_variable_get(v)
             if [:@parent, :@root].include? v
               if value.respond_to? :name

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

@@ -1,10 +1,8 @@
 module RailsAdmin
   module Config
     module Proxyable
-
       class Proxy
-
-        instance_methods.each {|m| undef_method m unless m =~ /^(__|instance_eval|object_id)/ }
+        instance_methods.each { |m| undef_method m unless m =~ /^(__|instance_eval|object_id)/ }
 
         attr_reader :bindings
 
@@ -25,12 +23,12 @@ module RailsAdmin
 
         def method_missing(name, *args, &block)
           if @object.respond_to?(name)
-            reset = @object.instance_variable_get("@bindings")
+            reset = @object.instance_variable_get('@bindings')
             begin
-              @object.instance_variable_set("@bindings", @bindings)
+              @object.instance_variable_set('@bindings', @bindings)
               response = @object.__send__(name, *args, &block)
             ensure
-              @object.instance_variable_set("@bindings", reset)
+              @object.instance_variable_set('@bindings', reset)
             end
             response
           else

data/lib/rails_admin/config/sections.rb

@@ -9,7 +9,6 @@ require 'rails_admin/config/sections/list'
 require 'rails_admin/config/sections/export'
 require 'rails_admin/config/sections/show'
 
-
 module RailsAdmin
   module Config
     # Sections describe different views in the RailsAdmin engine. Configurable sections are
@@ -28,7 +27,7 @@ module RailsAdmin
           klass.send(:define_method, name) do |&block|
             @sections = {} unless @sections
             @sections[name] = section.new(self) unless @sections[name]
-            @sections[name].instance_eval &block if block
+            @sections[name].instance_eval(&block) if block
             @sections[name]
           end
         end
@@ -36,4 +35,3 @@ module RailsAdmin
     end
   end
 end
-

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

@@ -26,7 +26,7 @@ module RailsAdmin
 
         def inspect
           "#<#{self.class.name} #{
-            instance_variables.map do |v|
+            instance_variables.collect do |v|
               value = instance_variable_get(v)
               if [:@parent, :@root, :@abstract_model].include? v
                 if value.respond_to? :name

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

@@ -21,6 +21,10 @@ module RailsAdmin
         register_instance_option :sort_reverse? do
           true # By default show latest first
         end
+
+        register_instance_option :scopes do
+          []
+        end
       end
     end
   end

data/lib/rails_admin/engine.rb

@@ -15,7 +15,7 @@ SafeYAML::OPTIONS[:default_mode] = :unsafe
 module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
-    initializer "RailsAdmin precompile hook", :group => :all do |app|
+    initializer 'RailsAdmin precompile hook', group: :all do |app|
       app.config.assets.precompile += %w[
         rails_admin/rails_admin.js
         rails_admin/rails_admin.css
@@ -24,12 +24,12 @@ module RailsAdmin
       ]
     end
 
-    initializer "RailsAdmin pjax hook" do |app|
+    initializer 'RailsAdmin pjax hook' do |app|
       app.config.middleware.use Rack::Pjax
     end
 
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+      Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
     end
   end
 end

data/lib/rails_admin/extension.rb

@@ -14,15 +14,15 @@ module RailsAdmin
 
     EXTENSIONS << extension_key
 
-    if(authorization = options[:authorization])
+    if options[:authorization]
       AUTHORIZATION_ADAPTERS[extension_key] = extension_definition::AuthorizationAdapter
     end
 
-    if(configuration = options[:configuration])
+    if options[:configuration]
       CONFIGURATION_ADAPTERS[extension_key] = extension_definition::ConfigurationAdapter
     end
 
-    if(configuration = options[:auditing])
+    if options[:auditing]
       AUDITING_ADAPTERS[extension_key] = extension_definition::AuditingAdapter
     end
   end

data/lib/rails_admin/extensions/cancan.rb

@@ -1,5 +1,5 @@
 require 'rails_admin/extensions/cancan/authorization_adapter'
 
-RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCan, {
-  :authorization => true
-})
+RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCan,
+                         authorization: true
+)

data/lib/rails_admin/extensions/cancan/authorization_adapter.rb

@@ -44,7 +44,7 @@ module RailsAdmin
           @controller.current_ability.attributes_for(action, abstract_model && abstract_model.model)
         end
 
-        private
+      private
 
         module ControllerExtension
           def current_ability

data/lib/rails_admin/extensions/history.rb

@@ -1,5 +1,5 @@
 require 'rails_admin/extensions/history/auditing_adapter'
 
-RailsAdmin.add_extension(:history, RailsAdmin::Extensions::History, {
-  :auditing => true
-})
+RailsAdmin.add_extension(:history, RailsAdmin::Extensions::History,
+                         auditing: true
+)

data/lib/rails_admin/extensions/history/auditing_adapter.rb

@@ -17,7 +17,7 @@ module RailsAdmin
         end
 
         def update_object(object, model, user, changes)
-          ::RailsAdmin::History.create_history_item(changes.map{|k,v| "#{k}: #{v.map(&:inspect).join(' -> ')}"}, object, model, user)
+          ::RailsAdmin::History.create_history_item(changes.collect { |k, v| "#{k}: #{v.collect(&:inspect).join(' -> ')}" }, object, model, user)
         end
 
         def create_object(object, model, user)

data/lib/rails_admin/extensions/history/history.rb

@@ -10,32 +10,33 @@ class RailsAdmin::History < ActiveRecord::Base
   default_scope { order('id DESC') }
 
   def self.latest
-    self.limit(100)
+    limit(100)
   end
 
   def self.create_history_item(message, object, abstract_model, user)
     create(
-       :message => [message].flatten.join(', '),
-       :item => object.id,
-       :table => abstract_model.to_s,
-       :username => user.try(:email)
+       message: [message].flatten.join(', '),
+       item: object.id,
+       table: abstract_model.to_s,
+       username: user.try(:email)
      )
   end
 
   def self.history_for_model(abstract_model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
-    history = where(:table => abstract_model.to_s)
+    history = where(table: abstract_model.to_s)
     history_for_model_or_object(history, abstract_model, query, sort, sort_reverse, all, page, per_page)
   end
 
   def self.history_for_object(abstract_model, object, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
-    history = where(:table => abstract_model.to_s, :item => object.id)
+    history = where(table: abstract_model.to_s, item: object.id)
     history_for_model_or_object(history, abstract_model, query, sort, sort_reverse, all, page, per_page)
   end
 
-  protected
+protected
+
   def self.history_for_model_or_object(history, abstract_model, query, sort, sort_reverse, all, page, per_page)
-    history = history.where("message LIKE ? OR username LIKE ?", "%#{query}%", "%#{query}%") if query
-    history = history.order(sort_reverse == "true" ? "#{sort} DESC" : sort) if sort
-    all ? history : history.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
+    history = history.where('message LIKE ? OR username LIKE ?', "%#{query}%", "%#{query}%") if query
+    history = history.order(sort_reverse == 'true' ? "#{sort} DESC" : sort) if sort
+    all ? history : history.send(Kaminari.config.page_method_name, page.presence || '1').per(per_page)
   end
 end

data/lib/rails_admin/extensions/paper_trail.rb

@@ -1,5 +1,5 @@
 require 'rails_admin/extensions/paper_trail/auditing_adapter'
 
-RailsAdmin.add_extension(:paper_trail, RailsAdmin::Extensions::PaperTrail, {
-  :auditing => true
-})
+RailsAdmin.add_extension(:paper_trail, RailsAdmin::Extensions::PaperTrail,
+                         auditing: true
+)

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -9,7 +9,7 @@ module RailsAdmin
 
         def message
           @message = @version.event
-          @version.respond_to?(:changeset) ? @message + " [" + @version.changeset.to_a.collect {|c| c[0] + " = " + c[1][1].to_s}.join(", ") + "]" : @message
+          @version.respond_to?(:changeset) && @version.changeset.present? ? @message + ' [' + @version.changeset.to_a.collect { |c| c[0] + ' = ' + c[1][1].to_s }.join(', ') + ']' : @message
         end
 
         def created_at
@@ -31,21 +31,31 @@ module RailsAdmin
 
       class AuditingAdapter
         COLUMN_MAPPING = {
-          :table => :item_type,
-          :username => :whodunnit,
-          :item => :item_id,
-          :created_at => :created_at,
-          :message => :event
+          table: :item_type,
+          username: :whodunnit,
+          item: :item_id,
+          created_at: :created_at,
+          message: :event
         }
 
-        def initialize(controller, user_class = User)
-          raise "PaperTrail not found" unless defined?(PaperTrail)
+        def initialize(controller, user_class = 'User', version_class = '::Version')
+          fail('PaperTrail not found') unless defined?(PaperTrail)
           @controller = controller
-          @user_class = user_class.to_s.constantize
+          begin
+            @user_class = user_class.to_s.constantize
+          rescue NameError
+            raise "Please set up Papertrail's user model explicitely. Ex: config.audit_with :paper_trail, 'User'"
+          end
+
+          begin
+            @version_class = version_class.to_s.constantize
+          rescue NameError
+            raise "Please set up Papertrail's version model explicitely. Ex: config.audit_with :paper_trail, 'User', 'PaperTrail::Version'"
+          end
         end
 
         def latest
-          ::Version.limit(100).map{|version| VersionProxy.new(version, @user_class)}
+          @version_class.order('id DESC').limit(100).collect { |version| VersionProxy.new(version, @user_class) }
         end
 
         def delete_object(object, model, user)
@@ -61,27 +71,28 @@ module RailsAdmin
         end
 
         def listing_for_model(model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
-          listing_for_model_or_object(model, object=nil, query, sort, sort_reverse, all, page, per_page)
+          listing_for_model_or_object(model, nil, query, sort, sort_reverse, all, page, per_page)
         end
 
         def listing_for_object(model, object, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
           listing_for_model_or_object(model, object, query, sort, sort_reverse, all, page, per_page)
         end
 
-        protected
+      protected
+
         def listing_for_model_or_object(model, object, query, sort, sort_reverse, all, page, per_page)
           if sort.present?
             sort = COLUMN_MAPPING[sort.to_sym]
           else
             sort = :created_at
-            sort_reverse = "true"
+            sort_reverse = 'true'
           end
-          versions = ::Version.where :item_type => model.model.name
-          versions = versions.where :item_id => object.id if object
-          versions = versions.where("event LIKE ?", "%#{query}%") if query.present?
-          versions = versions.order(sort_reverse == "true" ? "#{sort} DESC" : sort)
-          versions = all ? versions : versions.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
-          versions.map{|version| VersionProxy.new(version, @user_class)}
+          versions = @version_class.where item_type: model.model.name
+          versions = versions.where item_id: object.id if object
+          versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
+          versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
+          versions = all ? versions : versions.send(Kaminari.config.page_method_name, page.presence || '1').per(per_page)
+          versions.collect { |version| VersionProxy.new(version, @user_class) }
         end
       end
     end

data/lib/rails_admin/i18n_support.rb

@@ -3,39 +3,35 @@ require 'i18n'
 module RailsAdmin
   module I18nSupport
     def abbr_day_names
-      begin
-        I18n.t('date.abbr_day_names', :raise => true)
-      rescue I18n::ArgumentError
-        I18n.t('date.abbr_day_names', :locale => :en)
-      end
+      I18n.t('date.abbr_day_names', raise: true)
+    rescue I18n::ArgumentError
+      I18n.t('date.abbr_day_names', locale: :en)
     end
 
     def abbr_month_names
       begin
-        names = I18n.t('date.abbr_month_names', :raise => true)
+        names = I18n.t('date.abbr_month_names', raise: true)
       rescue I18n::ArgumentError
-        names = I18n.t('date.abbr_month_names', :locale => :en)
+        names = I18n.t('date.abbr_month_names', locale: :en)
       end
       names[1..-1]
     end
 
     def date_format
-      I18n.t('date.formats.default', :default => I18n.t('date.formats.default', :locale => :en))
+      I18n.t('date.formats.default', default: I18n.t('date.formats.default', locale: :en))
     end
 
     def day_names
-      begin
-        I18n.t('date.day_names', :raise => true)
-      rescue I18n::ArgumentError
-        I18n.t('date.day_names', :locale => :en)
-      end
+      I18n.t('date.day_names', raise: true)
+    rescue I18n::ArgumentError
+      I18n.t('date.day_names', locale: :en)
     end
 
     def month_names
       begin
-        names = I18n.t('date.month_names', :raise => true)
+        names = I18n.t('date.month_names', raise: true)
       rescue I18n::ArgumentError
-        names = I18n.t('date.month_names', :locale => :en)
+        names = I18n.t('date.month_names', locale: :en)
       end
       names[1..-1]
     end