rails_admin 0.8.1 → 1.0.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e491a0735ca200d0e74ad5dcb6bd299919da52b
-  data.tar.gz: 5a96d44742b0029c1d7554c532e7fa6ae6ed6853
+  metadata.gz: ad179cb9f029df989c979439f2e5debb9b2a8f23
+  data.tar.gz: 2a148ec6c217c0dc67369cb0164bed57db97b953
 SHA512:
-  metadata.gz: 51af7b94bb6eb226489fdd111ba81bd17a16f32910c44c97876b427396d48c8b972c7b3ea288f3d850157c12bb1fa628351b878e6e2d1bcb1683ec6d402d7349
-  data.tar.gz: 99bedb21db9884f4f58c0ed3069e15961aad70209d75e1cd8dcbff99b6e5fa39a3ca02f90eb82593f0b8d44e9cccf2b2cd15ccefec1bcd4402b999acba041916
+  metadata.gz: c5c61a2c10d83cdbc00fb163974026eba3a940bd998e674a2e0a256b41f7a9aec821e6aca93a3904bc801d6ee240022bc736b04764bea11953f64ef705ed1d7e
+  data.tar.gz: aa9a9cfb2e7eda6f0fd9b3bc2fe16430eb83120499da7e87f0361a93a3b3734e458ec6ac0a0bd553bb6d25fa7f4829f3e717ad15d6cf195efd4771e3b62b0738

data/Gemfile

@@ -2,13 +2,7 @@ source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
 gem 'devise'
-
-group :mongoid do
-  gem 'mongoid', '~> 4.0.0'
-  gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-  gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22]
-end
+gem 'remotipart', github: 'mshibuya/remotipart'
 
 group :active_record do
   platforms :jruby do
@@ -26,7 +20,7 @@ group :active_record do
     gem 'sqlite3', '>= 1.3'
   end
 
-  gem 'paper_trail', '~> 3.0'
+  gem 'paper_trail', '>= 5.0'
 end
 
 group :development, :test do
@@ -36,7 +30,6 @@ end
 group :test do
   gem 'cancan', '>= 1.6'
   gem 'cancancan', '~> 1.12.0'
-  gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
   gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']
@@ -55,12 +48,7 @@ group :test do
   gem 'timecop', '>= 0.5'
 
   platforms :ruby_19 do
-    gem 'tins', '~> 1.6.0'
-  end
-
-  platforms :ruby_21, :ruby_22 do
-    gem 'refile', '~> 0.5', require: 'refile/rails'
-    gem 'refile-mini_magick', '>= 0.1.0'
+    gem 'tins', '~> 1.6.0', require: false
   end
 end
 

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Erik Michaels-Ober
+Copyright (c) 2010-2016 Erik Michaels-Ober
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -8,7 +8,7 @@
 [![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
+[travis]: https://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
@@ -33,10 +33,24 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. Bundle the gem
-2. Run `rails g rails_admin:install`
-3. Provide a namespace for the routes when asked
-4. Start a server `rails s` and administer your data at [/admin](http://localhost:3000/admin). (if you chose default namespace: /admin)
+1. On your gemfile:
+  - For Rails 5 project:
+
+    ```
+    gem 'remotipart', github: 'mshibuya/remotipart'
+    gem 'rails_admin', '>= 1.0.0.rc'
+    ```
+
+  - For Rails 4 project:
+
+    ```
+    gem 'rails_admin'
+    ```
+
+2. Run `bundle install`
+3. Run `rails g rails_admin:install`
+4. Provide a namespace for the routes when asked
+5. Start a server `rails s` and administer your data at [/admin](http://localhost:3000/admin). (if you chose default namespace: /admin)
 
 ## Configuration
 ### Global
@@ -87,12 +101,11 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 
-* Ruby 1.9.3
-* Ruby 2.0.0
 * Ruby 2.1
 * Ruby 2.2
+* Ruby 2.3
 * [Rubinius][]
 * [JRuby][]
 
-[rubinius]: http://rubini.us/
+[rubinius]: http://rubinius.com
 [jruby]: http://jruby.org/

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

@@ -101,7 +101,7 @@
 
       var $content = $('<p>')
         .addClass('filter form-search')
-        .append('<span class="label label-info form-label"><a href="#delete" class="delete"><i class="fa fa-trash-o fa-fw icon-white"></i></a> ' + field_label + '</span>')
+        .append('<span class="label label-info form-label"><a href="#delete" class="delete"><i class="fa fa-trash-o fa-fw icon-white"></i>' + field_label + '</a></span>')
         .append('&nbsp;' + control + '&nbsp;' + (additional_control || ''));
 
       $('#filters_box').append($content);

data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.coffee

@@ -29,7 +29,7 @@ $(document).on 'nested:fieldAdded', 'form', (content) ->
 $(document).on 'nested:fieldRemoved', 'form', (content) ->
   field = content.field
   nav = field.closest(".control-group").children('.controls').children('.nav')
-  current_li = nav.children('li').has('a[href=#' + field.attr('id') + ']')
+  current_li = nav.children('li').has('a[href="#' + field.attr('id') + '"]')
   parent_group = field.closest(".control-group")
   controls = parent_group.children('.controls')
   one_to_one = controls.data('nestedone') != undefined
@@ -50,3 +50,6 @@ $(document).on 'nested:fieldRemoved', 'form', (content) ->
     add_button = toggler.next()
     add_button.addClass('add_nested_fields').html(add_button.data('add-label'))
 
+  # Removing all required attributes from deleted child form to bypass browser validations.
+  field.find('[required]').each ->
+    $(this).removeAttr('required')

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

@@ -91,7 +91,10 @@
           dialog.find('.modal-body').html(data.responseText);
           widget._bindFormEvents();
         } else {
-          var json = $.parseJSON(data.responseText);
+          // 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 option = '<option value="' + json.id + '" selected>' + json.label + '</option>';
           var select = widget.element.find('select').filter(":hidden");
 

data/app/assets/javascripts/rails_admin/rails_admin.js

@@ -1,6 +1,6 @@
 //=  require 'jquery'
 //=  require 'jquery_ujs'
-//=  require 'rails_admin/jquery.remotipart.fixed'
+//=  require 'jquery.remotipart'
 //=  require 'jquery-ui/effect'
 //=  require 'jquery-ui/sortable'
 //=  require 'jquery-ui/autocomplete'

data/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss

@@ -69,7 +69,7 @@
 		background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
 		background: -o-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Opera11.10+ */
 		background: -ms-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* IE10+ */
-		background: linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* W3C */
+		background: linear-gradient(to bottom, #ededed 0%,#c4c4c4 100%); /* W3C */
 }
 .ui-widget-header a { color: #4F4F4F; }
 
@@ -83,7 +83,7 @@
 		background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
 		background: -o-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Opera11.10+ */
 		background: -ms-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* IE10+ */
-		background: linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* W3C */
+		background: linear-gradient(to bottom, #ededed 0%,#c4c4c4 100%); /* W3C */
 	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
 	-moz-box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
 	box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
@@ -100,7 +100,7 @@
 		background: -webkit-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Chrome10+,Safari5.1+ */
 		background: -o-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Opera11.10+ */
 		background: -ms-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* IE10+ */
-		background: linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* W3C */
+		background: linear-gradient(to bottom, #b9e0f5 0%,#92bdd6 100%); /* W3C */
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;
@@ -481,7 +481,7 @@ button.ui-button-icons-only { width: 3.7em; }
 		background: -webkit-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Chrome10+,Safari5.1+ */
 		background: -o-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Opera11.10+ */
 		background: -ms-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* IE10+ */
-		background: linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* W3C */
+		background: linear-gradient(to bottom, #b9e0f5 0%,#92bdd6 100%); /* W3C */
 	-moz-box-shadow: 0 0 8px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255,255,255,0.8) inset; 
 	-webkit-box-shadow: 0 0 8px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255,255,255,0.8) inset;
 	box-shadow: 0 0 8px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255,255,255,0.8) inset;
@@ -527,7 +527,7 @@ input.ui-button::-moz-focus-inner {
 		background: -webkit-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Chrome10+,Safari5.1+ */
 		background: -o-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Opera11.10+ */
 		background: -ms-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* IE10+ */
-		background: linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* W3C */
+		background: linear-gradient(to bottom, #b9e0f5 0%,#92bdd6 100%); /* W3C */
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;

data/app/assets/stylesheets/rails_admin/ra.widgets.scss

@@ -1,6 +1,10 @@
 iframe.wysihtml5-sandbox{
   height: 250px !important;
-  width: 75% !important;
+  width: 99.7% !important;
+}
+
+iframe.wysihtml5-sandbox, .wysihtml5-editor{
+  border: 1px solid #ccc !important;
 }
 
 .controls img.preview{

data/app/controllers/rails_admin/application_controller.rb

@@ -11,9 +11,9 @@ module RailsAdmin
   end
 
   class ApplicationController < Config.parent_controller.constantize
-    before_filter :_authenticate!
-    before_filter :_authorize!
-    before_filter :_audit!
+    before_action :_authenticate!
+    before_action :_authorize!
+    before_action :_audit!
 
     helper_method :_current_user, :_get_plugin_name
 

data/app/controllers/rails_admin/main_controller.rb

@@ -6,9 +6,9 @@ module RailsAdmin
 
     layout :get_layout
 
-    before_filter :get_model, except: RailsAdmin::Config::Actions.all(:root).collect(&:action_name)
-    before_filter :get_object, only: RailsAdmin::Config::Actions.all(:member).collect(&:action_name)
-    before_filter :check_for_cancel
+    before_action :get_model, except: RailsAdmin::Config::Actions.all(:root).collect(&:action_name)
+    before_action :get_object, only: RailsAdmin::Config::Actions.all(:member).collect(&:action_name)
+    before_action :check_for_cancel
 
     RailsAdmin::Config::Actions.all.each do |action|
       class_eval <<-EOS, __FILE__, __LINE__ + 1
@@ -75,7 +75,7 @@ module RailsAdmin
     end
 
     def redirect_to_on_success
-      notice = t('admin.flash.successful', name: @model_config.label, action: t("admin.actions.#{@action.key}.done"))
+      notice = I18n.t('admin.flash.successful', name: @model_config.label, action: I18n.t("admin.actions.#{@action.key}.done"))
       if params[:_add_another]
         redirect_to new_path(return_to: params[:return_to]), flash: {success: notice}
       elsif params[:_add_edit]
@@ -105,7 +105,7 @@ module RailsAdmin
     end
 
     def handle_save_error(whereto = :new)
-      flash.now[:error] = t('admin.flash.error', name: @model_config.label, action: t("admin.actions.#{@action.key}.done").html_safe).html_safe
+      flash.now[:error] = I18n.t('admin.flash.error', name: @model_config.label, action: I18n.t("admin.actions.#{@action.key}.done").html_safe).html_safe
       flash.now[:error] += %(<br>- #{@object.errors.full_messages.join('<br>- ')}).html_safe
 
       respond_to do |format|
@@ -116,7 +116,7 @@ module RailsAdmin
 
     def check_for_cancel
       return unless params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
-      redirect_to(back_or_index, notice: t('admin.flash.noaction'))
+      redirect_to(back_or_index, notice: I18n.t('admin.flash.noaction'))
     end
 
     def get_collection(model_config, scope, pagination)

data/app/helpers/rails_admin/application_helper.rb

@@ -35,9 +35,9 @@ module RailsAdmin
       return nil unless _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
       return nil unless (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
-      link_to url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main') do
+      link_to rails_admin.url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main') do
         html = []
-        html << image_tag("#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: '') if _current_user.email.present?
+        html << image_tag("#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: '') if RailsAdmin::Config.show_gravatar && _current_user.email.present?
         html << content_tag(:span, _current_user.email)
         html.join.html_safe
       end
@@ -97,7 +97,7 @@ module RailsAdmin
     def navigation(nodes_stack, nodes, level = 0)
       nodes.collect do |node|
         model_param = node.abstract_model.to_param
-        url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
+        url         = rails_admin.url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
         li = content_tag :li, data: {model: model_param} do
@@ -120,7 +120,7 @@ module RailsAdmin
             crumb = begin
               if !current_action?(a, am, o)
                 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
+                  link_to rails_admin.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
@@ -143,7 +143,7 @@ module RailsAdmin
         wording = wording_for(:menu, action)
         %(
           <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))}">
+            <a class="#{action.pjax? ? 'pjax' : ''}" href="#{rails_admin.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>
             </a>

data/app/helpers/rails_admin/form_builder.rb

@@ -131,7 +131,7 @@ module RailsAdmin
 
     def nested_field_association?(field, nested_in)
       field.inverse_of.presence && nested_in.presence && field.inverse_of == nested_in.name &&
-        (@template.instance_variable_get(:@model_config).abstract_model == field.associated_model_config.abstract_model ||
+        (@template.instance_variable_get(:@model_config).abstract_model == field.abstract_model ||
          field.name == nested_in.inverse_of)
     end
   end

data/app/helpers/rails_admin/main_helper.rb

@@ -43,7 +43,7 @@ module RailsAdmin
     def ordered_filters
       return @ordered_filters if @ordered_filters.present?
       @index = 0
-      @ordered_filters = (params[:f] || @model_config.list.filters).inject({}) do |memo, filter|
+      @ordered_filters = (params[:f].try(:permit!).try(:to_h) || @model_config.list.filters).inject({}) do |memo, filter|
         field_name = filter.is_a?(Array) ? filter.first : filter
         (filter.is_a?(Array) ? filter.last : {(@index += 1) => {'v' => ''}}).each do |index, filter_hash|
           if filter_hash['disabled'].blank?

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

@@ -1,6 +1,6 @@
 %ul.nav.navbar-nav.navbar-right.root_links
   - actions(:root).each do |action|
-    %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: "pjax"
+    %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : ""
   - if main_app_root_path = (main_app.root_path rescue false)
     %li= link_to t('admin.home.name'), main_app_root_path
   - if _current_user