rails_admin 0.4.9 → 0.5.0

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

@@ -12,7 +12,7 @@ RailsAdmin.config do |config|
   # 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_<%= @model_name.underscore %> } # auto-generated
+  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 %>'
@@ -57,7 +57,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
+  #   # 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:
 

data/lib/rails_admin/abstract_model.rb

@@ -32,7 +32,7 @@ module RailsAdmin
             end
           end
         end
-        @@polymorphic_parents[adapter.to_sym][[model_name.underscore, name].join('_').to_sym]
+        @@polymorphic_parents[adapter.to_sym][[model_name.to_s.underscore, name].join('_').to_sym]
       end
 
       # For testing

data/lib/rails_admin/adapters/active_record.rb

@@ -28,7 +28,7 @@ module RailsAdmin
       end
 
       def scoped
-        model.scoped
+        model.all
       end
 
       def first(options = {}, scope = nil)
@@ -40,8 +40,8 @@ module RailsAdmin
         scope = scope.includes(options[:include]) if options[:include]
         scope = scope.limit(options[:limit]) if options[:limit]
         scope = scope.where(model.primary_key => options[:bulk_ids]) if options[:bulk_ids]
-        scope = scope.where(query_conditions(options[:query])) if options[:query]
-        scope = scope.where(filter_conditions(options[:filters])) if options[:filters]
+        scope = query_scope(scope, options[:query]) if options[:query]
+        scope = filter_scope(scope, options[:filters]) if options[:filters]
         if options[:page] && options[:per]
           scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])
         end
@@ -117,9 +117,10 @@ module RailsAdmin
 
       private
 
-      def query_conditions(query, fields = config.list.fields.select(&:queryable?))
+      def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
         statements = []
         values = []
+        tables = []
 
         fields.each do |field|
           field.searchable_columns.flatten.each do |column_infos|
@@ -127,32 +128,33 @@ module RailsAdmin
             statements << statement if statement
             values << value1 unless value1.nil?
             values << value2 unless value2.nil?
+            table, column = column_infos[:column].split('.')
+            tables.push(table) if column
           end
         end
-
-        [statements.join(' OR '), *values]
+        scope.where(statements.join(' OR '), *values).references(*(tables.uniq))
       end
 
       # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}
       # "0055" is the filter index, no use here. o is the operator, v the value
-      def filter_conditions(filters, fields = config.list.fields.select(&:filterable?))
-        statements = []
-        values = []
-
+      def filter_scope(scope, filters, fields = config.list.fields.select(&:filterable?))
         filters.each_pair do |field_name, filters_dump|
           filters_dump.each do |filter_index, filter_dump|
-            field_statements = []
+            statements = []
+            values = []
+            tables = []
             fields.find{|f| f.name.to_s == field_name}.searchable_columns.each do |column_infos|
               statement, value1, value2 = build_statement(column_infos[:column], column_infos[:type], filter_dump[:v], (filter_dump[:o] || 'default'))
-              field_statements << statement if statement.present?
+              statements << statement if statement.present?
               values << value1 unless value1.nil?
               values << value2 unless value2.nil?
+              table, column = column_infos[:column].split('.')
+              tables.push(table) if column
             end
-            statements << "(#{field_statements.join(' OR ')})" unless field_statements.empty?
+            scope = scope.where(statements.join(' OR '), *values).references(*(tables.uniq))
           end
         end
-
-        [statements.join(' AND '), *values]
+        scope
       end
 
       def build_statement(column, type, value, operator)
@@ -262,7 +264,7 @@ module RailsAdmin
 
       def association_model_lookup(association)
         if association.options[:polymorphic]
-          RailsAdmin::AbstractModel.polymorphic_parents(:active_record, self.model.model_name, association.name) || []
+          RailsAdmin::AbstractModel.polymorphic_parents(:active_record, self.model.model_name.to_s, association.name) || []
         else
           association.klass
         end
@@ -295,7 +297,9 @@ module RailsAdmin
       end
 
       def association_read_only_lookup(association)
-        association.options[:readonly]
+        if association.scope.is_a? Proc
+          association.klass.all.instance_eval(&association.scope).readonly_value
+        end
       end
 
       def association_foreign_key_lookup(association)

data/lib/rails_admin/adapters/active_record/abstract_object.rb

@@ -16,7 +16,7 @@ module RailsAdmin
         end
 
         def set_attributes(attributes, role = nil)
-          object.assign_attributes(attributes, :as => role)
+          object.assign_attributes(attributes)
         end
 
         def save(options = { :validate => true })

data/lib/rails_admin/adapters/mongoid.rb

@@ -278,6 +278,7 @@ module RailsAdmin
         {
           "Array"          => { :type => :serialized },
           "BigDecimal"     => { :type => :decimal },
+          "Mongoid::Boolean"        => { :type => :boolean },
           "Boolean"        => { :type => :boolean },
           "BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
           "Moped::BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },

data/lib/rails_admin/config.rb

@@ -203,8 +203,8 @@ module RailsAdmin
         possible =
           included_models.map(&:to_s).presence || (
           @@system_models ||= # memoization for tests
-            ([Rails.application] + Rails::Application::Railties.engines).map do |app|
-              (app.paths['app/models'] + app.config.autoload_paths).map do |load_path|
+            ([Rails.application] + Rails::Engine::Railties.engines).map do |app|
+              (app.paths['app/models'].to_a + app.config.autoload_paths).map do |load_path|
                 Dir.glob(app.root.join(load_path)).map do |load_dir|
                   Dir.glob(load_dir + "/**/*.rb").map do |filename|
                     # app/models/module/class.rb => module/class.rb => module/class => Module::Class

data/lib/rails_admin/config/configurable.rb

@@ -18,9 +18,9 @@ module RailsAdmin
         self.class.register_instance_option(option_name, scope, &default)
       end
 
-      def register_deprecated_instance_option(option_name, replacement_option_name)
+      def register_deprecated_instance_option(option_name, replacement_option_name=nil, &custom_error)
         scope = class << self; self; end;
-        self.class.register_deprecated_instance_option(option_name, replacement_option_name, scope)
+        self.class.register_deprecated_instance_option(option_name, replacement_option_name, scope, &custom_error)
       end
 
       module ClassMethods
@@ -72,10 +72,18 @@ module RailsAdmin
           end
         end
 
-        def register_deprecated_instance_option(option_name, replacement_option_name, scope = self)
+        def register_deprecated_instance_option(option_name, replacement_option_name=nil, scope = self)
           scope.send(:define_method, option_name) do |*args, &block|
-            ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
-            send(replacement_option_name, *args, &block)
+            if replacement_option_name
+              ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
+              send(replacement_option_name, *args, &block)
+            else
+              if block_given?
+                yield
+              else
+                raise "The #{option_name} configuration option is removed without replacement."
+              end
+            end
           end
         end
 

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

@@ -214,31 +214,7 @@ module RailsAdmin
         end
 
         def editable?
-          return false if @properties && @properties[:read_only]
-          role = bindings[:view].controller.send(:_attr_accessible_role)
-          active_model_attr_accessible = !bindings[:object].class.active_authorizer[role].deny?(self.method_name)
-
-          return true if active_model_attr_accessible
-          if RailsAdmin::Config.yell_for_non_accessible_fields
-            accessible = "attr_accessible :#{self.method_name}#{role == :default ? '' : ", :as => :#{role}"}"
-
-            Rails.logger.debug <<-MESSAGE.strip_heredoc
-
-
-            [RailsAdmin] Please add '#{accessible}' in your '#{bindings[:object].class}' model definition if you want to make it editable.
-            You can also explicitely mark this field as read-only:
-
-            config.model #{bindings[:object].class} do
-              field :#{self.name} do
-                read_only true
-              end
-            end
-
-            Add 'config.yell_for_non_accessible_fields = false' in your 'rails_admin.rb' initializer if you do not want to see these warnings
-
-            MESSAGE
-          end
-          false
+          !(@properties && @properties[:read_only])
         end
 
         # Is this an association

data/lib/rails_admin/config/fields/factories/enum.rb

@@ -2,7 +2,14 @@ require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if parent.abstract_model.model.respond_to?("#{properties[:name]}_enum") || parent.abstract_model.model.method_defined?("#{properties[:name]}_enum")
+
+  _model = parent.abstract_model.model
+  _method_name = "#{properties[:name]}_enum"
+
+  #NOTICE: _method_name could be `to_enum` and this method defined in Object.
+  if !Object.respond_to?(_method_name) && \
+      (_model.respond_to?(_method_name) || \
+          _model.method_defined?(_method_name))
     fields << RailsAdmin::Config::Fields::Types::Enum.new(parent, properties[:name], properties)
     true
   else

data/lib/rails_admin/config/fields/types/all.rb

@@ -4,10 +4,10 @@ require 'rails_admin/config/fields/types/bson_object_id'
 require 'rails_admin/config/fields/types/date'
 require 'rails_admin/config/fields/types/datetime'
 require 'rails_admin/config/fields/types/decimal'
+require 'rails_admin/config/fields/types/dragonfly'
 require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/file_upload'
 require 'rails_admin/config/fields/types/paperclip'
-require 'rails_admin/config/fields/types/dragonfly'
 require 'rails_admin/config/fields/types/carrierwave'
 require 'rails_admin/config/fields/types/float'
 require 'rails_admin/config/fields/types/has_and_belongs_to_many_association'
@@ -23,3 +23,6 @@ require 'rails_admin/config/fields/types/serialized'
 require 'rails_admin/config/fields/types/time'
 require 'rails_admin/config/fields/types/timestamp'
 require 'rails_admin/config/fields/types/color'
+require 'rails_admin/config/fields/types/ck_editor'
+require 'rails_admin/config/fields/types/code_mirror'
+require 'rails_admin/config/fields/types/wysihtml5'

data/lib/rails_admin/config/fields/types/ck_editor.rb

@@ -0,0 +1,45 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class CKEditor < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          # If you want to have a different toolbar configuration for CKEditor
+          # create your own custom config.js and override this configuration
+          register_instance_option :config_js do
+            nil
+          end
+
+          #Use this if you want to point to a cloud instances of CKeditor
+          register_instance_option :location do
+            nil
+          end
+
+          #Use this if you want to point to a cloud instances of the base CKeditor
+          register_instance_option :base_location do
+            "#{Rails.application.config.assets.prefix}/ckeditor/"
+          end
+
+          register_instance_option :html_attributes do
+            {
+              :cols => '48',
+              :rows => '3'
+            }
+          end
+
+          register_instance_option :partial do
+            :form_ck_editor
+          end
+
+          [:base_location, :config_js, :location].each do |key|
+            register_deprecated_instance_option :"ckeditor_#{key}", key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/code_mirror.rb

@@ -0,0 +1,55 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class CodeMirror < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          #Pass the theme and mode for Codemirror
+          register_instance_option :config do
+            {
+              :mode => 'css',
+              :theme => 'night'
+            }
+          end
+
+          #Pass the location of the theme and mode for Codemirror
+          register_instance_option :assets do
+            {
+              :mode => '/assets/codemirror/modes/css.js',
+              :theme => '/assets/codemirror/themes/night.css'
+            }
+          end
+
+          #Use this if you want to point to a cloud instances of CodeMirror
+          register_instance_option :js_location do
+            '/assets/codemirror.js'
+          end
+
+          #Use this if you want to point to a cloud instances of CodeMirror
+          register_instance_option :css_location do
+            '/assets/codemirror.css'
+          end
+
+          register_instance_option :html_attributes do
+            {
+              :cols => '48',
+              :rows => '3'
+            }
+          end
+
+          register_instance_option :partial do
+            :form_code_mirror
+          end
+
+          [:assets, :config, :css_location, :js_location].each do |key|
+            register_deprecated_instance_option :"codemirror_#{key}", key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/serialized.rb

@@ -9,7 +9,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types::register(self)
 
           register_instance_option :formatted_value do
-            YAML.dump(value)
+            YAML.dump(value) unless value.nil?
           end
 
           def parse_input(params)

data/lib/rails_admin/config/fields/types/text.rb

@@ -8,76 +8,22 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          # CKEditor is disabled by default
-          register_instance_option :ckeditor do
-            false
+          [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
+            register_deprecated_instance_option key do
+              raise "The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead."
+            end
           end
 
-          # If you want to have a different toolbar configuration for CKEditor
-          # create your own custom config.js and override this configuration
-          register_instance_option :ckeditor_config_js do
-            nil
+          [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
+            register_deprecated_instance_option key do
+              raise "The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead."
+            end
           end
 
-          #Use this if you want to point to a cloud instances of CKeditor
-          register_instance_option :ckeditor_location do
-            nil
-          end
-
-          #Use this if you want to point to a cloud instances of the base CKeditor
-          register_instance_option :ckeditor_base_location do
-            "#{Rails.application.config.assets.prefix}/ckeditor/"
-          end
-
-          # Codemirror is disabled by default and CKEditor takes precedence
-          register_instance_option :codemirror do
-            false
-          end
-
-          #Pass the theme and mode for Codemirror
-          register_instance_option :codemirror_config do
-            {
-              :mode => 'css',
-              :theme => 'night'
-            }
-          end
-
-          #Pass the location of the theme and mode for Codemirror
-          register_instance_option :codemirror_assets do
-            {
-              :mode => '/assets/codemirror/modes/css.js',
-              :theme => '/assets/codemirror/themes/night.css'
-            }
-          end
-
-          #Use this if you want to point to a cloud instances of CodeMirror
-          register_instance_option :codemirror_js_location do
-            '/assets/codemirror.js'
-          end
-
-          #Use this if you want to point to a cloud instances of CodeMirror
-          register_instance_option :codemirror_css_location do
-            '/assets/codemirror.css'
-          end
-
-          # bootstrap_wysihtml5
-          register_instance_option :bootstrap_wysihtml5 do
-            false
-          end
-
-          # If you want to have a different toolbar configuration for wysihtml5
-          # you can use a Ruby hash to configure these options:
-          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
-          register_instance_option :bootstrap_wysihtml5_config_options do
-            nil
-          end
-
-          register_instance_option :bootstrap_wysihtml5_css_location do
-            '/assets/bootstrap-wysihtml5.css'
-          end
-
-          register_instance_option :bootstrap_wysihtml5_js_location do
-            '/assets/bootstrap-wysihtml5.js'
+          [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
+            register_deprecated_instance_option key do
+              raise "The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead."
+            end
           end
 
           register_instance_option :html_attributes do