rails_admin 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57289fd4e3cc2d8b31ec01093d821300066c573
-  data.tar.gz: d083ff9c31f259e1641ea81d5058961799d6f002
+  metadata.gz: c86449582de5ab777e81d629158c4238c48c2ca7
+  data.tar.gz: 6150b0d9059fe530f05f6fa68cce04c40da04a53
 SHA512:
-  metadata.gz: 3c7f588688736301eb690f5b7cc0ac976e2ca36975a65f91ec273e78a9aa0483f086b97caed9c2b4b9aff914f0da9793837465e6701c5bf1fbfa9da11dc82b37
-  data.tar.gz: 25b7a7c445a13f90bc1d1fcc800240ee2248b553e9feca35db1ff6e7b8059c1c5f2a0e36cad000879516d6355ec96e36af773634ec0073c6b65d06caeb0a226c
+  metadata.gz: f3c83aabfb441a0ea5573d8c58bfa76e55f2f24608bc79ee1cd49a86b5cae0d8d922267e2b62c3f72560a1e497f1603595fa49c55d8deadc174a1707fa5dad75
+  data.tar.gz: c70a5f7f1edd3d61aa543ee2554a6048524ed18719a858d3e7fe30ab36409ab5318e63979a712cd19970c8a9a36bfb8ebf971621c00b6bcdb36140b9df3fb1c0

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-case ENV['RAILS_VER']
+case ENV['RAILS_VERSION']
 when '4.0'
   gem 'rails', '~> 4.0.0'
 else
-  gem 'rails', '~> 4.1.0.rc2'
+  gem 'rails', '~> 4.1'
 end
 
 case ENV['CI_ORM']
@@ -42,17 +42,13 @@ end
 
 group :development, :test do
   gem 'pry', '>= 0.9'
-  platforms :mri_19, :mri_20 do
-    gem 'pry-debugger', '>= 0.2'
-    gem 'pry-stack_explorer', '>= 0.4.9.1'
-  end
 end
 
 group :test do
   gem 'cancan', '>= 1.6'
   gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
-  gem 'coveralls', require: false
+  gem 'coveralls'
   gem 'database_cleaner', '>= 1.2'
   gem 'devise', '>= 3.2'
   gem 'dragonfly', '~> 1.0'
@@ -64,8 +60,8 @@ group :test do
   gem 'poltergeist', '~> 1.5'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
-  gem 'rubocop', '>= 0.19.0'
-  gem 'simplecov', require: false
+  gem 'rubocop', '>= 0.25'
+  gem 'simplecov', '>= 0.9', require: false
   gem 'timecop', '>= 0.5'
 end
 

data/README.md

@@ -5,14 +5,14 @@
 [![Dependency Status](https://img.shields.io/gemnasium/sferik/rails_admin.svg)][gemnasium]
 [![Code Climate](https://img.shields.io/codeclimate/github/sferik/rails_admin.svg)][codeclimate]
 [![Coverage Status](https://img.shields.io/coveralls/sferik/rails_admin.svg)][coveralls]
-[![Gittip](https://img.shields.io/gittip/gems.svg)][gittip]
+[![Inline docs](http://inch-ci.org/github/sferik/rails_admin.svg)][inch]
 
 [gem]: https://rubygems.org/gems/rails_admin
 [travis]: http://travis-ci.org/sferik/rails_admin
 [gemnasium]: https://gemnasium.com/sferik/rails_admin
 [codeclimate]: https://codeclimate.com/github/sferik/rails_admin
 [coveralls]: https://coveralls.io/r/sferik/rails_admin
-[gittip]: https://www.gittip.com/gems/
+[inch]: http://inch-ci.org/github/sferik/rails_admin
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 

data/Rakefile

@@ -13,7 +13,7 @@ task test: :spec
 
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
   desc 'Run RuboCop'
   task :rubocop do

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js

@@ -1,6 +1,6 @@
 /* ==========================================================
  * bootstrap-affix.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#affix
+ * http://getbootstrap.com/2.3.2/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -114,4 +114,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js

@@ -1,6 +1,6 @@
 /* ==========================================================
  * bootstrap-alert.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * http://getbootstrap.com/2.3.2/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -96,4 +96,4 @@
 
   $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js

@@ -1,6 +1,6 @@
 /* ============================================================
  * bootstrap-button.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * http://getbootstrap.com/2.3.2/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -102,4 +102,4 @@
     $btn.button('toggle')
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js

@@ -1,6 +1,6 @@
 /* ==========================================================
  * bootstrap-carousel.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * http://getbootstrap.com/2.3.2/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -204,4 +204,4 @@
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js

@@ -1,6 +1,6 @@
 /* =============================================================
  * bootstrap-collapse.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * http://getbootstrap.com/2.3.2/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -164,4 +164,4 @@
     $(target).collapse(option)
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js

@@ -1,6 +1,6 @@
 /* ============================================================
  * bootstrap-dropdown.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * http://getbootstrap.com/2.3.2/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
  *

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js

@@ -1,6 +1,6 @@
 /* =========================================================
  * bootstrap-modal.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#modals
+ * http://getbootstrap.com/2.3.2/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
  *

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js

@@ -1,6 +1,6 @@
 /* ===========================================================
  * bootstrap-popover.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * http://getbootstrap.com/2.3.2/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.
  *

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js

@@ -1,6 +1,6 @@
 /* =============================================================
  * bootstrap-scrollspy.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * http://getbootstrap.com/2.3.2/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -159,4 +159,4 @@
     })
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js

@@ -1,6 +1,6 @@
 /* ========================================================
  * bootstrap-tab.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * http://getbootstrap.com/2.3.2/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -141,4 +141,4 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js

@@ -1,6 +1,6 @@
 /* ===========================================================
  * bootstrap-tooltip.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * http://getbootstrap.com/2.3.2/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js

@@ -1,6 +1,6 @@
 /* ===================================================
  * bootstrap-transition.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * http://getbootstrap.com/2.3.2/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -57,4 +57,4 @@
 
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js

@@ -1,6 +1,6 @@
 /* =============================================================
  * bootstrap-typeahead.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * http://getbootstrap.com/2.3.2/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
  *

data/app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -77,7 +77,7 @@
         case 'float':
           var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
             '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("Number ...") + '</option>' +
-            '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("Between ... and ...") + '</option>' +
+            '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
             '<option disabled="disabled">---------</option>' +
             '<option ' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") +'</option>' +
             '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >' + RailsAdmin.I18n.t("is_blank") + '</option>' +

data/app/assets/stylesheets/rails_admin/base/theming.scss

@@ -17,6 +17,7 @@ body.rails_admin {
     small {
       color:$red;
       font-weight:bold;
+      line-height: 1;
     }
   }
 

data/app/assets/stylesheets/rails_admin/custom/theming.scss

@@ -5,7 +5,7 @@
 
   Look at the markup in RailsAdmin and go there to get inspiration from:
 
-  http://twitter.github.com/bootstrap/
+  http://getbootstrap.com/2.3.2/
 
   Test me: (actual color should be the one defined in variables.css.scss if you did)
 

data/app/assets/stylesheets/rails_admin/rails_admin.scss.erb

@@ -1,3 +1,32 @@
+// Issue 1956 (https://github.com/sferik/rails_admin/issues/1956)
+//= depend_on_asset "rails_admin/bootstrap/glyphicons-halflings.png"
+//= depend_on_asset "rails_admin/bootstrap/glyphicons-halflings-white.png"
+//= depend_on_asset "rails_admin/aristo/images/bg_fallback.png"
+//= depend_on_asset "rails_admin/aristo/images/ui-icons_222222_256x240.png"
+//= depend_on_asset "rails_admin/aristo/images/ui-icons_454545_256x240.png"
+//= depend_on_asset "rails_admin/aristo/images/icon_sprite.png"
+//= depend_on_asset "rails_admin/aristo/images/slider_handles.png"
+//= depend_on_asset "rails_admin/aristo/images/progress_bar.gif"
+//= depend_on_asset "rails_admin/multiselect/icon_sprite.png"
+//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-n-light.png"
+//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-n-dark.png"
+//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-s-light.png"
+//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-s-dark.png"
+//= depend_on_asset "rails_admin/colorpicker/select2.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_background.png"
+//= depend_on_asset "rails_admin/colorpicker/colorpicker_overlay.png"
+//= depend_on_asset "rails_admin/colorpicker/colorpicker_select.gif"
+//= depend_on_asset "rails_admin/colorpicker/custom_indic.gif"
+//= depend_on_asset "rails_admin/colorpicker/custom_hex.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_rgb_r.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_rgb_g.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_rgb_b.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_hsb_h.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_hsb_s.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_hsb_b.png"
+//= depend_on_asset "rails_admin/colorpicker/custom_submit.png"
+
+
 @charset "UTF-8";
 
 <%

data/app/assets/stylesheets/rails_admin/themes/default/theming.scss

@@ -3,7 +3,7 @@
 
   Look at the markup in RailsAdmin and go there to get inspiration from:
 
-  http://twitter.github.com/bootstrap/
+  http://getbootstrap.com/2.3.2/
 
   Test me: (actual color should be the one defined in variables.css.scss if you did)
 

data/app/controllers/rails_admin/application_controller.rb

@@ -8,7 +8,7 @@ module RailsAdmin
   end
 
   class ApplicationController < ::ApplicationController
-    newrelic_ignore if defined?(NewRelic) && respond_to?(:newrelic_ignore)
+    newrelic_ignore if defined?(NewRelic)
 
     before_filter :_authenticate!
     before_filter :_authorize!
@@ -33,6 +33,10 @@ module RailsAdmin
       param.split('~').collect(&:camelize).join('::')
     end
 
+    def _current_user
+      instance_eval(&RailsAdmin::Config.current_user_method)
+    end
+
   private
 
     def _get_plugin_name
@@ -51,10 +55,6 @@ module RailsAdmin
       instance_eval(&RailsAdmin::Config.audit_with)
     end
 
-    def _current_user
-      instance_eval(&RailsAdmin::Config.current_user_method)
-    end
-
     alias_method :user_for_paper_trail, :_current_user
 
     rescue_from RailsAdmin::ObjectNotFound do

data/app/controllers/rails_admin/main_controller.rb

@@ -56,18 +56,20 @@ module RailsAdmin
 
       field = model_config.list.fields.detect { |f| f.name.to_s == params[:sort] }
 
-      column = if field.nil? || field.sortable == true # use params[:sort] on the base table
-        "#{abstract_model.table_name}.#{params[:sort]}"
-      elsif field.sortable == false # use default sort, asked field is not sortable
-        "#{abstract_model.table_name}.#{model_config.list.sort_by}"
-      elsif (field.sortable.is_a?(String) || field.sortable.is_a?(Symbol)) && field.sortable.to_s.include?('.') # just provide sortable, don't do anything smart
-        field.sortable
-      elsif field.sortable.is_a?(Hash) # just join sortable hash, don't do anything smart
-        "#{field.sortable.keys.first}.#{field.sortable.values.first}"
-      elsif field.association? # use column on target table
-        "#{field.associated_model_config.abstract_model.table_name}.#{field.sortable}"
-      else # use described column in the field conf.
-        "#{abstract_model.table_name}.#{field.sortable}"
+      column = begin
+        if field.nil? || field.sortable == true # use params[:sort] on the base table
+          "#{abstract_model.table_name}.#{params[:sort]}"
+        elsif field.sortable == false # use default sort, asked field is not sortable
+          "#{abstract_model.table_name}.#{model_config.list.sort_by}"
+        elsif (field.sortable.is_a?(String) || field.sortable.is_a?(Symbol)) && field.sortable.to_s.include?('.') # just provide sortable, don't do anything smart
+          field.sortable
+        elsif field.sortable.is_a?(Hash) # just join sortable hash, don't do anything smart
+          "#{field.sortable.keys.first}.#{field.sortable.values.first}"
+        elsif field.association? # use column on target table
+          "#{field.associated_model_config.abstract_model.table_name}.#{field.sortable}"
+        else # use described column in the field conf.
+          "#{abstract_model.table_name}.#{field.sortable}"
+        end
       end
 
       reversed_sort = (field ? field.sort_reverse? : model_config.list.sort_reverse?)
@@ -85,22 +87,17 @@ module RailsAdmin
       end
     end
 
-    def satisfy_strong_params!
-      if @abstract_model.model.ancestors.collect(&:to_s).include?('ActiveModel::ForbiddenAttributesProtection')
-        params[@abstract_model.param_key].try :permit!
-      end
-    end
-
-    def sanitize_params_for!(action, model_config = @model_config, _params = params[@abstract_model.param_key])
-      return unless _params.present?
+    def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
+      return unless target_params.present?
       fields = model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
       allowed_methods = fields.collect do|f|
         f.allowed_methods
       end.flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
-      fields.each { |f| f.parse_input(_params) }
-      _params.slice!(*allowed_methods)
+      fields.each { |f| f.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|
-        children_params = association.multiple? ? _params[association.method_name].try(:values) : [_params[association.method_name]].compact
+        children_params = association.multiple? ? target_params[association.method_name].try(:values) : [target_params[association.method_name]].compact
         (children_params || []).each do |children_param|
           sanitize_params_for!(:nested, association.associated_model_config, children_param)
         end
@@ -118,9 +115,8 @@ module RailsAdmin
     end
 
     def check_for_cancel
-      if params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
-        redirect_to(back_or_index, flash: {info: t('admin.flash.noaction')})
-      end
+      return unless params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
+      redirect_to(back_or_index, flash: {info: t('admin.flash.noaction')})
     end
 
     def get_collection(model_config, scope, pagination)
@@ -140,7 +136,7 @@ module RailsAdmin
       source_abstract_model = RailsAdmin::AbstractModel.new(to_model_name(params[:source_abstract_model]))
       source_model_config = source_abstract_model.config
       source_object = source_abstract_model.get(params[:source_object_id])
-      action = params[:current_action].in?(%w[create update]) ? params[:current_action] : 'edit'
+      action = params[:current_action].in?(%w(create update)) ? params[:current_action] : 'edit'
       @association = source_model_config.send(action).fields.detect { |f| f.name == params[:associated_collection].to_sym }.with(controller: self, object: source_object)
       @association.associated_collection_scope
     end

data/app/helpers/rails_admin/application_helper.rb

@@ -31,10 +31,9 @@ module RailsAdmin
     end
 
     def logout_path
-      if defined?(Devise)
-        scope = Devise::Mapping.find_scope!(_current_user)
-        main_app.send("destroy_#{scope}_session_path") rescue false
-      end
+      return unless defined?(Devise)
+      scope = Devise::Mapping.find_scope!(_current_user)
+      main_app.send("destroy_#{scope}_session_path") rescue false
     end
 
     def wording_for(label, action = @action, abstract_model = @abstract_model, object = @object)
@@ -45,7 +44,7 @@ module RailsAdmin
       I18n.t("admin.actions.#{action.i18n_key}.#{label}",
              model_label: model_config && model_config.label,
              model_label_plural: model_config && model_config.label_plural,
-             object_label: model_config && object.try(model_config.object_label_method)
+             object_label: model_config && object.try(model_config.object_label_method),
       )
     end
 
@@ -87,7 +86,7 @@ module RailsAdmin
       end.join.html_safe
     end
 
-    def breadcrumb(action = @action, acc = [])
+    def breadcrumb(action = @action, _acc = [])
       begin
         (parent_actions ||= []) << action
       end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
@@ -97,12 +96,14 @@ module RailsAdmin
           am = a.send(:eval, 'bindings[:abstract_model]')
           o = a.send(:eval, 'bindings[:object]')
           content_tag(:li, class: current_action?(a, am, o) && 'active') do
-            crumb = if a.http_methods.include?(:get)
-              link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
-                wording_for(:breadcrumb, a, am, o)
+            crumb = begin
+              if a.http_methods.include?(:get)
+                link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
+                  wording_for(:breadcrumb, a, am, o)
+                end
+              else
+                content_tag(:span, wording_for(:breadcrumb, a, am, o))
               end
-            else
-              content_tag(:span, wording_for(:breadcrumb, a, am, o))
             end
             crumb += content_tag(:span, '/', class: 'divider') unless current_action?(a, am, o)
             crumb
@@ -120,7 +121,7 @@ module RailsAdmin
           <li title="#{wording if only_icon}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
             <a class="#{action.pjax? ? 'pjax' : ''}" href="#{url_for(action: action.action_name, controller: 'rails_admin/main', model_name: abstract_model.try(:to_param), id: (object.try(:persisted?) && object.try(:id) || nil))}">
               <i class="#{action.link_icon}"></i>
-              <span#{only_icon ? " style='display:none'" : ""}>#{wording}</span>
+              <span#{only_icon ? " style='display:none'" : ''}>#{wording}</span>
             </a>
           </li>
         )