rails_admin 0.0.3 → 0.0.4

data/Gemfile

@@ -36,13 +36,15 @@ group :mongoid do
   case ENV['CI_ORM_VERSION']
   when 'head'
     gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
+    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/mshibuya/mongoid-paperclip.git', :branch => 'fix-stop-patching-logger'
     # For now, carrierwave-mongoid's mongoid dependency is restricted to '~> 2.1'
     gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/tanordheim/carrierwave-mongoid.git', :branch => 'mongoid_3_0'
+    gem 'database_cleaner', :git => 'git://github.com/potatosalad/database_cleaner.git'
   else
     gem 'mongoid'
+    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
     gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
   end
-  gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
 end
 
 group :debug do

data/README.md

@@ -58,7 +58,10 @@ And then run:
 
 This generator will install RailsAdmin and [Devise](https://github.com/plataformatec/devise) if you
 don't already have it installed. [Devise](https://github.com/plataformatec/devise) is strongly
-recommended to protect your data from anonymous users.
+recommended to protect your data from anonymous users. Note: If you do not already have [Devise](https://github.com/plataformatec/devise) 
+installed, make sure you remove the registerable module from the generated user model.  
+
+
 It will modify your `config/routes.rb`, adding:
 
 ```ruby
@@ -67,6 +70,10 @@ mount RailsAdmin::Engine => '/admin', :as => 'rails_admin' # Feel free to change
 
 It will also add an intializer that will help you getting started. (head for config/initializers/rails_admin.rb)
 
+Finally run:
+
+    $ bundle exec rake db:migrate
+
 Optionally, you may wish to set up [Cancan](https://github.com/ryanb/cancan),
 [PaperTrail](https://github.com/airblade/paper_trail), [CKeditor](https://github.com/galetahub/ckeditor)
 

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

@@ -103,24 +103,28 @@
       this.addAll.click(function(e){
         widget._select($('option', widget.collection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Add to selection */
       this.add.click(function(e){
         widget._select($(':selected', widget.collection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Remove all from selection */
       this.removeAll.click(function(e){
         widget._deSelect($('option', widget.selection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Remove from selection */
       this.remove.click(function(e){
         widget._deSelect($(':selected', widget.selection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       var timeout = null;

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

@@ -52,6 +52,7 @@
           select: function(event, ui) {
             var option = $('<option value="' + ui.item.id + '" selected="selected">' + ui.item.value + '</option>');
             select.html(option);
+            select.trigger("change", ui.item.id);
             self._trigger("selected", event, {
               item: option
             });
@@ -79,6 +80,14 @@
             }
           }
         })
+        .keyup(function() {
+          /* Clear select options and trigger change if selected item is deleted */
+          if ($(this).val().length == 0) {
+            select.empty();
+            select.trigger("change");
+          }
+        })
+
       if(select.attr('placeholder'))
         input.attr('placeholder', select.attr('placeholder'))
 

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

@@ -125,11 +125,23 @@ $(document).live 'rails_admin.dom_ready', ->
     # ckeditor
 
     $('form [data-richtext=ckeditor]').not('.ckeditored').each ->
-      window.CKEDITOR_BASEPATH = '/assets/ckeditor/'
       options = $(this).data('options')
+      window.CKEDITOR_BASEPATH = options['base_location']
       if not window.CKEDITOR
         $(window.document).append('<script src="' + options['jspath'] + '"><\/script>')
       if instance = window.CKEDITOR.instances[this.id]
         instance.destroy(true)
       window.CKEDITOR.replace(this, options['options'])
       $(this).addClass('ckeditored')
+
+    #codemirror
+
+    $('form [data-richtext=codemirror]').not('.codemirrored').each ->
+      options = $(this).data('options')
+      if not window.CodeMirror
+        $(window.document).append('<script src="' + options['jspath'] + '" type="text\/javascript"><\/script>')
+        $('head').append('<script src="' + options['locations']['mode'] + '" type="text\/javascript"><\/script>')
+        $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
+        $('head').append('<link href="' + options['locations']['theme'] + '" rel="stylesheet" media="all" type="text\/css">')
+      CodeMirror.fromTextArea(this,{mode:options['options']['mode'],theme:options['options']['theme']})
+      $(this).addClass('codemirrored')

data/app/assets/javascripts/rails_admin/ui.js.coffee

@@ -4,7 +4,9 @@ $("#list input.toggle").live "click", ->
   $("#list [name='bulk_ids[]']").attr "checked", $(this).is(":checked")
 
 $('.pjax').live 'click', (event) ->
-  if $.support.pjax
+  if event.which > 1 || event.metaKey || event.ctrlKey
+    return
+  else if $.support.pjax
     event.preventDefault()
     $.pjax
       container: $(this).data('pjax-container') || '[data-pjax-container]'
@@ -24,7 +26,7 @@ $('.pjax-form').live 'submit', (event) ->
 $(document)
   .on 'pjax:start', ->
     $('#loading').show()
-  .on 'pjax:end', -> 
+  .on 'pjax:end', ->
     $('#loading').hide()
 
 $('[data-target]').live 'click', ->

data/app/assets/stylesheets/rails_admin/imports.css.scss.erb

@@ -34,7 +34,6 @@
 @import "bootstrap/grid";
 @import "bootstrap/layouts";
 @import "bootstrap/type";
-@import "bootstrap/code";
 @import "bootstrap/forms";
 @import "bootstrap/tables";
 @import "bootstrap/sprites";

data/app/controllers/rails_admin/application_controller.rb

@@ -55,6 +55,8 @@ module RailsAdmin
       instance_eval &RailsAdmin::Config.current_user_method
     end
 
+    alias_method :user_for_paper_trail, :_current_user
+
     def _attr_accessible_role
       instance_eval &RailsAdmin::Config.attr_accessible_role
     end

data/app/controllers/rails_admin/main_controller.rb

@@ -123,7 +123,7 @@ module RailsAdmin
       options = {}
       options = options.merge(:page => (params[:page] || 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)) unless params[:associated_collection]
+      options = options.merge(get_sort_hash(model_config))
       options = options.merge(:query => params[:query]) if params[:query].present?
       options = options.merge(:filters => params[:f]) if params[:f].present?
       options = options.merge(:bulk_ids => params[:bulk_ids]) if params[:bulk_ids]

data/app/helpers/rails_admin/application_helper.rb

@@ -114,7 +114,7 @@ module RailsAdmin
         content_tag(:ul, :class => 'dropdown-menu', :style => 'left:auto; right:0;') do
           actions.map do |action|
             content_tag :li do
-              link_to_function wording_for(:bulk_link, action), "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit()"
+              link_to wording_for(:bulk_link, action), '#', :onclick => "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
             end
           end.join.html_safe
         end

data/app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -2,11 +2,11 @@
   - actions(:root).each do |action|
     %li= link_to wording_for(:menu, action), { :action => action.action_name, :controller => 'rails_admin/main' }, :class => 'pjax'
   - if main_app_root_path = (main_app.root_path rescue false)
-    %li= link_to t('home.name').capitalize, main_app_root_path, :class => 'pjax'
+    %li= link_to t('home.name').capitalize, main_app_root_path
   - if _current_user
     - if user_link = edit_user_link
       %li= user_link
     - if defined?(Devise) && (devise_scope = request.env["warden"].config[:default_scope] rescue false) && (logout_path = main_app.send("destroy_#{devise_scope}_session_path") rescue false)
       %li= link_to content_tag('span', t('admin.misc.log_out'), :class => 'label label-important'), logout_path, :method => Devise.sign_out_via
-    - if _current_user.respond_to?(:email)
+    - if _current_user.respond_to?(:email) && _current_user.email.present?
       %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", :style => 'padding-top:5px'

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

@@ -2,11 +2,20 @@
   if field.ckeditor
     richtext = 'ckeditor'
     js_data = {
-      :jspath => '/assets/ckeditor/ckeditor.js',
+      :jspath => field.ckeditor_location,
+      :base_location => field.ckeditor_base_location,
       :options => { 
         :customConfig => field.ckeditor_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
+    }
   else
     richtext = false
     js_data = {}

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

@@ -132,7 +132,7 @@
             %td.last.links
               %ul.inline= menu_for :member, @abstract_model, object, true
     - if @objects.respond_to?(:total_count)
-      - total_count = @objects.total_count
+      - 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}"

data/config/initializers/mongoid_extensions.rb

@@ -1,5 +1,4 @@
 if defined?(::Mongoid::Document)
   require 'rails_admin/adapters/mongoid/extension'
   Mongoid::Document.send(:include, RailsAdmin::Adapters::Mongoid::Extension)
-  Mongoid::NestedAttributes::ClassMethods.send(:include, RailsAdmin::Adapters::Mongoid::NestedAttributesExtension)
 end

data/lib/rails_admin/adapters/active_record.rb

@@ -5,8 +5,14 @@ module RailsAdmin
   module Adapters
     module ActiveRecord
       DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore]
-      AR_ADAPTER = ::ActiveRecord::Base.configurations[Rails.env]['adapter']
-      LIKE_OPERATOR = AR_ADAPTER == "postgresql" ? 'ILIKE' : 'LIKE'
+
+      def ar_adapter
+        Rails.configuration.database_configuration[Rails.env]['adapter']
+      end
+
+      def like_operator
+        ar_adapter == "postgresql" ? 'ILIKE' : 'LIKE'
+      end
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -184,7 +190,7 @@ module RailsAdmin
           else
             return
           end
-          ["(#{column} #{LIKE_OPERATOR} ?)", value]
+          ["(#{column} #{like_operator} ?)", value]
         when :date
           start_date, end_date = get_filtering_duration(operator, value)
 

data/lib/rails_admin/adapters/mongoid.rb

@@ -15,8 +15,13 @@ module RailsAdmin
       def get(id)
         begin
           AbstractObject.new(model.find(id))
-        rescue BSON::InvalidObjectId, ::Mongoid::Errors::DocumentNotFound
-          nil
+        rescue => e
+          if ['BSON::InvalidObjectId', 'Mongoid::Errors::DocumentNotFound',
+              'Mongoid::Errors::InvalidFind', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
+            nil
+          else
+            raise e
+          end
         end
       end
 
@@ -82,6 +87,7 @@ module RailsAdmin
             "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 },
@@ -118,7 +124,7 @@ module RailsAdmin
       end
 
       def table_name
-        model.collection.name
+        model.collection_name.to_s
       end
 
       def serialized_attributes
@@ -143,7 +149,7 @@ module RailsAdmin
         fields.each do |field|
           conditions_per_collection = {}
           field.searchable_columns.flatten.each do |column_infos|
-            collection_name, column_name = column_infos[:column].split('.')
+            collection_name, column_name = parse_collection_name(column_infos[:column])
             statement = build_statement(column_name, column_infos[:type], query, field.search_operator)
             if statement
               conditions_per_collection[collection_name] ||= []
@@ -171,7 +177,7 @@ module RailsAdmin
             field = fields.find{|f| f.name.to_s == field_name}
             next unless field
             field.searchable_columns.each do |column_infos|
-              collection_name, column_name = column_infos[:column].split('.')
+              collection_name, column_name = parse_collection_name(column_infos[:column])
               statement = build_statement(column_name, column_infos[:type], filter_dump[:v], (filter_dump[:o] || 'default'))
               if statement
                 conditions_per_collection[collection_name] ||= []
@@ -261,7 +267,7 @@ module RailsAdmin
           return if value.blank?
           { column => { "$in" => Array.wrap(value) } }
         when :belongs_to_association, :bson_object_id
-          object_id = (BSON::ObjectId(value) rescue nil)
+          object_id = (BSON::ObjectId.from_string(value) rescue nil)
           { column => object_id } if object_id
         end
       end
@@ -337,7 +343,8 @@ module RailsAdmin
 
       def length_validation_lookup(name)
         shortest = model.validators.select do |validator|
-          validator.attributes.include?(name.to_sym) &&
+          validator.respond_to?(:attributes) &&
+            validator.attributes.include?(name.to_sym) &&
             validator.kind == :length &&
             validator.options[:maximum]
         end.min{|a, b| a.options[:maximum] <=> b.options[:maximum] }
@@ -348,6 +355,15 @@ module RailsAdmin
         end
       end
 
+      def parse_collection_name(column)
+        collection_name, column_name = column.split('.')
+        if [:embeds_one, :embeds_many].include?(model.associations[collection_name].try(:macro).try(:to_sym))
+          [table_name, column]
+        else
+          [collection_name, column_name]
+        end
+      end
+
       def make_condition_for_current_collection(target_field, conditions_per_collection)
         result =[]
         conditions_per_collection.each do |collection_name, conditions|

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

@@ -37,11 +37,6 @@ RUBY
             end
           end
         end
-
-        def destroy
-          object.destroy
-          object
-        end
       end
     end
   end

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

@@ -5,8 +5,13 @@ module RailsAdmin
         extend ActiveSupport::Concern
 
         included do
-          def self.rails_admin(&block)
-            RailsAdmin::Config.model(self, &block)
+          class_attribute :nested_attributes_options
+          self.nested_attributes_options = {}
+          class << self
+            def rails_admin(&block)
+              RailsAdmin::Config.model(self, &block)
+            end
+            alias_method_chain :accepts_nested_attributes_for, :rails_admin
           end
         end
 
@@ -21,26 +26,18 @@ module RailsAdmin
             self.send(value)
           end
         end
-      end
-
-      module NestedAttributesExtension
-        extend ActiveSupport::Concern
-
-        included do
-          attr_reader :nested_attributes_options
-          alias_method_chain :accepts_nested_attributes_for, :rails_admin
-        end
 
-        # Mongoid accepts_nested_attributes_for does not store options in accessible scope,
-        # so we intercept the call and store it in instance variable which can be accessed from outside
-        def accepts_nested_attributes_for_with_rails_admin(*args)
-          @nested_attributes_options ||= {}
-          options = args.extract_options!
-          args.each do |arg|
-            @nested_attributes_options[arg.to_sym] = options.reverse_merge(:allow_destroy=>false, :update_only=>false)
+        module ClassMethods
+          # Mongoid accepts_nested_attributes_for does not store options in accessible scope,
+          # so we intercept the call and store it in instance variable which can be accessed from outside
+          def accepts_nested_attributes_for_with_rails_admin(*args)
+            options = args.extract_options!
+            args.each do |arg|
+              self.nested_attributes_options[arg.to_sym] = options.reverse_merge(:allow_destroy=>false, :update_only=>false)
+            end
+            args << options
+            accepts_nested_attributes_for_without_rails_admin(*args)
           end
-          args << options
-          accepts_nested_attributes_for_without_rails_admin(*args)
         end
       end
     end

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

@@ -32,7 +32,7 @@ module RailsAdmin
             elsif request.delete? # DESTROY
 
               @auditing_adapter && @auditing_adapter.delete_object("Destroyed #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
-              if @abstract_model.destroy(@object)
+              if @object.destroy
                 flash[:success] = t("admin.flash.successful", :name => @model_config.label, :action => t("admin.actions.delete.done"))
               else
                 flash[:error] = t("admin.flash.error", :name => @model_config.label, :action => t("admin.actions.delete.done"))

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

@@ -18,11 +18,13 @@ module RailsAdmin
 
         register_instance_option :controller do
           Proc.new do
-            render @action.template_name
+            respond_to do |format|
+              format.json { render :json => @object }
+              format.html { render @action.template_name }
+            end
           end
         end
 
-
         register_instance_option :link_icon do
           'icon-info-sign'
         end

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

@@ -47,7 +47,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
@@ -73,11 +78,6 @@ module RailsAdmin
         def foreign_key
           association[:foreign_key]
         end
-
-        # Reader for the inverse relationship
-        def inverse_of
-          association[:inverse_of]
-        end
         
         # Reader whether this is a polymorphic association
         def polymorphic?

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

@@ -28,8 +28,11 @@ module RailsAdmin
 
           def parse_input(params)
             begin
-              params[name] = (params[name].blank? ? nil : BSON::ObjectId(params[name])) if params[name].is_a?(::String)
-            rescue BSON::InvalidObjectId
+              params[name] = (params[name].blank? ? nil : BSON::ObjectId.from_string(params[name])) if params[name].is_a?(::String)
+            rescue => e
+              unless ['BSON::InvalidObjectId', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
+                raise e
+              end
             end
           end
         end

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

@@ -19,6 +19,47 @@ module RailsAdmin
             "/assets/ckeditor/config.js"
           end
 
+          #Use this if you want to point to a cloud instances of CKeditor
+          register_instance_option(:ckeditor_location) do
+            '/assets/ckeditor/ckeditor.js'
+          end
+
+          #Use this if you want to point to a cloud instances of the base CKeditor
+          register_instance_option(:ckeditor_base_location) do
+            '/assets/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
+
           register_instance_option(:html_attributes) do
             {
               :cols => "48",

data/lib/rails_admin/engine.rb

@@ -11,7 +11,7 @@ require 'rails_admin'
 module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
-    initializer "RailsAdmin precompile hook" do |app|
+    initializer "RailsAdmin precompile hook", :group => :assets do |app|
       app.config.assets.precompile += ['rails_admin/rails_admin.js', 'rails_admin/rails_admin.css', 'rails_admin/jquery.colorpicker.js', 'rails_admin/jquery.colorpicker.css']
     end
 

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

@@ -5,6 +5,8 @@ class RailsAdmin::History < ActiveRecord::Base
 
   attr_accessible :message, :item, :table, :username
 
+  default_scope order('id DESC')
+
   def self.latest
     self.limit(100)
   end
@@ -49,22 +51,14 @@ class RailsAdmin::History < ActiveRecord::Base
   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)
     history = history.where("message LIKE ? OR username LIKE ?", "%#{query}%", "%#{query}%") if query
-    if sort
-      history = history.order(sort_reverse == "true" ? "#{sort} DESC" : sort)
-    else
-      history = history.order('created_at DESC')
-    end
+    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)
     history = history.where("message LIKE ? OR username LIKE ?", "%#{query}%", "%#{query}%") if query
-    if sort
-      history = history.order(sort_reverse == "true" ? "#{sort} DESC" : sort)
-    else
-      history = history.order('created_at DESC')
-    end
+    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
 end

data/lib/rails_admin/version.rb

@@ -1,3 +1,3 @@
 module RailsAdmin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/controllers/main_controller_spec.rb

@@ -67,7 +67,7 @@ describe RailsAdmin::MainController do
     end
 
     it "scopes associated collection records according to bindings" do
-      @team.revenue = 3
+      @team.revenue = BigDecimal.new('3')
       @team.save
 
       @players = 5.times.map do
@@ -107,7 +107,14 @@ describe RailsAdmin::MainController do
         end
       end
       controller.list_entries.length.should == @players.size
+    end
+
+    it "orders associated collection records by desc" do
+      @players = 3.times.map do
+        FactoryGirl.create :player
+      end
 
+      controller.list_entries.to_a.first.should == @players.last
     end
   end
 

data/spec/dummy_app/Gemfile

@@ -28,7 +28,7 @@ group :active_record do
       gem 'sqlite3', '~> 1.3'
     end
   end
-  gem 'paperclip', '~> 2.4'
+  gem 'paperclip', '~> 2.7'
   gem 'carrierwave'
   gem 'dragonfly'
 end
@@ -44,8 +44,8 @@ group :mongoid do
     gem 'mongoid'
     gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
   end
-  gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
-  gem 'paperclip', '~> 2.4'
+  gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/mshibuya/mongoid-paperclip.git', :branch => 'fix-stop-patching-logger'
+  gem 'paperclip', '~> 2.7'
   gem 'dragonfly'
 end
 

data/spec/dummy_app/app/active_record/player.rb

@@ -13,6 +13,10 @@ class Player < ActiveRecord::Base
     record.errors.add(:base, "Player is cheating") if value.to_s =~ /on steroids/
   end
 
+  before_destroy :destroy_hook
+
+  def destroy_hook; end
+
   def draft_id
     self.draft.try :id
   end

data/spec/dummy_app/app/mongoid/player.rb

@@ -27,6 +27,10 @@ class Player
   has_one :draft, :dependent => :destroy
   has_many :comments, :as => :commentable
 
+  before_destroy :destroy_hook
+
+  def destroy_hook; end
+
   def draft_id
     self.draft.try :id
   end

data/spec/dummy_app/app/mongoid/team.rb

@@ -20,7 +20,7 @@ class Team
   
   attr_accessible :name, :division_id, :logo_url, :manager, :ballpark, :mascot, :founded, :wins, :losses, :win_percentage, :revenue, :color, :custom_field, :fan_ids, :player_ids, :comment_ids
 
-  has_many :players, :inverse_of => :team, :order => :_id
+  has_many :players, :inverse_of => :team, :order => :_id.asc
   has_and_belongs_to_many :fans
   has_many :comments, :as => :commentable
 

data/spec/dummy_app/app/mongoid/user.rb

@@ -6,8 +6,8 @@ class User
   devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
 
   ## Database authenticatable
-  field :email,              :type => String, :null => false
-  field :encrypted_password, :type => String, :null => false
+  field :email,              :type => String
+  field :encrypted_password, :type => String
 
   ## Recoverable
   field :reset_password_token,   :type => String

data/spec/dummy_app/config/initializers/devise.rb

@@ -9,9 +9,6 @@ Devise.setup do |config|
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 
-  # Automatically apply schema changes in tableless databases
-  config.apply_schema = false
-
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -95,7 +92,7 @@ Devise.setup do |config|
   # the user cannot access the website without confirming his account.
   # config.allow_unconfirmed_access_for = 2.days
 
-  # If true, requires any email changes to be confirmed (exctly the same way as
+  # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
   # db field (see migrations). Until confirmed new email is stored in
   # unconfirmed email column, and copied to email column on successful confirmation.
@@ -111,13 +108,9 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
-  # config.cookie_options = {}
+  # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..128.

data/spec/dummy_app/config/initializers/dragonfly.rb

@@ -3,11 +3,8 @@ if defined?(Mongoid::Document)
 
   app = Dragonfly[:images]
 
-  # Configure to use ImageMagick, Rails defaults, and the Mongo data store
+  # Configure to use ImageMagick, Rails defaults
   app.configure_with(:imagemagick)
-  app.configure_with(:rails) do |c|
-    c.datastore = Dragonfly::DataStorage::MongoDataStore.new :db => Mongoid.database
-  end
 
   # Allow all mongoid models to use the macro 'image_accessor'
   app.define_macro_on_include(Mongoid::Document, :image_accessor)

data/spec/dummy_app/config/mongoid.yml

@@ -5,7 +5,18 @@ defaults: &defaults
 development:
   <<: *defaults
   database: dummy_app_development
+  sessions:
+    default:
+      database: dummy_app_development
+      hosts:
+        - localhost:27017
+
 
 test:
   <<: *defaults
   database: dummy_app_test
+  sessions:
+    default:
+      database: dummy_app_test
+      hosts:
+        - localhost:27017

data/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb

@@ -15,19 +15,27 @@ describe "RailsAdmin Basic Destroy" do
     it "should destroy an object" do
       @player.should be_nil
     end
+
+    it "should show success message" do
+      should have_content('Player successfully deleted')
+    end
   end
 
-  describe "destroy with errors" do
+  describe "handle destroy errors" do
     before(:each) do
-      Player.any_instance.stub(:destroy).and_return false
+      Player.any_instance.stub(:destroy_hook).and_return false
       @player = FactoryGirl.create :player
       visit delete_path(:model_name => "player", :id => @player.id)
       click_button "Yes, I'm sure"
     end
 
-    it "should destroy an object" do
+    it "should not destroy an object" do
       @player.reload.should be
     end
+
+    it "should show error message" do
+      should have_content('Player failed to be deleted')
+    end
   end
 
   describe "destroy" do

data/spec/integration/config/edit/rails_admin_config_edit_spec.rb

@@ -918,6 +918,26 @@ describe "RailsAdmin Config DSL Edit Section" do
     end
   end
 
+  describe "CodeMirror Support" do
+
+    it "should start with CodeMirror disabled" do
+       field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :notes}
+       field.codemirror.should be false
+    end
+
+    it "should add Javascript to enable CodeMirror" do
+      RailsAdmin.config Draft do
+        edit do
+          field :notes do
+            codemirror true
+          end
+        end
+      end
+      visit new_path(:model_name => "draft")
+      should have_selector('textarea#draft_notes[data-richtext="codemirror"]')
+    end
+  end
+
   describe "Paperclip Support" do
 
     it "should show a file upload field" do

data/spec/integration/config/show/rails_admin_config_show_spec.rb

@@ -13,6 +13,24 @@ describe "RailsAdmin Config DSL Show Section" do
     visit show_path(:model_name => "team", :id => team.id)
   end
 
+  describe "JSON show view" do
+    before do
+      @player = FactoryGirl.create :player
+       visit uri
+    end
+
+    let(:uri) { show_path(:model_name => 'player', :id => @player.id, :format => :json) }
+    let(:body) { page.body }
+
+    it 'should create a JSON uri' do
+      uri.should == "/admin/player/#{@player.id}.json"
+    end
+
+    it 'should contain the JSONified object' do
+      body.should include(@player.to_json)
+    end
+  end
+
   describe "compact_show_view" do
 
     it 'should hide empty fields in show view by default' do

data/spec/integration/history/rails_admin_history_spec.rb

@@ -72,6 +72,12 @@ describe "RailsAdmin History", :active_record => true do
           RailsAdmin::History.latest.count.should == 100
         end
 
+        it 'should get latest ones orderly' do
+          latest = RailsAdmin::History.latest
+          latest.first.message.should == "change 100"
+          latest.last.message.should == "change 1"
+        end
+
         it "should render a XHR request successfully" do
           xhr :get, history_index_path(@model, :page => 2)
         end

data/spec/integration/rails_admin_spec.rb

@@ -121,4 +121,22 @@ describe "RailsAdmin" do
     end
   end
 
+  describe "secondary navigation" do
+    it "should have Gravatar image" do
+      visit dashboard_path
+      should have_selector("ul.nav.pull-right li img")
+    end
+
+    it "should not show Gravatar when user doesn't have email method" do
+      User.any_instance.stub(:respond_to?).with(:email).and_return(false)
+      visit dashboard_path
+      should_not have_selector("ul.nav.pull-right li img")
+    end
+
+    it "should not cause error when email is nil" do
+      User.any_instance.stub(:email).and_return(nil)
+      visit dashboard_path
+      should have_selector("body.rails_admin")
+    end
+  end
 end

data/spec/orm/mongoid.rb

@@ -1,5 +1,7 @@
 require 'rails_admin/adapters/mongoid'
 
+Paperclip.logger = Logger.new(nil)
+
 class Tableless
   include Mongoid::Document
 

data/spec/unit/adapters/active_record_spec.rb

@@ -179,8 +179,8 @@ describe 'RailsAdmin::Adapters::ActiveRecord', :active_record => true do
       @abstract_model.get('abc').should be_nil
     end
 
-    it "#first returns first item" do
-      @abstract_model.first.should == @players.first
+    it "#first returns a player" do
+      @players.should include @abstract_model.first
     end
 
     it "#count returns count of items" do
@@ -206,7 +206,7 @@ describe 'RailsAdmin::Adapters::ActiveRecord', :active_record => true do
       end
 
       it "supports limiting" do
-        @abstract_model.all(:limit => 2).count.should == 2
+        @abstract_model.all(:limit => 2).should have(2).items
       end
 
       it "supports retrieval by bulk_ids" do

data/spec/unit/adapters/mongoid_spec.rb

@@ -238,7 +238,24 @@ describe 'RailsAdmin::Adapters::Mongoid', :mongoid => true do
       lambda{ RailsAdmin::AbstractModel.new(MongoEmbedsMany).associations }.should raise_error(RuntimeError,
         "Embbeded association without accepts_nested_attributes_for can't be handled by RailsAdmin,\nbecause embedded model doesn't have top-level access.\nPlease add `accepts_nested_attributes_for :mongo_embeddeds' line to `MongoEmbedsMany' model.\n"
       )
-     end
+    end
+
+    it "should work with inherited embeds_many model" do
+      class MongoEmbedsParent
+        include Mongoid::Document
+        embeds_many :mongo_embeddeds
+        accepts_nested_attributes_for :mongo_embeddeds
+      end
+
+      class MongoEmbedded
+        include Mongoid::Document
+        embedded_in :mongo_embeds_many
+      end
+
+      class MongoEmbedsChild < MongoEmbedsParent; end
+
+      lambda{ RailsAdmin::AbstractModel.new(MongoEmbedsChild).associations }.should_not raise_error
+    end
   end
 
   describe "#properties" do
@@ -380,6 +397,27 @@ describe 'RailsAdmin::Adapters::Mongoid', :mongoid => true do
           :length => 255 }
       ]
     end
+
+    it "detects validation length properly" do
+      class LengthValiated
+        include Mongoid::Document
+        field :text, :type => String
+        validates :text, :length => {:maximum => 50}
+      end
+      RailsAdmin::AbstractModel.new('LengthValiated').send(:length_validation_lookup, :text).should == 50
+    end
+
+    it "should not cause problem with custom validators" do
+      class MyCustomValidator < ActiveModel::Validator
+        def validate(r); end
+      end
+      class CustomValiated
+        include Mongoid::Document
+        field :text, :type => String
+        validates_with MyCustomValidator
+      end
+      lambda{ RailsAdmin::AbstractModel.new('CustomValiated').send(:length_validation_lookup, :text) }.should_not raise_error
+    end
   end
 
   describe "data access method" do
@@ -400,8 +438,8 @@ describe 'RailsAdmin::Adapters::Mongoid', :mongoid => true do
       @abstract_model.get('4f4f0824dcf2315093000000').should be_nil
     end
 
-    it "#first returns first item" do
-      @abstract_model.first.should == @players.first
+    it "#first returns a player" do
+      @players.should include @abstract_model.first
     end
 
     it "#count returns count of items" do
@@ -427,7 +465,7 @@ describe 'RailsAdmin::Adapters::Mongoid', :mongoid => true do
       end
 
       it "supports limiting" do
-        @abstract_model.all(:limit => 2).to_a.count.should == 2
+        @abstract_model.all(:limit => 2).to_a.should have(2).items
       end
 
       it "supports retrieval by bulk_ids" do
@@ -530,6 +568,29 @@ describe 'RailsAdmin::Adapters::Mongoid', :mongoid => true do
         @abstract_model.all(:filters => {"fans" => {"0000" => {:o=>"is", :v=>'foobar'}}}).to_a.should == @teams[1..1]
       end
     end
+
+    describe "whose type is embedded has_many" do
+      before do
+        RailsAdmin.config FieldTest do
+          field :embeds do
+            queryable true
+            searchable :all
+          end
+        end
+        @field_tests = FactoryGirl.create_list(:field_test, 3)
+        @field_tests[0].embeds.create :name => 'foo'
+        @field_tests[1].embeds.create :name => 'bar'
+        @abstract_model = RailsAdmin::AbstractModel.new('FieldTest')
+      end
+
+      it "supports querying" do
+        @abstract_model.all(:query => 'bar').to_a.should == @field_tests[1..1]
+      end
+
+      it "supports filtering" do
+        @abstract_model.all(:filters => {"embeds" => {"0000" => {:o=>"is", :v=>'bar'}}}).to_a.should == @field_tests[1..1]
+      end
+    end
   end
 
   describe "#query_conditions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbenezech-nested_form
@@ -54,6 +54,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,6 +65,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement