rails_admin 0.0.5 → 0.1.0

data/lib/rails_admin/adapters/mongoid.rb

@@ -36,7 +36,7 @@ module RailsAdmin
 
       def all(options = {},scope=nil)
         scope ||= self.scoped
-        scope = scope.includes(options[:include]) if options[:include]
+        scope = scope.includes(*options[:include]) if options[:include]
         scope = scope.limit(options[:limit]) if options[:limit]
         scope = scope.any_in(:_id => options[:bulk_ids]) if options[:bulk_ids]
         scope = scope.where(query_conditions(options[:query])) if options[:query]
@@ -83,44 +83,13 @@ module RailsAdmin
       def properties
         fields = model.fields.reject{|name, field| DISABLED_COLUMN_TYPES.include?(field.type.to_s) }
         fields.map do |name,field|
-          ar_type = {
-            "Array"          => { :type => :serialized },
-            "BigDecimal"     => { :type => :decimal },
-            "Boolean"        => { :type => :boolean },
-            "BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
-            "Moped::BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
-            "Date"           => { :type => :date },
-            "DateTime"       => { :type => :datetime },
-            "Float"          => { :type => :float },
-            "Hash"           => { :type => :serialized },
-            "Integer"        => { :type => :integer },
-            "Object"         => (
-              if associations.find{|a| a[:type] == :belongs_to && a[:foreign_key] == name.to_sym}
-                { :type => :bson_object_id }
-              else
-                { :type => :string, :length => 255 }
-              end
-            ),
-            "String"         => (
-              if (length = length_validation_lookup(name)) && length < 256
-                { :type => :string, :length => length }
-              elsif STRING_TYPE_COLUMN_NAMES.include?(name.to_sym)
-                { :type => :string, :length => 255 }
-              else
-                { :type => :text }
-              end
-            ),
-            "Symbol"         => { :type => :string, :length => 255 },
-            "Time"           => { :type => :datetime },
-          }[field.type.to_s] or raise "Need to map field #{field.type.to_s} for field name #{name} in #{model.inspect}"
-
           {
             :name => field.name.to_sym,
             :length => nil,
             :pretty_name => field.name.to_s.gsub('_', ' ').strip.capitalize,
             :nullable? => true,
             :serial? => false,
-          }.merge(ar_type)
+          }.merge(type_lookup(name, field))
         end
       end
 
@@ -128,12 +97,6 @@ module RailsAdmin
         model.collection_name.to_s
       end
 
-      def serialized_attributes
-        # Mongoid Array and Hash type columns are mapped to RA serialized type
-        # through type detection in self#properties.
-        []
-      end
-
       def encoding
         'UTF-8'
       end
@@ -237,11 +200,11 @@ module RailsAdmin
           return if value.blank?
           value = case operator
           when 'default', 'like'
-            Regexp.compile(Regexp.escape(value))
+            Regexp.compile(Regexp.escape(value), Regexp::IGNORECASE)
           when 'starts_with'
-            Regexp.compile("^#{Regexp.escape(value)}")
+            Regexp.compile("^#{Regexp.escape(value)}", Regexp::IGNORECASE)
           when 'ends_with'
-            Regexp.compile("#{Regexp.escape(value)}$")
+            Regexp.compile("#{Regexp.escape(value)}$", Regexp::IGNORECASE)
           when 'is', '='
             value.to_s
           else
@@ -277,6 +240,39 @@ module RailsAdmin
         end
       end
 
+      def type_lookup(name, field)
+        {
+          "Array"          => { :type => :serialized },
+          "BigDecimal"     => { :type => :decimal },
+          "Boolean"        => { :type => :boolean },
+          "BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
+          "Moped::BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
+          "Date"           => { :type => :date },
+          "DateTime"       => { :type => :datetime },
+          "Float"          => { :type => :float },
+          "Hash"           => { :type => :serialized },
+          "Integer"        => { :type => :integer },
+          "Object"         => (
+            if associations.find{|a| a[:type] == :belongs_to && a[:foreign_key] == name.to_sym}
+              { :type => :bson_object_id }
+            else
+              { :type => :string, :length => 255 }
+            end
+          ),
+            "String"         => (
+              if (length = length_validation_lookup(name)) && length < 256
+                { :type => :string, :length => length }
+              elsif STRING_TYPE_COLUMN_NAMES.include?(name.to_sym)
+                { :type => :string, :length => 255 }
+              else
+                { :type => :text }
+              end
+          ),
+            "Symbol"         => { :type => :string, :length => 255 },
+            "Time"           => { :type => :datetime },
+        }[field.type.to_s] or raise "Need to map field #{field.type.to_s} for field name #{name} in #{model.inspect}"
+      end
+
       def association_model_proc_lookup(association)
         if association.polymorphic? && [:referenced_in, :belongs_to].include?(association.macro)
           RailsAdmin::AbstractModel.polymorphic_parents(:mongoid, association.name) || []

data/lib/rails_admin/adapters/mongoid/extension.rb

@@ -9,7 +9,7 @@ module RailsAdmin
           self.nested_attributes_options = {}
           class << self
             def rails_admin(&block)
-              RailsAdmin::Config.model(self, &block)
+              RailsAdmin.config(self, &block)
             end
             alias_method_chain :accepts_nested_attributes_for, :rails_admin
           end

data/lib/rails_admin/config.rb

@@ -63,9 +63,16 @@ module RailsAdmin
       # Stores model configuration objects in a hash identified by model's class
       # name.
       #
-      # @see RailsAdmin::Config.model
+      # @see RailsAdmin.config
       attr_reader :registry
 
+      # 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
+
       # Setup authentication to be run as a before filter
       # This is run inside the controller instance so you can setup any authentication you need to
       #
@@ -264,6 +271,10 @@ module RailsAdmin
       #
       # @see RailsAdmin::Config.registry
       def models(&block)
+        if block
+          raise 'coucou'
+          ActiveSupport::Deprecation.warn("'config.models do ... end' is deprecated for performance reasons and will be removed in next major release, please duplicate to every concerned model instead.")
+        end
         RailsAdmin::AbstractModel.all.map{|m| model(m, &block)}
       end
 
@@ -272,6 +283,7 @@ module RailsAdmin
       # @see RailsAdmin::Config.registry
       def reset
         @compact_show_view = true
+        @yell_for_non_accessible_fields = true
         @authenticate = nil
         @authorize = nil
         @audit = nil
@@ -289,6 +301,8 @@ module RailsAdmin
         @label_methods = [:name, :title]
         @main_app_name = Proc.new { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
         @registry = {}
+        @navigation_static_links = {}
+        @navigation_static_label = nil
         RailsAdmin::Config::Actions.reset
       end
 

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

@@ -9,6 +9,14 @@ module RailsAdmin
         include RailsAdmin::Config::Proxyable
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
+        
+        register_instance_option :only do
+          nil
+        end
+
+        register_instance_option :except do
+          []
+        end
 
         # http://twitter.github.com/bootstrap/base-css.html#icons
         register_instance_option :link_icon do
@@ -17,11 +25,17 @@ module RailsAdmin
 
         # Should the action be visible
         register_instance_option :visible? do
-          authorized? && (bindings[:abstract_model] ? bindings[:abstract_model].config.with(bindings).try(:visible?) : true)
+          authorized?
         end
 
         register_instance_option :authorized? do
-          bindings[:controller] ? bindings[:controller].authorized?(self.authorization_key, bindings[:abstract_model], bindings[:object]) : true
+          (
+            bindings[:controller].nil? or bindings[:controller].authorized?(self.authorization_key, bindings[:abstract_model], bindings[:object])) and (
+            bindings[:abstract_model].nil? or (
+              (only.nil? or [only].flatten.map(&:to_s).include?(bindings[:abstract_model].model.to_s)) and
+              ![except].flatten.map(&:to_s).include?(bindings[:abstract_model].model.to_s) and
+              bindings[:abstract_model].config.with(bindings).visible?
+          ))
         end
 
         # Is the action acting on the root level (Example: /admin/contact)

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

@@ -15,18 +15,20 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             @history = @auditing_adapter && @auditing_adapter.latest || []
-            @abstract_models = RailsAdmin::Config.visible_models(:controller => self).map(&:abstract_model)
+            if @action.statistics?
+              @abstract_models = RailsAdmin::Config.visible_models(:controller => self).map(&:abstract_model)
 
-            @most_recent_changes = {}
-            @count = {}
-            @max = 0
-            @abstract_models.each do |t|
-              scope = @authorization_adapter && @authorization_adapter.query(:index, t)
-              current_count = t.count({}, scope)
-              @max = current_count > @max ? current_count : @max
-              @count[t.pretty_name] = current_count
-              if t.properties.find{|c| c[:name] == :updated_at }
-                @most_recent_changes[t.pretty_name] = t.first(:sort => :updated_at).try(:updated_at)
+              @most_recent_changes = {}
+              @count = {}
+              @max = 0
+              @abstract_models.each do |t|
+                scope = @authorization_adapter && @authorization_adapter.query(:index, t)
+                current_count = t.count({}, scope)
+                @max = current_count > @max ? current_count : @max
+                @count[t.pretty_name] = current_count
+                if t.properties.find{|c| c[:name] == :updated_at }
+                  @most_recent_changes[t.pretty_name] = t.first(:sort => :updated_at).try(:updated_at)
+                end
               end
             end
             render @action.template_name, :status => (flash[:error].present? ? :not_found : 200)
@@ -40,6 +42,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'icon-home'
         end
+
+        register_instance_option :statistics? do
+          true
+        end
       end
     end
   end

data/lib/rails_admin/config/fields.rb

@@ -85,4 +85,3 @@ require 'rails_admin/config/fields/factories/paperclip'
 require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
 require 'rails_admin/config/fields/factories/association'
-require 'rails_admin/config/fields/factories/serialized'

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

@@ -18,11 +18,10 @@ module RailsAdmin
         register_instance_option(:pretty_value) do
           v = bindings[:view]
           [value].flatten.select(&:present?).map do |associated|
-            amc = polymorphic? ? RailsAdmin::Config.model(associated) : associated_model_config # perf optimization for non-polymorphic associations
+            amc = polymorphic? ? RailsAdmin.config(associated) : associated_model_config # perf optimization for non-polymorphic associations
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
-            can_see = v.authorized?(:show, am, associated) && !am.embedded?
-            can_see = can_see && (show_action = RailsAdmin::Config::Actions.find(:show, { :controller => v.controller, :abstract_model => am, :object => associated }))
+            can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
             can_see ? v.link_to(wording, v.url_for(:action => show_action.action_name, :model_name => am.to_param, :id => associated.id), :class => 'pjax') : wording
           end.to_sentence.html_safe
         end

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

@@ -138,6 +138,10 @@ module RailsAdmin
           (@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name
         end
 
+        register_instance_option :hint do
+          (@hint ||= "")
+        end
+
         # Accessor for field's maximum length per database.
         #
         # @see RailsAdmin::AbstractModel.properties
@@ -160,10 +164,12 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :required? do
-          @required ||= !!([name] + children_fields).uniq.find do |column_name|
+          context = (bindings && bindings[:object] ? (bindings[:object].persisted? ? :update : :create) : :nil)          
+          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.find do |column_name|
             !!abstract_model.model.validators_on(column_name).find do |v|
-              v.kind == :presence && !v.options[:allow_nil] ||
-              v.kind == :numericality && !v.options[:allow_nil]
+              !v.options[:allow_nil] and
+              [:presence, :numericality].include?(v.kind) and
+              (v.options[:on] == context or v.options[:on].blank?)
             end
           end
         end
@@ -204,12 +210,17 @@ module RailsAdmin
         end
 
         register_instance_option :render do
-          bindings[:view].render :partial => partial.to_s, :locals => {:field => self, :form => bindings[:form] }
+          bindings[:view].render :partial => "rails_admin/main/#{partial}", :locals => {:field => self, :form => bindings[:form] }
         end
 
         def editable?
           return false if @properties && @properties[:read_only]
-          !bindings[:object].class.active_authorizer[bindings[:view].controller.send(:_attr_accessible_role)].deny?(self.method_name)
+          active_model_attr_accessible = !bindings[:object].class.active_authorizer[bindings[:view].controller.send(:_attr_accessible_role)].deny?(self.method_name)
+          return true if active_model_attr_accessible
+          if RailsAdmin::Config.yell_for_non_accessible_fields
+            Rails.logger.debug "\n\n[RailsAdmin] Please add 'attr_accessible :#{self.method_name}' in your '#{bindings[:object].class}' model definition if you want to make it editable.\nYou can also explicitely mark this field as read-only: \n\nconfig.model #{bindings[:object].class} do\n  field :#{self.name} do\n    read_only true\n  end\nend\n\nAdd 'config.yell_for_non_accessible_fields = false' in your 'rails_admin.rb' initializer if you do not want to see these warnings\n\n"
+          end
+          false
         end
 
         # Is this an association
@@ -280,7 +291,8 @@ module RailsAdmin
           "#<#{self.class.name}[#{name}] #{
             instance_variables.map do |v|
               value = instance_variable_get(v)
-              if [:@parent, :@root, :@section].include? v
+              if [:@parent, :@root, :@section, :@children_fields_registered,
+                  :@associated_model_config, :@group, :@bindings].include? v
                 if value.respond_to? :name
                   "#{v}=#{value.name.inspect}"
                 else

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

@@ -28,6 +28,10 @@ module RailsAdmin
               value.presence || ' - '
             end
           end
+
+          register_instance_option(:multiple?) do
+            properties && [:serialized].include?(properties[:type])
+          end
         end
       end
     end

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

@@ -22,10 +22,12 @@ module RailsAdmin
             else
               max_length = [length, valid_length[:maximum] || nil].compact.min
               min_length = [0, valid_length[:minimum] || nil].compact.max
-              if min_length == 0
-                text += "#{I18n.translate("admin.form.char_length_up_to").capitalize} #{max_length}."
-              else
-                text += "#{I18n.translate("admin.form.char_length_of").capitalize} #{min_length}-#{max_length}."
+              if max_length
+                if min_length == 0
+                  text += "#{I18n.translate("admin.form.char_length_up_to").capitalize} #{max_length}."
+                else
+                  text += "#{I18n.translate("admin.form.char_length_of").capitalize} #{min_length}-#{max_length}."
+                end
               end
             end
             text

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

@@ -7,7 +7,7 @@ module RailsAdmin
         class Text < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
-          
+
           # CKEditor is disabled by default
           register_instance_option(:ckeditor) do
             false
@@ -45,7 +45,7 @@ module RailsAdmin
           #Pass the location of the theme and mode for Codemirror
           register_instance_option(:codemirror_assets) do
             {
-              :mode => '/assets/codemirror/modes/css.js',  
+              :mode => '/assets/codemirror/modes/css.js',
               :theme => '/assets/codemirror/themes/night.css'
             }
           end
@@ -60,6 +60,19 @@ module RailsAdmin
             '/assets/codemirror.css'
           end
 
+          # bootstrap_wysihtml5
+          register_instance_option(:bootstrap_wysihtml5) do
+            false
+          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-all.js'
+          end
+
           register_instance_option(:html_attributes) do
             {
               :cols => '48',
@@ -70,6 +83,10 @@ module RailsAdmin
           register_instance_option(:partial) do
             :form_text
           end
+
+          register_instance_option :formatted_value do
+            value.to_s.html_safe
+          end
         end
       end
     end

data/lib/rails_admin/config/model.rb

@@ -83,6 +83,23 @@ module RailsAdmin
       def method_missing(m, *args, &block)
         self.send(:base).send(m, *args, &block)
       end
+
+      def inspect
+        "#<#{self.class.name}[#{abstract_model.model.name}] #{
+          instance_variables.map do |v|
+            value = instance_variable_get(v)
+            if [:@parent, :@root].include? v
+              if value.respond_to? :name
+                "#{v}=#{value.name.inspect}"
+              else
+                "#{v}=#{value.class.name}"
+              end
+            else
+              "#{v}=#{value.inspect}"
+            end
+          end.join(", ")
+        }>"
+      end
     end
   end
 end

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

@@ -23,6 +23,23 @@ module RailsAdmin
 
           @abstract_model = root.abstract_model
         end
+
+        def inspect
+          "#<#{self.class.name} #{
+            instance_variables.map do |v|
+              value = instance_variable_get(v)
+              if [:@parent, :@root, :@abstract_model].include? v
+                if value.respond_to? :name
+                  "#{v}=#{value.name.inspect}"
+                else
+                  "#{v}=#{value.class.name}"
+                end
+              else
+                "#{v}=#{value.inspect}"
+              end
+            end.join(", ")
+          }>"
+        end
       end
     end
   end