rails_admin 0.6.0 → 0.6.1

data/app/helpers/rails_admin/main_helper.rb

@@ -3,16 +3,16 @@ require 'builder'
 module RailsAdmin
   module MainHelper
     def rails_admin_form_for(*args, &block)
-      options = args.extract_options!.reverse_merge(:builder => RailsAdmin::FormBuilder)
+      options = args.extract_options!.reverse_merge(builder: RailsAdmin::FormBuilder)
       form_for(*(args << options), &block) << after_nested_form_callbacks
     end
 
     def get_indicator(percent)
-      return "" if percent < 0          # none
-      return "info" if percent < 34   # < 1/100 of max
-      return "success" if percent < 67  # < 1/10 of max
-      return "warning" if percent < 84  # < 1/3 of max
-      return "danger"                # > 1/3 of max
+      return '' if percent < 0          # none
+      return 'info' if percent < 34   # < 1/100 of max
+      return 'success' if percent < 67  # < 1/10 of max
+      return 'warning' if percent < 84  # < 1/3 of max
+      'danger'                # > 1/3 of max
     end
 
     def get_column_sets(properties)
@@ -20,14 +20,15 @@ module RailsAdmin
       property_index = 0
       set_index = 0
 
-      while (property_index < properties.length)
+      while property_index < properties.length
         current_set_width = 0
-        begin
+        loop do
           sets[set_index] ||= []
           sets[set_index] << properties[property_index]
           current_set_width += (properties[property_index].column_width || 120)
           property_index += 1
-        end while (current_set_width < RailsAdmin::Config.total_columns_width) && (property_index < properties.length)
+          break if current_set_width >= RailsAdmin::Config.total_columns_width || property_index >= properties.length
+        end
         set_index += 1
       end
       sets

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

@@ -2,11 +2,11 @@
   %thead
     %tr
       %th.shrink.user= t("admin.table_headers.username")
-      %th.shrink.items= t("admin.table_headers.items")
+      %th.shrink.items= t("admin.table_headers.item")
       %th.changes= t("admin.table_headers.changes")
   %tbody
     - @history.each do |t|
-      - abstract_model = RailsAdmin.config(t.table).try(:abstract_model)
+      - abstract_model = RailsAdmin.config(t.table).abstract_model
       %tr
         %td= t.try :username
         - if o = abstract_model.try(:get, t.item)
@@ -16,5 +16,6 @@
           - else
             %td= label
         - else
-          %td= "#{t.table} ##{t.item}"
-        %td= t.message.in?(['delete', 'new']) ? t("admin.actions.#{t.message}.done").capitalize : t.message
+          - label = Object.const_defined?(t.table) ? t.table.constantize.model_name.human : t.table
+          %td= "#{label} ##{t.item}"
+        %td= t.message

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

@@ -99,6 +99,13 @@
       - if export_action
         %span{:style => 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), :class => 'btn btn-info'
 
+  - unless @model_config.list.scopes.empty?
+    %ul.nav.nav-tabs#scope_selector
+      - @model_config.list.scopes.each_with_index do |scope, index|
+        - scope = '_all' if scope.nil?
+        %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
+          %a{href: index_path(params.merge(:scope => scope, :page => nil))}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", :default => I18n.t("admin.scopes.#{scope}", :default => scope.to_s.titleize))
+
   = form_tag bulk_action_path(:model_name => @abstract_model.to_param), :method => :post, :id => "bulk_form", :class => "form" do
     = hidden_field_tag :bulk_action
     %table.table.table-condensed.table-striped

data/config/initializers/active_record_extensions.rb

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

data/config/initializers/haml.rb

@@ -1,2 +1,2 @@
-require "haml"
+require 'haml'
 Haml::Template.options[:ugly] = true

data/config/routes.rb

@@ -1,11 +1,11 @@
 RailsAdmin::Engine.routes.draw do
-  controller "main" do
-    RailsAdmin::Config::Actions.all(:root).each { |action| match "/#{action.route_fragment}", :to => action.action_name, :as => action.action_name, :via => action.http_methods }
-    scope ":model_name" do
-      RailsAdmin::Config::Actions.all(:collection).each { |action| match "/#{action.route_fragment}", :to => action.action_name, :as => action.action_name, :via => action.http_methods }
-      post  "/bulk_action", :to => :bulk_action, :as => "bulk_action"
-      scope ":id" do
-        RailsAdmin::Config::Actions.all(:member).each { |action| match "/#{action.route_fragment}", :to => action.action_name, :as => action.action_name, :via => action.http_methods }
+  controller 'main' do
+    RailsAdmin::Config::Actions.all(:root).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
+    scope ':model_name' do
+      RailsAdmin::Config::Actions.all(:collection).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
+      post  '/bulk_action', to: :bulk_action, as: 'bulk_action'
+      scope ':id' do
+        RailsAdmin::Config::Actions.all(:member).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
       end
     end
   end

data/lib/generators/rails_admin/install_generator.rb

@@ -1,97 +1,18 @@
 require 'rails/generators'
 require File.expand_path('../utils', __FILE__)
 
-# http://guides.rubyonrails.org/generators.html
-# http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
-# keep generator idempotent, thanks
-
 module RailsAdmin
   class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path("../templates", __FILE__)
-    include Rails::Generators::Migration
+    source_root File.expand_path('../templates', __FILE__)
     include Generators::Utils::InstanceMethods
-    extend Generators::Utils::ClassMethods
 
-    class_option :skip_devise, :type => :boolean, :aliases => '-D',
-      :desc => "Skip installation and setup of devise gem."
-    argument :_model_name, :type => :string, :required => false, :desc => "Devise user model name"
-    argument :_namespace, :type => :string, :required => false, :desc => "RailsAdmin url namespace"
-    desc "RailsAdmin installation generator"
+    argument :_namespace, type: :string, required: false, desc: 'RailsAdmin url namespace'
+    desc 'RailsAdmin installation generator'
 
     def install
-      routes = File.open(Rails.root.join("config/routes.rb")).try :read
-      initializer = (File.open(Rails.root.join("config/initializers/rails_admin.rb")) rescue nil).try :read
-
-      display "Hello, RailsAdmin installer will help you set things up!", :blue
-      display "I need to work with Devise, let's look at a few things first:"
-      if options[:skip_devise]
-        display "Skipping devise installation..."
-      else
-        display "Checking for a current installation of devise..."
-        unless defined?(Devise)
-          display "Adding devise gem to your Gemfile:"
-          append_file "Gemfile", "\n", :force => true
-          gem 'devise'
-          Bundler.with_clean_env do
-            run "bundle install"
-          end
-        else
-          display "Found it!"
-        end
-        unless File.exists?(Rails.root.join("config/initializers/devise.rb"))
-          display "Looks like you don't have devise installed! We'll install it for you:"
-          generate "devise:install"
-        else
-          display "Looks like you've already installed it, good!"
-        end
-      end
-
-      namespace = ask_for("Where do you want to mount rails_admin?", "admin", _namespace)
-      gsub_file "config/routes.rb", /mount RailsAdmin::Engine => \'\/.+\', :as => \'rails_admin\'/, ''
+      namespace = ask_for('Where do you want to mount rails_admin?', 'admin', _namespace)
       route("mount RailsAdmin::Engine => '/#{namespace}', :as => 'rails_admin'")
-
-      unless options[:skip_devise]
-        unless routes.index("devise_for")
-          model_name = ask_for("What would you like the user model to be called?", "user", _model_name)
-          display "Now setting up devise with user model name '#{model_name}':"
-          generate "devise", model_name
-        else
-          display "And you already set it up, good! We just need to know about your user model name..."
-          guess = routes.match(/devise_for +:(\w+)/)[1].try(:singularize)
-          display("We found '#{guess}' (should be one of 'user', 'admin', etc.)")
-          model_name = ask_for("Correct Devise model name if needed.", guess, _model_name)
-          unless guess == model_name
-            display "Now setting up devise with user model name '#{model_name}':"
-            generate "devise", model_name
-          else
-            display "Ok, Devise looks already set up with user model name '#{model_name}':"
-          end
-        end
-      end
-      display "Now you'll need an initializer..."
-      @current_user_method = model_name ? "current_#{model_name.to_s.underscore}" : ""
-      @model_name = model_name || '<your user class>'
-      unless initializer
-        template "initializer.erb", "config/initializers/rails_admin.rb"
-      else
-        display "You already have a config file. You're updating, heh? I'm generating a new 'rails_admin.rb.example' that you can review."
-        template "initializer.erb", "config/initializers/rails_admin.rb.example"
-        config_tag = initializer.match(/RailsAdmin\.config.+\|(.+)\|/)[1] rescue nil
-        if config_tag
-          if initializer.index(::Regexp.new("#{config_tag}\.current_user_method.?\{.+?\}"))
-            display "current_user_method found and updated with '#{@current_user_method}'", :green
-            gsub_file Rails.root.join("config/initializers/rails_admin.rb"), ::Regexp.new("#{config_tag}\.current_user_method.?\{.+?\}"), "#{config_tag}.current_user_method { #{@current_user_method} }"
-          else
-            display "current_user_method not found. Added one with '#{@current_user_method}'!", :yellow
-            insert_into_file Rails.root.join("config/initializers/rails_admin.rb"), "\n\n  #{config_tag}.current_user_method { #{@current_user_method} } #auto-generated", :after => /^RailsAdmin\.config.+$/
-          end
-        else
-          display "Couldn't parse your config file: current_user_method couldn't be updated", :red
-        end
-      end
-      display "Adding a migration..."
-      migration_template 'migration.rb', 'db/migrate/create_rails_admin_histories_table.rb' rescue display $!.message
-      display "Job's done: migrate, start your server and visit '/#{namespace}'!", :blue
+      template 'initializer.erb', 'config/initializers/rails_admin.rb'
     end
   end
 end

data/lib/generators/rails_admin/templates/initializer.erb

@@ -1,100 +1,34 @@
-# RailsAdmin config file. Generated on <%= DateTime.now.to_s(:long) %>
-# See github.com/sferik/rails_admin for more informations
-
 RailsAdmin.config do |config|
 
+  ### Popular gems integration
 
-  ################  Global configuration  ################
-
-  # Set the admin name here (optional second array element will appear in red). For example:
-  config.main_app_name = ['<%= Rails.application.engine_name.titleize.chomp(' Application') %>', 'Admin']
-  # or for a more dynamic name:
-  # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] }
-
-  # RailsAdmin may need a way to know who the current user is]
-  config.current_user_method { <%= @current_user_method %> } # auto-generated
-
-  # If you want to track changes on your models:
-  # config.audit_with :history, '<%= @model_name.classify %>'
-
-  # Or with a PaperTrail: (you need to install it first)
-  # config.audit_with :paper_trail, '<%= @model_name.classify %>'
-
-  # Display empty fields in show views:
-  # config.compact_show_view = false
-
-  # Number of default rows per-page:
-  # config.default_items_per_page = 20
-
-  # Exclude specific models (keep the others):
-  # config.excluded_models = [<%= RailsAdmin::AbstractModel.all.map{|am| "'#{am.model}'" }.join(', ') %>]
-
-  # Include specific models (exclude the others):
-  # config.included_models = [<%= RailsAdmin::AbstractModel.all.map{|am| "'#{am.model}'" }.join(', ') %>]
-
-  # Label methods for model instances:
-  # config.label_methods << :description # Default is [:name, :title]
-
-
-  ################  Model configuration  ################
-
-  # Each model configuration can alternatively:
-  #   - stay here in a `config.model 'ModelName' do ... end` block
-  #   - go in the model definition file in a `rails_admin do ... end` block
-
-  # This is your choice to make:
-  #   - This initializer is loaded once at startup (modifications will show up when restarting the application) but all RailsAdmin configuration would stay in one place.
-  #   - Models are reloaded at each request in development mode (when modified), which may smooth your RailsAdmin development workflow.
-
-
-  # Now you probably need to tour the wiki a bit: https://github.com/sferik/rails_admin/wiki
-  # Anyway, here is how RailsAdmin saw your application's models when you ran the initializer:
-
-<% RailsAdmin::AbstractModel.all.map do |abstract_model| -%>
-
-
-  ###  <%= abstract_model.model.model_name %>  ###
-
-  # config.model '<%= abstract_model.model.model_name %>' do
-
-  #   # You can copy this to a 'rails_admin do ... end' block inside your <%= abstract_model.model.model_name.to_s.underscore %>.rb model definition
-
-  #   # Found associations:
-
-<%= abstract_model.config.export.fields.select{|f| f.association?}.map do |field|
-%{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
-end.join("\n") %>
-
-  #   # Found columns:
-
-<%= abstract_model.config.export.fields.select{|f| !f.association?}.map do |field|
-%{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
-end.join("\n") %>
-
-  #   # Cross-section configuration:
-
-  #     # object_label_method :name     # Name of the method called for pretty printing an *instance* of ModelName
-  #     # label 'My model'              # Name of ModelName (smartly defaults to ActiveRecord's I18n API)
-  #     # label_plural 'My models'      # Same, plural
-  #     # weight 0                      # Navigation priority. Bigger is higher.
-  #     # parent OtherModel             # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown
-  #     # navigation_label              # Sets dropdown entry's name in navigation. Only for parents!
-
-  #   # Section specific configuration:
-
-  #     list do
-  #       # filters [:id, :name]  # Array of field names which filters should be shown by default in the table header
-  #       # items_per_page 100    # Override default_items_per_page
-  #       # sort_by :id           # Sort column (default is primary key)
-  #       # sort_reverse true     # Sort direction (default is true for primary key, last created first)
-  #     end
-  #     show do; end
-  #     edit do; end
-  #     export do; end
-  #     # also see the create, update, modal and nested sections, which override edit in specific cases (resp. when creating, updating, modifying from another model in a popup modal or modifying from another model nested form)
-  #     # you can override a cross-section field configuration in any section with the same syntax `configure :field_name do ... end`
-  #     # using `field` instead of `configure` will exclude all other fields and force the ordering
+  ## == Devise ==
+  # config.authenticate_with do
+  #   warden.authenticate! scope: :user
   # end
-<%- end -%>
-
+  # config.current_user_method(&:current_user)
+
+  ## == Cancan ==
+  # config.authorize_with :cancan
+
+  ## == PaperTrail ==
+  # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0
+
+  ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration
+
+  config.actions do
+    dashboard                     # mandatory
+    index                         # mandatory
+    new
+    export
+    bulk_delete
+    show
+    edit
+    delete
+    show_in_app
+
+    ## With an audit adapter, you can add:
+    # history_index
+    # history_show
+  end
 end

data/lib/generators/rails_admin/utils.rb

@@ -7,24 +7,13 @@ module RailsAdmin
         end
 
         def ask_for(wording, default_value = nil, override_if_present_value = nil)
-          override_if_present_value.present? ?
-            display("Using [#{override_if_present_value}] for question '#{wording}'") && override_if_present_value :
-            ask("           ?  #{wording} Press <enter> for [#{default_value}] >", :yellow).presence || default_value
-        end
-      end
-
-      module ClassMethods
-        def next_migration_number(dirname)
-          if ActiveRecord::Base.timestamped_migrations
-            migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-            migration_number += 1
-            migration_number.to_s
+          if override_if_present_value.present?
+            display("Using [#{override_if_present_value}] for question '#{wording}'") && override_if_present_value
           else
-            "%.3d" % (current_migration_number(dirname) + 1)
+            ask("           ?  #{wording} Press <enter> for [#{default_value}] >", :yellow).presence || default_value
           end
         end
       end
     end
   end
 end
-

data/lib/rails_admin.rb

@@ -25,7 +25,7 @@ module RailsAdmin
   def self.config(entity = nil, &block)
     if entity
       RailsAdmin::Config.model(entity, &block)
-    elsif block_given? && ENV['SKIP_RAILS_ADMIN_INITIALIZER'] != "true"
+    elsif block_given?
       block.call(RailsAdmin::Config)
     else
       RailsAdmin::Config

data/lib/rails_admin/abstract_model.rb

@@ -9,8 +9,8 @@ module RailsAdmin
       end
 
       def all(adapter = nil)
-        @@all ||= Config.models_pool.map{ |m| new(m) }.compact
-        adapter ? @@all.select{|m| m.adapter == adapter} : @@all
+        @@all ||= Config.models_pool.collect { |m| new(m) }.compact
+        adapter ? @@all.select { |m| m.adapter == adapter } : @@all
       end
 
       alias_method :old_new, :new
@@ -18,7 +18,7 @@ module RailsAdmin
         m = m.constantize unless m.is_a?(Class)
         (am = old_new(m)).model && am.adapter ? am : nil
       rescue LoadError, NameError
-        puts "[RailsAdmin] Could not load model #{m}, assuming model is non existing. (#{$!})" unless Rails.env.test?
+        puts "[RailsAdmin] Could not load model #{m}, assuming model is non existing. (#{$ERROR_INFO})" unless Rails.env.test?
         nil
       end
 
@@ -27,7 +27,7 @@ module RailsAdmin
       def polymorphic_parents(adapter, model_name, name)
         @@polymorphic_parents[adapter.to_sym] ||= {}.tap do |hash|
           all(adapter).each do |am|
-            am.associations.select{|r| r[:as] }.each do |association|
+            am.associations.select { |r| r[:as] }.each do |association|
               (hash[[association[:model_proc].call.to_s.underscore, association[:as]].join('_').to_sym] ||= []) << am.model
             end
           end
@@ -43,7 +43,7 @@ module RailsAdmin
 
     def initialize(model_or_model_name)
       @model_name = model_or_model_name.to_s
-      ancestors = model.ancestors.map(&:to_s)
+      ancestors = model.ancestors.collect(&:to_s)
       if ancestors.include?('ActiveRecord::Base') && !model.abstract_class?
         initialize_active_record
       elsif ancestors.include?('Mongoid::Document')
@@ -65,11 +65,11 @@ module RailsAdmin
     end
 
     def to_param
-      @model_name.split("::").map(&:underscore).join("~")
+      @model_name.split('::').collect(&:underscore).join('~')
     end
 
     def param_key
-      @model_name.split("::").map(&:underscore).join("_")
+      @model_name.split('::').collect(&:underscore).join('_')
     end
 
     def pretty_name
@@ -88,14 +88,14 @@ module RailsAdmin
             yield(association, child)
           end
         when :has_many
-          object.send(association[:name]).each do |child|
+          object.send(association[:name]).each do |child| # rubocop:disable ShadowingOuterLocalVariable
             yield(association, child)
           end
         end
       end
     end
 
-    private
+  private
 
     def initialize_active_record
       @adapter = :active_record
@@ -124,7 +124,7 @@ module RailsAdmin
           build_statement_for_type_generic
       end
 
-      protected
+    protected
 
       def get_filtering_duration
         FilteringDuration.new(@operator, @value).get_duration
@@ -132,20 +132,22 @@ module RailsAdmin
 
       def build_statement_for_type_generic
         build_statement_for_type || case @type
-          when :date                  then build_statement_for_date
-          when :datetime, :timestamp  then build_statement_for_datetime_or_timestamp
-          end
+        when :date
+          build_statement_for_date
+        when :datetime, :timestamp
+          build_statement_for_datetime_or_timestamp
+        end
       end
 
       def build_statement_for_type
-        raise "You must override build_statement_for_type in your StatementBuilder"
+        fail('You must override build_statement_for_type in your StatementBuilder')
       end
 
       def build_statement_for_integer_decimal_or_float
         case @value
         when Array then
-          val, range_begin, range_end = *@value.map do |v|
-            if (v.to_i.to_s == v || v.to_f.to_s == v)
+          val, range_begin, range_end = *@value.collect do |v|
+            if v.to_i.to_s == v || v.to_f.to_s == v
               @type == :integer ? v.to_i : v.to_f
             end
           end
@@ -174,11 +176,11 @@ module RailsAdmin
       end
 
       def unary_operators
-        raise "You must override unary_operators in your StatementBuilder"
+        fail('You must override unary_operators in your StatementBuilder')
       end
 
       def range_filter(min, max)
-        raise "You must override range_filter in your StatementBuilder"
+        fail('You must override range_filter in your StatementBuilder')
       end
 
       class FilteringDuration
@@ -189,12 +191,12 @@ module RailsAdmin
 
         def get_duration
           case @operator
-            when 'between'   then between
-            when 'today'     then today
-            when 'yesterday' then yesterday
-            when 'this_week' then this_week
-            when 'last_week' then last_week
-            else default
+          when 'between'   then between
+          when 'today'     then today
+          when 'yesterday' then yesterday
+          when 'this_week' then this_week
+          when 'last_week' then last_week
+          else default
           end
         end
 
@@ -212,7 +214,7 @@ module RailsAdmin
 
         def last_week
           [1.week.ago.to_date.beginning_of_week,
-            1.week.ago.to_date.end_of_week]
+           1.week.ago.to_date.end_of_week]
         end
 
         def between
@@ -223,11 +225,11 @@ module RailsAdmin
           [default_date, default_date]
         end
 
-        private
+      private
 
         def date_format
-          I18n.t("admin.misc.filter_date_format",
-          :default => I18n.t("admin.misc.filter_date_format", :locale => :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
+          I18n.t('admin.misc.filter_date_format',
+                 default: I18n.t('admin.misc.filter_date_format', locale: :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
         end
 
         def convert_to_date(value)