rails_admin 0.4.9 → 0.5.0

data/Gemfile

@@ -10,15 +10,15 @@ group :active_record do
       gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
       gem 'jdbc-postgres', '>= 9.2'
     else
-      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2'
+      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta1'
       gem 'jdbc-sqlite3', '>= 3.7'
     end
   end
 
   platforms :ruby, :mswin, :mingw do
     case ENV['CI_DB_ADAPTER']
-    when 'mysql'
-      gem 'mysql', '~> 2.8.1'
+    when 'mysql2'
+      gem 'mysql2', '~> 0.3.11'
     when 'postgresql'
       gem 'pg', '>= 0.14'
     else
@@ -28,9 +28,10 @@ group :active_record do
 end
 
 group :mongoid do
-  gem 'mongoid', '>= 3.0'
+  gem 'mongoid', github: 'mongoid/mongoid'
   gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid'
+  gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
+  gem 'carrierwave-mongoid', github: 'jnicklas/carrierwave-mongoid', :require => 'carrierwave/mongoid'
 end
 
 group :development do
@@ -40,12 +41,13 @@ end
 
 group :test do
   gem 'cancan', '>= 1.6'
-  gem 'capybara', '~> 1.1'
+  gem 'capybara', '~> 2.0'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls', :require => false
-  gem 'database_cleaner', '>= 0.8'
-  gem 'devise', '>= 2.1'
+  gem 'database_cleaner', '~> 1.0'
+  gem 'devise', '~> 3.0.0.rc'
   gem 'dragonfly', '>= 0.9'
+  gem 'rack-cache', :require => 'rack/cache'
   gem 'factory_girl', '>= 4.2'
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
@@ -53,7 +55,6 @@ group :test do
   gem 'paperclip', '>= 3.4'
   gem 'rspec-rails', '>= 2.11'
   gem 'simplecov', :require => false
-  gem 'strong_parameters', '>= 0.1.6'
   gem 'timecop', '>= 0.5'
 end
 

data/README.md

@@ -18,6 +18,15 @@
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
 ## Announcements
+### Support for AcitveModel::MassAssignmentSecurity has been dropped
+
+RailsAdmin no longer controls field visibility regarding attr_accessible status, nor uses role on mass assignment.
+See discussion [here](https://github.com/sferik/rails_admin/issues/1443#issuecomment-17132073).
+
+### Richtext editor DSL(for CKEditor, CodeMirror, bootstrap-wysihtml5) has been changed
+
+They are configured by field type, not through Text field's extra options. For detail, see [CKEditor](https://github.com/sferik/rails_admin/wiki/CKEditor), [CodeMirror](https://github.com/sferik/rails_admin/wiki/CodeMirror), [Wysihtml5](https://github.com/sferik/rails_admin/wiki/Wysihtml5) in Wiki.
+
 ### [Action required] Security issue
 `RailsAdmin::Config::Fields::Types::Serialized#parse_input` was unsafe, because it was using the infamous `YAML#load`.
 

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -72,7 +72,7 @@
                 // remove invalid value, as it didn't match anything
                 $(this).val(null);
                 select.html($('<option value="" selected="selected"></option>'));
-                input.data("autocomplete").term = "";
+                input.data("ui-autocomplete").term = "";
                 $(self.element.parents('.controls')[0]).find('.update').addClass('disabled');
                 return false;
               }
@@ -91,9 +91,9 @@
       if(select.attr('placeholder'))
         input.attr('placeholder', select.attr('placeholder'))
 
-      input.data("autocomplete")._renderItem = function(ul, item) {
+      input.data("ui-autocomplete")._renderItem = function(ul, item) {
         return $("<li></li>")
-          .data("item.autocomplete", item)
+          .data("ui-autocomplete-item", item)
           .append( $( "<a></a>" ).html( item.label || item.id ) )
           .appendTo(ul);
       };

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

@@ -15,7 +15,7 @@ $(document).on 'nested:fieldAdded', 'form', (content) ->
   content = parent_group.children('.tab-content')
   toggler = controls.find('.toggler')
   nav.append(new_tab)
-  $(window.document).trigger('rails_admin.dom_ready') # fire dom_ready for new player in town
+  $(window.document).trigger('rails_admin.dom_ready', [field, parent_group]) # fire dom_ready for new player in town
   new_tab.children('a').tab('show') # activate added tab
   nav.select(':hidden').show('slow') # show nav if hidden
   content.select(':hidden').show('slow') # show tabs content if hidden

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

@@ -84,7 +84,7 @@
         return false;
       }).html(saveButtonText);
 
-      $(document).trigger('rails_admin.dom_ready')
+      $(document).trigger('rails_admin.dom_ready', [form])
 
       form.bind("ajax:complete", function(xhr, data, status) {
         if (status == 'error') {

data/app/assets/javascripts/rails_admin/ra.widgets.coffee

@@ -1,10 +1,12 @@
-$(document).on 'rails_admin.dom_ready', ->
+$(document).on 'rails_admin.dom_ready', (e, content) ->
 
-  if $('form').length # don't waste time otherwise
+  content = if content then content else $('form')
+
+  if content.length # don't waste time otherwise
 
     # colorpicker
 
-    $('form [data-color]').each ->
+    content.find('[data-color]').each ->
       that = this
       $(this).ColorPicker
         color: $(that).val()
@@ -20,12 +22,12 @@ $(document).on 'rails_admin.dom_ready', ->
 
     # datetime
 
-    $('form [data-datetimepicker]').each ->
+    content.find('[data-datetimepicker]').each ->
       $(this).datetimepicker $(this).data('options')
 
     # enumeration
 
-    $('form [data-enumeration]').each ->
+    content.find('[data-enumeration]').each ->
       if $(this).is('[multiple]')
         $(this).filteringMultiselect $(this).data('options')
       else
@@ -33,14 +35,14 @@ $(document).on 'rails_admin.dom_ready', ->
 
     # fileupload
 
-    $('form [data-fileupload]').each ->
+    content.find('[data-fileupload]').each ->
       input = this
       $(this).on 'click', ".delete input[type='checkbox']", ->
         $(input).children('.toggle').toggle('slow')
 
     # fileupload-preview
 
-    $('form [data-fileupload]').change ->
+    content.find('[data-fileupload]').change ->
       input = this
       image_container = $("#" + input.id).parent().children(".preview")
       unless image_container.length
@@ -58,7 +60,7 @@ $(document).on 'rails_admin.dom_ready', ->
 
     # filtering-multiselect
 
-    $('form [data-filteringmultiselect]').each ->
+    content.find('[data-filteringmultiselect]').each ->
       $(this).filteringMultiselect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
         $(this).parents('.control-group').find('.btn').remove()
@@ -67,7 +69,7 @@ $(document).on 'rails_admin.dom_ready', ->
 
     # filtering-select
 
-    $('form [data-filteringselect]').each ->
+    content.find('[data-filteringselect]').each ->
       $(this).filteringSelect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
         $(this).parents('.control-group').find('.btn').remove()
@@ -76,55 +78,55 @@ $(document).on 'rails_admin.dom_ready', ->
 
     # nested-many
 
-    $('form [data-nestedmany]').each ->
+    content.find('[data-nestedmany]').each ->
       field = $(this).parents('.control-group').first()
       nav = field.find('> .controls > .nav')
-      content = field.find('> .tab-content')
+      tab_content = field.find('> .tab-content')
       toggler = field.find('> .controls > .btn-group > .toggler')
       # add each nested field to a tab-pane and reference it in the nav
-      content.children('.fields:not(.tab-pane)').addClass('tab-pane').each ->
+      tab_content.children('.fields:not(.tab-pane)').addClass('tab-pane').each ->
         $(this).attr('id', 'unique-id-' + (new Date().getTime()) + Math.floor(Math.random()*100000)) # some elements are created on the same ms
         nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       # only if no tab is set to active
       if nav.find("> li.active").length == 0
-        # init first tab, toggler and content/tabs visibility
+        # init first tab, toggler and tab_content/tabs visibility
         nav.find("> li > a[data-toggle='tab']:first").tab('show')
       if nav.children().length == 0
         nav.hide()
-        content.hide()
+        tab_content.hide()
         toggler.addClass('disabled').removeClass('active').children('i').addClass('icon-chevron-right')
       else
         if toggler.hasClass('active')
           nav.show()
-          content.show()
+          tab_content.show()
           toggler.children('i').addClass('icon-chevron-down')
         else
           nav.hide()
-          content.hide()
+          tab_content.hide()
           toggler.children('i').addClass('icon-chevron-right')
 
     # nested-one
 
-    $('form [data-nestedone]').each ->
+    content.find('[data-nestedone]').each ->
       field = $(this).parents('.control-group').first()
       nav = field.find("> .controls > .nav")
-      content = field.find("> .tab-content")
+      tab_content = field.find("> .tab-content")
       toggler = field.find('> .controls > .toggler')
-      content.children(".fields:not(.tab-pane)").addClass('tab-pane active').each ->
+      tab_content.children(".fields:not(.tab-pane)").addClass('tab-pane active').each ->
         nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       first_tab = nav.find("> li > a[data-toggle='tab']:first")
       first_tab.tab('show')
       field.find("> .controls > [data-target]:first").html('<i class="icon-white"></i> ' + first_tab.html())
       if toggler.hasClass('active')
         toggler.children('i').addClass('icon-chevron-down')
-        content.show()
+        tab_content.show()
       else
         toggler.children('i').addClass('icon-chevron-right')
-        content.hide()
+        tab_content.hide()
 
     # polymorphic-association
 
-    $('form [data-polymorphic]').each ->
+    content.find('[data-polymorphic]').each ->
       type_select = $(this)
       field = type_select.parents('.control-group').first()
       object_select = field.find('select').last()
@@ -149,14 +151,14 @@ $(document).on 'rails_admin.dom_ready', ->
     # ckeditor
 
     goCkeditors = ->
-      $('form [data-richtext=ckeditor]').not('.ckeditored').each (index, domEle) ->
+      content.find('[data-richtext=ckeditor]').not('.ckeditored').each (index, domEle) ->
         try
           if instance = window.CKEDITOR.instances[this.id]
             instance.destroy(true)
         window.CKEDITOR.replace(this, $(this).data('options'))
         $(this).addClass('ckeditored')
 
-    $editors = $('form [data-richtext=ckeditor]').not('.ckeditored')
+    $editors = content.find('[data-richtext=ckeditor]').not('.ckeditored')
     if $editors.length
       if not window.CKEDITOR
         options = $editors.first().data('options')
@@ -177,7 +179,7 @@ $(document).on 'rails_admin.dom_ready', ->
           CodeMirror.fromTextArea(textarea,{mode:options['options']['mode'],theme:options['options']['theme']})
           $(textarea).addClass('codemirrored')
 
-    array = $('form [data-richtext=codemirror]').not('.codemirrored')
+    array = content.find('[data-richtext=codemirror]').not('.codemirrored')
     if array.length
       @array = array
       if not window.CodeMirror
@@ -196,7 +198,7 @@ $(document).on 'rails_admin.dom_ready', ->
         $(@).closest('.controls').addClass('well')
         $(@).wysihtml5(config_options)
 
-    array = $('form [data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
+    array = content.find('[data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
     if array.length
       @array = array
       options = $(array[0]).data('options')

data/app/helpers/rails_admin/application_helper.rb

@@ -44,8 +44,8 @@ module RailsAdmin
       action = RailsAdmin::Config::Actions.find(action.to_sym) if (action.is_a?(Symbol) || action.is_a?(String))
 
       I18n.t("admin.actions.#{action.i18n_key}.#{label}",
-        :model_label => model_config.try(:label),
-        :model_label_plural => model_config.try(:label_plural),
+        :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)
       )
     end

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

@@ -0,0 +1,10 @@
+:ruby
+  js_data = {
+    :jspath => field.location ? field.location : field.base_location + "ckeditor.js",
+    :base_location => field.base_location,
+    :options => {
+      :customConfig => field.config_js ? field.config_js : field.base_location + "config.js"
+    }
+  }
+
+= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => 'ckeditor', :options => js_data.to_json }).reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })

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

@@ -0,0 +1,9 @@
+:ruby
+  js_data = {
+    :csspath => field.css_location,
+    :jspath => field.js_location,
+    :options => field.config,
+    :locations => field.assets
+  }
+
+= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => 'codemirror', :options => js_data.to_json }).reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })

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

@@ -1,31 +1 @@
-:ruby
-  if field.ckeditor
-    richtext = 'ckeditor'
-    js_data = {
-      :jspath => field.ckeditor_location ? field.ckeditor_location : field.ckeditor_base_location + "ckeditor.js",
-      :base_location => field.ckeditor_base_location,
-      :options => {
-        :customConfig => field.ckeditor_config_js ? field.ckeditor_config_js : field.ckeditor_base_location + "config.js"
-      }
-    }
-  elsif field.codemirror
-    richtext = 'codemirror'
-    js_data = {
-      :csspath => field.codemirror_css_location,
-      :jspath => field.codemirror_js_location,
-      :options => field.codemirror_config,
-      :locations => field.codemirror_assets
-    }
-  elsif field.bootstrap_wysihtml5
-    richtext = 'bootstrap-wysihtml5'
-    js_data = {
-      :csspath => field.bootstrap_wysihtml5_css_location,
-      :jspath => field.bootstrap_wysihtml5_js_location,
-      :config_options => field.bootstrap_wysihtml5_config_options.to_json
-    }
-  else
-    richtext = false
-    js_data = {}
-  end
-
-= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => richtext, :options => js_data.to_json }).reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => false, :options => {}.to_json }).reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })

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

@@ -0,0 +1,8 @@
+:ruby
+  js_data = {
+    :csspath => field.css_location,
+    :jspath => field.js_location,
+    :config_options => field.config_options.to_json
+  }
+
+= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => 'bootstrap-wysihtml5', :options => js_data.to_json }).reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })

data/lib/generators/rails_admin/install_generator.rb

@@ -12,6 +12,8 @@ module RailsAdmin
     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"
@@ -22,46 +24,53 @@ module RailsAdmin
 
       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:"
-      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"
+      if options[:skip_devise]
+        display "Skipping devise installation..."
       else
-        display "Looks like you've already installed it, good!"
+        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\'/, ''
       route("mount RailsAdmin::Engine => '/#{namespace}', :as => 'rails_admin'")
 
-      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
+      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 "Ok, Devise looks already set up with user model name '#{model_name}':"
+          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..."
-      @model_name = model_name
+      @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
@@ -70,11 +79,11 @@ module RailsAdmin
         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_#{model_name}'", :green
-            gsub_file Rails.root.join("config/initializers/rails_admin.rb"), ::Regexp.new("#{config_tag}\.current_user_method.?\{.+?\}"), "#{config_tag}.current_user_method { current_#{model_name} }"
+            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_#{model_name}'!", :yellow
-            insert_into_file Rails.root.join("config/initializers/rails_admin.rb"), "\n\n  #{config_tag}.current_user_method { current_#{model_name} } #auto-generated", :after => /^RailsAdmin\.config.+$/
+            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