rails_admin 0.1.2 → 0.2.0

data/Gemfile

@@ -1,21 +1,9 @@
 source 'https://rubygems.org'
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
 group :active_record do
   platforms :jruby do
-    case ENV['CI_DB_ADAPTER']
-    when 'mysql'
-      gem 'activerecord-jdbcmysql-adapter', '~> 1.2'
-      gem 'jdbc-mysql', '~> 5.1'
-    when 'postgresql'
-      gem 'activerecord-jdbcpostgresql-adapter', '~> 1.2'
-      gem 'jdbc-postgres', '~> 9.0'
-    else
-      gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
-      gem 'jdbc-sqlite3', '~> 3.6'
-    end
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
+    gem 'jdbc-sqlite3', '~> 3.6'
   end
 
   platforms :ruby, :mswin, :mingw do
@@ -28,7 +16,6 @@ group :active_record do
       gem 'sqlite3', '~> 1.3'
     end
   end
-  gem 'carrierwave'
 end
 
 group :mongoid do
@@ -39,15 +26,26 @@ end
 
 group :debug do
   platform :mri_19 do
-    gem 'debugger'
-    gem 'simplecov', :require => false
+    gem 'debugger', '~> 1.2'
+    gem 'simplecov', '~> 0.6', :require => false
   end
 end
 
 group :development, :test do
-  gem 'cancan'
-  gem 'devise'
-  gem 'paperclip'
+  gem 'strong_parameters', '~> 0.1.5'
+  gem 'cancan', '~> 1.6'
+  gem 'capybara', '~> 1.1'
+  gem 'carrierwave', '~> 0.6'
+  gem 'database_cleaner', '~> 0.8'
+  gem 'devise', '~> 2.1'
+  gem 'dragonfly', '~> 0.9'
+  gem 'factory_girl', '~> 4.1'
+  gem 'generator_spec', '~> 0.8'
+  gem 'launchy', '~> 2.1'
+  gem 'mini_magick', '~> 3.4'
+  gem 'paperclip', '~> 3.3'
+  gem 'rspec-rails', '~> 2.11'
+  gem 'timecop', '~> 0.5'
 end
 
 gemspec

data/README.md

@@ -1,10 +1,17 @@
-# RailsAdmin [![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/sferik/rails_admin.png?travis)][gemnasium] [![Code Climate](https://codeclimate.com/badge.png)][codeclimate] [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png)][pledgie]
+# RailsAdmin
+[![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/sferik/rails_admin.png?travis)][gemnasium]
+[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+[![Pledgie](https://www.pledgie.com/campaigns/15917.png)][pledgie]
+[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)][flattr]
+
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
 [travis]: http://travis-ci.org/sferik/rails_admin
 [gemnasium]: https://gemnasium.com/sferik/rails_admin
 [codeclimate]: https://codeclimate.com/github/sferik/rails_admin
 [pledgie]: http://www.pledgie.com/campaigns/15917
+[flattr]: http://flattr.com/thing/799416/sferikrailsadmin-on-GitHub
 
 It started as a port of [MerbAdmin][merb-admin] to Rails 3 and was implemented
 as a [Ruby Summer of Code project][rubysoc] by [Bogdan Gaza][hurrycane] with

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

@@ -191,19 +191,20 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # bootstrap_wysihtml5
 
-    goBootstrapWysihtml5s = (array) =>
+    goBootstrapWysihtml5s = (array, config_options) =>
       array.each ->
         $(@).addClass('bootstrap-wysihtml5ed')
         $(@).closest('.controls').addClass('well')
-        $(@).wysihtml5()
+        $(@).wysihtml5(config_options)
 
     array = $('form [data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
     if array.length
       @array = array
       if not window.wysihtml5
         options = $(array[0]).data('options')
+        config_options = $.parseJSON(options['config_options'])
         $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
         $.getScript options['jspath'], (script, textStatus, jqXHR) =>
-          goBootstrapWysihtml5s(@array)
+          goBootstrapWysihtml5s(@array, config_options)
       else
-        goBootstrapWysihtml5s(@array)
+        goBootstrapWysihtml5s(@array, config_options)

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

@@ -102,7 +102,7 @@ body.rails_admin {
         margin-left:-10px;
         .control-group > label {
           padding-left:10px;
-          width:130px;
+          width:135px;
         }
         legend {
           float:left;
@@ -119,7 +119,7 @@ body.rails_admin {
         margin-left:-20px;
         .control-group > label {
           padding-left:20px;
-          width:120px;
+          width:125px;
         }
         legend {
           margin-left:20px;
@@ -135,7 +135,7 @@ body.rails_admin {
         margin-left:-30px;
         .control-group > label {
           padding-left:30px;
-          width:110px;
+          width:115px;
         }
         legend {
           margin-left:30px;
@@ -151,7 +151,7 @@ body.rails_admin {
         margin-left:-40px;
         .control-group > label {
           padding-left:40px;
-          width:100px;
+          width:105px;
         }
         legend {
           margin-left:40px;

data/app/controllers/rails_admin/main_controller.rb

@@ -87,11 +87,20 @@ module RailsAdmin
       end
     end
 
+    def satisfy_strong_params!
+      if @abstract_model.model.ancestors.map(&: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?
-      fields = model_config.send(action).fields
+      fields = model_config.send(action).with(:controller => self, :view => self.view_context, :object => @object).visible_fields
+      allowed_methods = fields.map{|f|
+        f.allowed_methods
+      }.flatten.uniq.map(&:to_s) << "id" << "_destroy"
       fields.select{ |f| f.respond_to?(:parse_input) }.each {|f| f.parse_input(_params) }
-
+      _params.slice!(*allowed_methods)
       fields.select(&:nested_form).each do |association|
         children_params = association.multiple? ? _params[association.method_name].try(:values) : [_params[association.method_name]].compact
         (children_params || []).each do |children_param|

data/app/helpers/rails_admin/application_helper.rb

@@ -70,7 +70,7 @@ module RailsAdmin
       nodes.map do |node|
         model_param = node.abstract_model.to_param
         url         = url_for(:action => :index, :controller => 'rails_admin/main', :model_name => model_param)
-        level_class = "nav-level-#{level}" if level > 0
+        level_class = " nav-level-#{level}" if level > 0
 
         li = content_tag :li, "data-model"=>model_param do
           link_to node.label_plural, url, :class => "pjax#{level_class}"

data/app/helpers/rails_admin/form_builder.rb

@@ -18,7 +18,7 @@ module RailsAdmin
           action = options[:action]
         end
 
-        groups = options[:model_config].send(action).with(:form => self, :object => @object, :view => @template).visible_groups
+        groups = options[:model_config].send(action).with(:form => self, :object => @object, :view => @template, :controller => @template.controller).visible_groups
 
         object_infos +
         groups.map do |fieldset|
@@ -29,7 +29,7 @@ module RailsAdmin
     end
 
     def fieldset_for fieldset, nested_in
-      if (fields = fieldset.with(:form => self, :object => @object, :view => @template).visible_fields).length > 0
+      if (fields = fieldset.with(:form => self, :object => @object, :view => @template, :controller => @template.controller).visible_fields).length > 0
         @template.content_tag :fieldset do
           contents = []
           contents << @template.content_tag(:legend, %{<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}}.html_safe, :style => "#{fieldset.name == :default ? 'display:none' : ''}")
@@ -102,7 +102,7 @@ module RailsAdmin
     def dom_name field
       (@dom_name ||= {})[field.name] ||= %{#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Association) && field.multiple? ? '[]' : ''}}
     end
-    
+
     protected
       def without_field_error_proc_added_div
         default_field_error_proc = ::ActionView::Base.field_error_proc

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

@@ -11,16 +11,16 @@
   selected_ids = selected.map{|s| s.send(field.associated_primary_key)}
 
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
-  
+
   xhr = !field.associated_collection_cache_all
-  
+
   collection = if xhr
     selected.map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
   else
     i = 0
     controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
   end
-  
+
   js_data = {
     :xhr => xhr,
     :'edit-url' => (authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :id => '__ID__') : ''),
@@ -36,7 +36,7 @@
       :down      => t("admin.misc.down")
     }
   }
-  
+
 %input{:name => form.dom_name(field), :type => "hidden", :value => ""}
 
 - selected_ids = (hdv = field.html_default_value).nil? ? selected_ids : hdv

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

@@ -17,9 +17,9 @@
   edit_url = authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :modal => true, :id => '__ID__') : ''
 
   xhr = !field.associated_collection_cache_all
-  
+
   collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
-  
+
   js_data = {
     :xhr => xhr,
     :remote_source => index_path(config.abstract_model.to_param, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true)

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

@@ -7,4 +7,4 @@
 - form.object.send("build_#{field.name}") unless form.object.send(field.name)
 .tab-content
   = form.fields_for field.name do |nested_form|
-    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
+    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })

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

@@ -20,7 +20,8 @@
     richtext = 'bootstrap-wysihtml5'
     js_data = {
       :csspath => field.bootstrap_wysihtml5_css_location,
-      :jspath => field.bootstrap_wysihtml5_js_location
+      :jspath => field.bootstrap_wysihtml5_js_location,
+      :config_options => field.bootstrap_wysihtml5_config_options.to_json
     }
   else
     richtext = false

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

@@ -1,5 +1,5 @@
 - params = request.params.except(:action, :controller, :utf8, :page, :per_page, :format, :authenticity_token)
-- visible_fields = @model_config.export.with(:view => self, :object => @abstract_model.model.new).visible_fields
+- visible_fields = @model_config.export.with(:view => self, :object => @abstract_model.model.new, :controller => self.controller).visible_fields
 
 = form_tag export_path(params.merge(:all => true)), :method => 'post', :class => 'form-horizontal denser' do
 
@@ -27,7 +27,7 @@
               = field.label
 
     - visible_fields.select{ |f| f.association? && !f.association[:polymorphic] }.each do |field|
-      - fields = field.associated_model_config.export.with(:view => self, :object => (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
+      - fields = field.associated_model_config.export.with(:controller => self.controller, :view => self, :object => (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
       .control-group
         %label.control-label{:rel => 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), :onclick => 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', :name => field.label.downcase)
         .controls

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

@@ -11,7 +11,7 @@
   export_action = RailsAdmin::Config::Actions.find(:export, { :controller => self.controller, :abstract_model => @abstract_model })
   export_action = export_action && authorized?(export_action.authorization_key, @abstract_model) ? export_action : nil
 
-  properties = @model_config.list.with(:view => self, :object => @abstract_model.model.new).visible_fields
+  properties = @model_config.list.with(:controller => self.controller, :view => self, :object => @abstract_model.model.new).visible_fields
   # columns paginate
   @filterable_fields = @model_config.list.fields.select(&:filterable?)
   sets = get_column_sets(properties)
@@ -80,9 +80,9 @@
     monthNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_month_names.to_json}
     }
     }
-    
+
     = @ordered_filter_string
-    
+
     });
   %style
     - properties.select{ |p| p.column_width.present? }.each do |property|
@@ -135,6 +135,6 @@
       - total_count = @objects.total_count.to_i
       = paginate(@objects, :theme => 'twitter-bootstrap', :remote => true)
       = link_to(t("admin.misc.show_all"), index_path(params.merge(:all => true)), :class => "show-all btn clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
-      .clearfix.total-count= "#{total_count} #{@model_config.label_plural.downcase}"
+      .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"
     - else
-      .clearfix.total-count= "#{@objects.size} #{@model_config.label_plural.downcase}"
+      .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"

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

@@ -1,5 +1,5 @@
 - @model_config.show.with(:object => @object, :view => self).visible_groups.each do |fieldset|
-  - unless (fields = fieldset.with(:object => @object, :view => self).visible_fields).empty?
+  - unless (fields = fieldset.with(:object => @object, :view => self, :controller => self.controller).visible_fields).empty?
     - if !(values = fields.map{ |f| v = f.value; (!v.nil? && v != '' && v != []) ? v : nil }).compact.empty? || !RailsAdmin::config.compact_show_view
       .fieldset
         %h4

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

@@ -41,7 +41,7 @@ RailsAdmin.config do |config|
   # 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.
@@ -58,7 +58,7 @@ RailsAdmin.config do |config|
   # 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.underscore %>.rb model definition
-  
+
   #   # Found associations:
 
 <%= abstract_model.config.export.fields.select{|f| f.association?}.map do |field|
@@ -72,16 +72,16 @@ end.join("\n") %>
 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

data/lib/rails_admin/abstract_model.rb

@@ -18,6 +18,7 @@ module RailsAdmin
         m = m.is_a?(Class) ? m : m.constantize
         (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?
         nil
       end
 

data/lib/rails_admin/config.rb

@@ -69,7 +69,7 @@ module RailsAdmin
       # accepts a hash of static links to be shown below the main navigation
       attr_accessor :navigation_static_links
       attr_accessor :navigation_static_label
-      
+
       # yell about fields that are not marked as accessible
       attr_accessor :yell_for_non_accessible_fields
 

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

@@ -9,7 +9,7 @@ module RailsAdmin
         include RailsAdmin::Config::Proxyable
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
-        
+
         register_instance_option :only do
           nil
         end

data/lib/rails_admin/config/actions/edit.rb

@@ -28,9 +28,10 @@ module RailsAdmin
               @modified_assoc = []
 
               @old_object = @object.dup
-              
-              sanitize_params_for! :update
-              
+
+              satisfy_strong_params!
+              sanitize_params_for!(request.xhr? ? :modal : :update)
+
               @object.set_attributes(params[@abstract_model.param_key], _attr_accessible_role)
               @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
@@ -40,7 +41,7 @@ module RailsAdmin
                 @auditing_adapter && @auditing_adapter.update_object(@abstract_model, @object, @cached_assocations_hash, associations_hash, @modified_assoc, @old_object, _current_user)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js { render :json => { :id => @object.id, :label => @model_config.with(:object => @object).object_label } }
+                  format.js { render :json => { :id => @object.id.to_s, :label => @model_config.with(:object => @object).object_label } }
                 end
               else
                 handle_save_error :edit

data/lib/rails_admin/config/actions/new.rb

@@ -34,18 +34,19 @@ module RailsAdmin
 
               @modified_assoc = []
               @object = @abstract_model.new
-              sanitize_params_for! :create
-              
+              satisfy_strong_params!
+              sanitize_params_for!(request.xhr? ? :modal : :create)
+
               @object.set_attributes(params[@abstract_model.param_key], _attr_accessible_role)
               @authorization_adapter && @authorization_adapter.attributes_for(:create, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
               end
-              
+
               if @object.save
                 @auditing_adapter && @auditing_adapter.create_object("Created #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js   { render :json => { :id => @object.id, :label => @model_config.with(:object => @object).object_label } }
+                  format.js   { render :json => { :id => @object.id.to_s, :label => @model_config.with(:object => @object).object_label } }
                 end
               else
                 handle_save_error

data/lib/rails_admin/config/fields/association.rb

@@ -15,7 +15,7 @@ module RailsAdmin
           @properties
         end
 
-        register_instance_option(:pretty_value) do
+        register_instance_option :pretty_value do
           v = bindings[:view]
           [value].flatten.select(&:present?).map do |associated|
             amc = polymorphic? ? RailsAdmin.config(associated) : associated_model_config # perf optimization for non-polymorphic associations
@@ -29,12 +29,12 @@ module RailsAdmin
         # Accessor whether association is visible or not. By default
         # association checks whether the child model is excluded in
         # configuration or not.
-        register_instance_option(:visible?) do
+        register_instance_option :visible? do
           @visible ||= !self.associated_model_config.excluded?
         end
 
         # use the association name as a key, not the association key anymore!
-        register_instance_option(:label) do
+        register_instance_option :label do
           (@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name association[:name]
         end
 
@@ -46,12 +46,12 @@ module RailsAdmin
             scope.limit(associated_collection_scope_limit)
           end
         end
-        
+
         # inverse relationship
         register_instance_option :inverse_of do
           association[:inverse_of]
         end
-        
+
         # preload entire associated collection (per associated_collection_scope) on load
         # Be sure to set limit in associated_collection_scope if set is large
         register_instance_option :associated_collection_cache_all do
@@ -67,17 +67,17 @@ module RailsAdmin
         def associated_object_label_method
           @associated_object_label_method ||= associated_model_config.object_label_method
         end
-        
+
         # Reader for associated primary key
         def associated_primary_key
           @associated_primary_key ||= association[:primary_key_proc].call
         end
-        
+
         # Reader for the association's key
         def foreign_key
           association[:foreign_key]
         end
-        
+
         # Reader whether this is a polymorphic association
         def polymorphic?
           association[:polymorphic]
@@ -92,12 +92,12 @@ module RailsAdmin
         def value
           bindings[:object].send(association[:name])
         end
-        
+
         # has many?
         def multiple?
           true
         end
-        
+
         def virtual?
           true
         end