rails_admin 0.3.0 → 0.4.0

data/Gemfile

@@ -9,7 +9,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw do
     case ENV['CI_DB_ADAPTER']
     when 'mysql'
-      gem 'mysql', '~> 2.9'
+      gem 'mysql', '2.8.1'
     when 'postgresql'
       gem 'pg', '~> 0.13'
     else
@@ -21,7 +21,7 @@ end
 group :mongoid do
   gem 'mongoid', '~> 3.0'
   gem 'mongoid-paperclip', '~> 0.0.8', :require => 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
+  gem 'carrierwave-mongoid', '~> 0.3', :require => 'carrierwave/mongoid'
 end
 
 group :debug do

data/README.md

@@ -28,18 +28,25 @@ Hoeven][plukevdh], and [Rein Henrichs][reinh].
 
 ## Announcements
 
-* for those with `rake db:migrate` errors, update to master and check that you see the line: "[RailsAdmin] RailsAdmin initialization disabled by default." when you launch the task. If not (or if migrations still don't work), open a ticket with an application on Github that can reproduce the issue.
-
-* `config.models do ... end` is deprecated (note the 's' to models, `config.model(MyModel) do .. end` is fine), for performance reasons (forces early loading of all application's models). Duplicate to each model instead, before next release. If you really need the old behavior:
+RailsAdmin model configuration is now lazy loaded.
 
 ```ruby
-config.models.each do |m|
-  config.model m do
-    # <<<< here goes your code
+config.model 'Team' do
+  ...
+end
+
+# or
+class Team
+  rails_admin do
+    ...
   end
 end
 ```
 
+won't load the Team model.
+
+Incidentally, you are only allowed one configuration block per model.
+
 ## Features
 
 * Display database tables

data/app/assets/stylesheets/rails_admin/jquery.colorpicker.css.scss

@@ -100,6 +100,7 @@
 	padding: 0 !important;
 	height: 11px !important;
 	width: auto !important;
+  line-height: normal !important;
 }
 .colorpicker_hex {
 	position: absolute;

data/app/controllers/rails_admin/main_controller.rb

@@ -130,7 +130,7 @@ module RailsAdmin
     def get_collection(model_config, scope, pagination)
       associations = model_config.list.fields.select {|f| f.type == :belongs_to_association && !f.polymorphic? }.map {|f| f.association[:name] }
       options = {}
-      options = options.merge(:page => (params[:page] || 1).to_i, :per => (params[:per] || model_config.list.items_per_page)) if pagination
+      options = options.merge(:page => (params[Kaminari.config.param_name] || 1).to_i, :per => (params[:per] || model_config.list.items_per_page)) if pagination
       options = options.merge(:include => associations) unless associations.blank?
       options = options.merge(get_sort_hash(model_config))
       options = options.merge(:query => params[:query]) if params[:query].present?

data/app/helpers/rails_admin/application_helper.rb

@@ -5,8 +5,9 @@ module RailsAdmin
 
     include RailsAdmin::I18nSupport
 
-    def authorized?(*args)
-      @authorization_adapter.nil? || @authorization_adapter.authorized?(*args)
+    def authorized?(action, abstract_model = nil, object = nil)
+      object = nil if object.try :new_record?
+      @authorization_adapter.nil? || @authorization_adapter.authorized?(action, abstract_model, object)
     end
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)

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

@@ -21,7 +21,7 @@
   @index = 0
   @ordered_filters = (params[:f] || @model_config.list.filters).inject({}) { |memo, filter|
     field_name = filter.is_a?(Array) ? filter.first : filter
-  (filter.is_a?(Array) ? filter.last : { (@index += 1) => { "value" => '' } }) .each do |index, filter_hash|
+  (filter.is_a?(Array) ? filter.last : { (@index += 1) => { "v" => '' } }) .each do |index, filter_hash|
       unless filter_hash['disabled']
         memo[index] = { field_name => filter_hash }
       else

data/lib/generators/rails_admin/install_generator.rb

@@ -20,7 +20,7 @@ module RailsAdmin
       routes = File.open(Rails.root.join("config/routes.rb")).try :read
       initializer = (File.open(Rails.root.join("config/initializers/rails_admin.rb")) rescue nil).try :read
 
-      display "Hello, RailsAdmin installer will help you sets things up!", :blue
+      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)

data/lib/rails_admin/abstract_model.rb

@@ -61,6 +61,10 @@ module RailsAdmin
       @model_name.constantize
     end
 
+    def to_s
+      model.to_s
+    end
+
     def config
       Config.model self
     end

data/lib/rails_admin/adapters/active_record.rb

@@ -107,6 +107,10 @@ module RailsAdmin
         false
       end
 
+      def adapter_supports_joins?
+        true
+      end
+
       private
 
       def query_conditions(query, fields = config.list.fields.select(&:queryable?))

data/lib/rails_admin/adapters/mongoid.rb

@@ -109,6 +109,10 @@ module RailsAdmin
         ObjectId.from_string(str)
       end
 
+      def adapter_supports_joins?
+        false
+      end
+
       private
 
       def query_conditions(query, fields = config.list.fields.select(&:queryable?))
@@ -263,6 +267,7 @@ module RailsAdmin
           "Moped::BSON::ObjectId" => { :type => :bson_object_id, :serial? => (name == primary_key) },
           "Date"           => { :type => :date },
           "DateTime"       => { :type => :datetime },
+          "ActiveSupport::TimeWithZone" => { :type => :datetime },
           "Float"          => { :type => :float },
           "Hash"           => { :type => :serialized },
           "Money"          => { :type => :serialized },
@@ -408,6 +413,7 @@ module RailsAdmin
 
       def sort_by(options, scope)
         return scope unless options[:sort]
+
         field_name, collection_name = options[:sort].to_s.split('.').reverse
         if collection_name && collection_name != table_name
           # sorting by associated model column is not supported, so just ignore

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

@@ -13,11 +13,11 @@ module RailsAdmin
                 end
 
                 def #{name.to_s.singularize}_ids=(item_ids)
-                  items = Array.wrap(item_ids).map{|item_id| #{name}.klass.find(item_id) rescue nil }.compact
+                  __items__ = Array.wrap(item_ids).map{|item_id| #{name}.klass.find(item_id) rescue nil }.compact
                   if persisted?
-                    #{name}.substitute items
+                    #{name}.substitute __items__
                   else
-                    items.each do |item|
+                    __items__.each do |item|
                       item.update_attribute('#{association.foreign_key}', id)
                     end
                   end

data/lib/rails_admin/config.rb

@@ -1,4 +1,4 @@
-require 'rails_admin/config/model'
+require 'rails_admin/config/lazy_model'
 require 'rails_admin/config/sections/list'
 require 'active_support/core_ext/class/attribute_accessors'
 
@@ -244,9 +244,12 @@ module RailsAdmin
             entity.class.name.to_sym
           end
         end
-        config = @registry[key] ||= RailsAdmin::Config::Model.new(entity)
-        config.instance_eval(&block) if block
-        config
+
+        if block
+          @registry[key] = RailsAdmin::Config::LazyModel.new(entity, &block)
+        else
+          @registry[key] ||= RailsAdmin::Config::LazyModel.new(entity)
+        end
       end
 
       def default_hidden_fields=(fields)
@@ -266,15 +269,9 @@ module RailsAdmin
 
       # Returns all model configurations
       #
-      # If a block is given it is evaluated in the context of configuration
-      # instances.
-      #
       # @see RailsAdmin::Config.registry
-      def models(&block)
-        if block
-          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)}
+      def models
+        RailsAdmin::AbstractModel.all.map{|m| model(m)}
       end
 
       # Reset all configurations to defaults.

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

@@ -30,10 +30,11 @@ module RailsAdmin
 
         register_instance_option :authorized? do
           (
-            bindings[:controller].nil? or bindings[:controller].authorized?(self.authorization_key, bindings[:abstract_model], bindings[:object])) and (
+            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
+              (only.nil? or [only].flatten.map(&:to_s).include?(bindings[:abstract_model].to_s)) and
+              ![except].flatten.map(&:to_s).include?(bindings[:abstract_model].to_s) and
               bindings[:abstract_model].config.with(bindings).visible?
           ))
         end

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

@@ -90,7 +90,7 @@ module RailsAdmin
 
         # Reader for the association's value unformatted
         def value
-          bindings[:object].send(association[:name])
+          bindings[:object].safe_send(association[:name])
         end
 
         # has many?

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

@@ -279,7 +279,7 @@ module RailsAdmin
         register_instance_option :allowed_methods do
           [method_name]
         end
-        
+
         def parse_input(params)
           # overriden
         end

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

@@ -16,7 +16,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
       end.map{|k| association[k] }.compact
 
     parent.abstract_model.properties.select{|p| possible_field_names.include? p[:name] }.each do |column|
-      unless child_field = fields.find{|f| f.name.to_s == column[:name].to_s }        
+      unless child_field = fields.find{|f| f.name.to_s == column[:name].to_s }
         child_field = RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
       end
       child_columns << child_field

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

@@ -12,7 +12,7 @@ module RailsAdmin
           end
 
           register_instance_option :sortable do
-            @sortable ||= associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {self.abstract_model.table_name => self.method_name}
+            @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {self.abstract_model.table_name => self.method_name}
           end
 
           register_instance_option :searchable do

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

@@ -16,9 +16,9 @@ module RailsAdmin
             case value
             when nil
               %{<span class="badge">-</span>}
-            when false                  
+            when false
               %{<span class="badge badge-important">&#x2718;</span>}
-            when true                   
+            when true
               %{<span class="badge badge-success">&#x2713;</span>}
             end.html_safe
           end

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

@@ -52,7 +52,7 @@ module RailsAdmin
           end
 
           def formatted_date_value
-            value = bindings[:object].new_record? && self.value.nil? && !self.default_value.nil? ? self.default_value : nil
+            value = bindings[:object].new_record? && self.value.nil? && !self.default_value.nil? ? self.default_value : self.value
             value.nil? ? "" : I18n.l(value, :format => localized_date_format).strip
           end
 

data/lib/rails_admin/config/has_fields.rb

@@ -8,8 +8,9 @@ module RailsAdmin
 
         # some fields are hidden by default (belongs_to keys, has_many associations in list views.)
         # unhide them if config specifically defines them
-        field.show if field.try(:hidden?)
-
+        if field
+          field.show unless field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
+        end
         # Specify field as virtual if type is not specifically set and field was not
         # found in default stack
         if field.nil? && type.nil?

data/lib/rails_admin/config/lazy_model.rb

@@ -0,0 +1,21 @@
+require 'rails_admin/config/model'
+
+module RailsAdmin
+  module Config
+    class LazyModel
+      def initialize(entity, &block)
+        @entity = entity
+        @deferred_block = block
+      end
+
+      def method_missing(method, *args, &block)
+        if !@model
+          @model = RailsAdmin::Config::Model.new(@entity)
+          @model.instance_eval(&@deferred_block) if @deferred_block
+        end
+
+        @model.send(method, *args, &block)
+      end
+    end
+  end
+end

data/lib/rails_admin/extensions/history/history.rb

@@ -15,20 +15,20 @@ class RailsAdmin::History < ActiveRecord::Base
     create(
        :message => [message].flatten.join(', '),
        :item => object.id,
-       :table => abstract_model.model.to_s,
+       :table => abstract_model.to_s,
        :username => user.try(:email)
      )
   end
 
-  def self.history_for_model(model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
-    history = where(:table => model.pretty_name)
+  def self.history_for_model(abstract_model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
+    history = where(:table => abstract_model.to_s)
     history = history.where("message LIKE ? OR username LIKE ?", "%#{query}%", "%#{query}%") if query
     history = history.order(sort_reverse == "true" ? "#{sort} DESC" : sort) if sort
     all ? history : history.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
   end
 
-  def self.history_for_object(model, object, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
-    history = where(:table => model.pretty_name, :item => object.id)
+  def self.history_for_object(abstract_model, object, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
+    history = where(:table => abstract_model.to_s, :item => object.id)
     history = history.where("message LIKE ? OR username LIKE ?", "%#{query}%", "%#{query}%") if query
     history = history.order(sort_reverse == "true" ? "#{sort} DESC" : sort) if sort
     all ? history : history.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)

data/lib/rails_admin/support/csv_converter.rb

@@ -5,6 +5,7 @@ module RailsAdmin
 
   CSVClass = RUBY_VERSION < '1.9' ? ::FasterCSV : ::CSV
   NON_ASCII_ENCODINGS = /(UTF\-16)|(UTF\-32)|(ISO\-2022\-JP)|(Big5\-HKSCS)|(UTF\-7)/
+  UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
 
   class CSVConverter
 
@@ -42,11 +43,7 @@ module RailsAdmin
       return '' if @objects.blank?
 
       # encoding shenanigans first
-      @encoding_from = if [nil, '', 'utf8', 'utf-8', 'UTF8', 'UTF-8'].include?(encoding = @abstract_model.encoding)
-        'UTF-8'
-      else
-        encoding
-      end
+      @encoding_from = UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding
 
       unless options[:encoding_to].blank?
         @encoding_to = options[:encoding_to]
@@ -106,4 +103,3 @@ module RailsAdmin
     end
   end
 end
-