Merge pull request activeadmin#105 from activeadmin/rails-5-mongoid-6

boie0025 · web-flow · commit e35277587aac · 2017-09-13T19:14:50.000-05:00
Rails 5 mongoid 6
diff --git a/.travis.yml b/.travis.yml
@@ -2,5 +2,6 @@ language: ruby
 services:
   - mongodb
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
diff --git a/Gemfile b/Gemfile
@@ -7,18 +7,18 @@ gemspec
 
 gem 'ransack', github: 'activerecord-hackery/ransack'
 
-gem 'activeadmin', github: 'activeadmin'
-
 # Test app stuff
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 5.0'
+gem 'kaminari', '~> 1.0'
+gem 'kaminari-mongoid'
 
 gem 'devise'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 4.0'
+  gem 'sass-rails',   '>= 5.0.6'
   gem 'coffee-rails', '~> 4.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -31,6 +31,7 @@ gem 'jquery-ui-rails'
 gem 'jslint'
 
 group :test do
+  gem 'pry-rails'
   gem 'capybara'
   gem 'poltergeist'
   gem 'launchy'
diff --git a/README.md b/README.md
@@ -1,34 +1,46 @@
-### ♻️ INFO
+# ActiveAdmin-Mongoid
 
-**Official support** has started, subscribe to [activeadmin#2714](https://github.com/activeadmin/activeadmin/issues/2714) for updates!
+## Updates
 
-### ⚠️ ALERT
+ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin application.  This repo was pulled into the ActiveAdmin org from previous work done by Elia Schito, and will be maintained by Nic Boie, JD Guzman, Elia Schito and other ActiveAdmin and community members.
 
-For the reason above **I'm no longer actively maintaining the project**. I will still accept any pull request for recent rails/mongoid/activeadmin and adding new specs.
+### Requirements for version 0.4.0
+* Ruby 2.2.2 or greater. (Note, ruby-2.4.0 fails specs, see [this issue](https://github.com/DatabaseCleaner/database_cleaner/issues/466))
+* Requires Rails 5.0.x
+* Mongoid 6.0.x
+* ActiveAdmin 1.x
 
----
+## Previous versions
+* Rails 4.x with Mongoid 5.x use branch rails4-mongoid5
+* Rails 4.x with Mongoid 4.x branch rails4
+* Mongoid 3.x with older versions of rails use v 0.3.0
 
-# ActiveAdmin::Mongoid
+#### Rails 4 with
+
+## ♻️ INFO
 
-[![Build Status](https://secure.travis-ci.org/elia/activeadmin-mongoid.svg?branch=master)](http://travis-ci.org/elia/activeadmin-mongoid)
-[![Gem Version](https://badge.fury.io/rb/activeadmin-mongoid.svg)](http://badge.fury.io/rb/activeadmin-mongoid)
+This gem has been brought into the ActiveAdmin org for support and maintenance.  
 
+<!-- [![Build Status](https://secure.travis-ci.org/elia/activeadmin-mongoid.svg?branch=master)](http://travis-ci.org/elia/activeadmin-mongoid)
+[![Gem Version](https://badge.fury.io/rb/activeadmin-mongoid.svg)](http://badge.fury.io/rb/activeadmin-mongoid) -->
+
+# ActiveAdmin::Mongoid
 
 ActiveAdmin hacks to support Mongoid.
 Some ActiveAdmin features are disabled or not working properly:
 
 - comments are disabled by default
-- filters are somehow broken
+- filters are somewhat broken
 
 For more on Mongoid support in ActiveAdmin see [this issue](https://github.com/gregbell/active_admin/issues/26).
 
 ## Installation
 
 ### Some Gems
-Add the following gems to your application's Gemfile:
+Add the following gems to your application's Gemfile, and lock the version:
 
 ```ruby
-gem 'activeadmin-mongoid'
+gem 'activeadmin-mongoid', '0.4.0'
 ```
 
 You can safely remove the following lines, since are already activeadmin-mongoid dependencies:
diff --git a/activeadmin-mongoid.gemspec b/activeadmin-mongoid.gemspec
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_admin/mongoid/version'
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Elia Schito']
+  gem.authors       = ['Elia Schito', 'Nic Boie', 'JD Guzman']
   gem.email         = ['elia@schito.me']
   gem.description   = %q{ActiveAdmin hacks to support Mongoid (some ActiveAdmin features are disabled)}
   gem.summary       = %q{ActiveAdmin hacks to support Mongoid}
@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.version       = ActiveAdmin::Mongoid::VERSION
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'mongoid',     ['> 3.0', '< 5.0']
-  gem.add_runtime_dependency 'activeadmin', ['>= 1.0.0.pre', '< 2']
+  gem.add_runtime_dependency 'mongoid',     ['~> 6.0.3']
+  gem.add_runtime_dependency 'activeadmin', ['~> 1.0']
   gem.add_runtime_dependency 'jquery-rails'
-  gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4', '< 5.0']
+  gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4', '<= 5.0.6']
   # gem.add_runtime_dependency 'meta_search',  '~> 1.1.3'
 
-  gem.add_development_dependency 'rspec-rails',  '~> 2.7'
+  gem.add_development_dependency 'rspec-rails',  '~> 3.6'
 end
diff --git a/lib/active_admin/mongoid.rb b/lib/active_admin/mongoid.rb
@@ -16,7 +16,6 @@
 require 'active_admin/mongoid/criteria'
 
 require 'active_admin/mongoid/order_clause'
-require 'active_admin/mongoid/filters/formtastic_addons'
 
 module ActiveAdmin
   module Mongoid
diff --git a/lib/active_admin/mongoid/document.rb b/lib/active_admin/mongoid/document.rb
@@ -47,6 +47,10 @@ class << self
 
     self.primary_key ||= :id
 
+    def column_for_attribute(name)
+      self.class.fields[name.to_sym]
+    end
+
   end
 
   module ClassMethods
@@ -92,12 +96,12 @@ module ClassMethods
 
     # Columns
 
-    # def content_columns
-    #   # cannot cache this, since changes in time (while defining fields)
-    #   fields.map(&:second).reject do |f|
-    #     f.name =~ /(^_|^(created|updated)_at)/ or Mongoid::Fields::ForeignKey === f
-    #   end
-    # end
+    def content_columns
+      # cannot cache this, since changes in time (while defining fields)
+      fields.map(&:second).reject do |f|
+        f.name =~ /(^_|^(created|updated)_at)/ or Mongoid::Fields::ForeignKey === f
+      end
+    end
 
     # def columns
     #   @columns ||= fields.map(&:second).map{ |c| ColumnWrapper.new(c) }
@@ -146,5 +150,3 @@ def reflections *a
 
 Mongoid::Document.send :include, ActiveAdmin::Mongoid::Document
 # Mongoid::Document.send :include, MetaSearch::Searches::Mongoid
-
-
diff --git a/lib/active_admin/mongoid/filter_form_builder.rb b/lib/active_admin/mongoid/filter_form_builder.rb
@@ -1,9 +1,16 @@
-class ActiveAdmin::FilterFormBuilder
+class ActiveAdmin::Filters::FormBuilder
+
+  def filter(method, options = {})
+    if method.present? && options[:as] ||= default_input_type(method)
+      template.concat input(method, options)
+    end
+  end
+
   def default_input_type(method, options = {})
     if column = column_for(method)
       case column.type.name.downcase.to_sym
       when :date, :datetime, :time;   :date_range
-      when :string, :text, :objectl;  :string
+      when :string, :text, :object;  :string
       when :float, :decimal;          :numeric
       when :integer
         return :select if reflection_for(method.to_s.gsub('_id','').to_sym)
diff --git a/lib/active_admin/mongoid/filters/formtastic_addons.rb b/lib/active_admin/mongoid/filters/formtastic_addons.rb
diff --git a/lib/active_admin/mongoid/helpers/collection.rb b/lib/active_admin/mongoid/helpers/collection.rb
@@ -4,17 +4,16 @@ module Collection
 
       alias original_collection_size collection_size
       original_collection_size = instance_method(:collection_size)
-      def collection_size(collection=collection)
-        if(not collection.empty? and collection.first.class.included_modules.include?(Mongoid::Document))
-          if collection.first.class.embedded?
-            collection.count
-          else
-            collection.count(true)
-          end
+
+      def collection_size(collection = nil)
+        collection ||= self.collection
+        if collection.is_a?(::Mongoid::Criteria)
+          collection.entries.count
         else
-          collection.count
+          original_collection_size(collection)
         end
       end
+
     end
   end
 end
diff --git a/lib/active_admin/mongoid/order_clause.rb b/lib/active_admin/mongoid/order_clause.rb
@@ -1,11 +1,11 @@
 module ActiveAdmin
   class OrderClause
 
-    def to_sql(active_admin_config)
-      to_mongo_options(active_admin_config)
+    def to_sql
+      to_mongo_options
     end
 
-    def to_mongo_options(active_admin_config)
+    def to_mongo_options
       { @column => @order.downcase.to_sym }
     end
   end
diff --git a/lib/active_admin/mongoid/resource.rb b/lib/active_admin/mongoid/resource.rb
@@ -1,52 +1,22 @@
-# module ActiveAdmin
-#   class Resource
-#
-#     module Naming
-#
-#       # Returns a name used to uniquely identify this resource
-#       # this should be an instance of ActiveAdmin:Resource::Name, which responds to
-#       # #singular, #plural, #route_key, #human etc.
-#       def resource_name
-#         custom_name = @options[:as] && @options[:as].gsub(/\s/,'')
-#         @resource_name ||= if custom_name || !resource_class.respond_to?(:model_name)
-#             Resource::Name.new(resource_class, custom_name)
-#           else
-#             Resource::Name.new(resource_class)
-#           end
-#       end
-#
-#     end
-#
-#   end
-# end
+module ActiveAdmin
+  class Resource
 
-# ActiveAdmin::Resource # autoload
-# class ActiveAdmin::Resource
-#   def resource_table_name
-#     resource_class.collection_name
-#   end
-#
-#   def mongoid_per_page
-#     per_page
-#   end
-# end
-#
-# ActiveAdmin::ResourceController # autoload
-# class ActiveAdmin::ResourceController
-#
-#   protected
-#
-#   # Use #desc and #asc for sorting.
-#   def sort_order(chain)
-#     params[:order] ||= active_admin_config.sort_order
-#     if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
-#       chain.send($2, $1)
-#     else
-#       chain # just return the chain
-#     end
-#   end
-#
-#   def search(chain)
-#     @search = ActiveAdmin::Mongoid::Search.new(chain, clean_search_params(params[:q]), active_admin_config.mongoid_per_page, params[:page])
-#   end
-# end
+    # the commit: https://github.com/activeadmin/activeadmin/commit/1ef08af5044814c336917fa93aea607dce16dcb7
+    #  adds in the _id field, which doesn't work with ransack for some reason or
+    #  another.  I'm not going to investigate any deeper, let's just remove the
+    #  underscore prefixed fields as was the prior behavior
+    def default_filters
+      super.reject { |filter|  filter == :_id }
+    end
+
+    module Attributes
+
+      # Hardcode mongoid STI column name
+      # see https://github.com/activeadmin/activeadmin/commit/1ef08af5044814c336917fa93aea607dce16dcb7#diff-e15d78c0b6b12c8bffec0de0ffcf735bR34
+      def sti_col?(c)
+        c.name == '_type'
+      end
+
+    end
+  end
+end
diff --git a/lib/active_admin/mongoid/version.rb b/lib/active_admin/mongoid/version.rb
@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Mongoid
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end
diff --git a/spec/features/smoke_spec.rb b/spec/features/smoke_spec.rb
@@ -97,20 +97,20 @@
 
         describe 'date_range' do
           it 'searches by created_at range' do
-            fill_in 'q[created_at_gteq]', with: 1.day.ago.to_datetime.strftime("%Y-%m-%d")
-            fill_in 'q[created_at_lteq]', with: 2.days.from_now.to_datetime.strftime("%Y-%m-%d")
+            fill_in 'q[created_at_gteq_datetime]', with: 1.day.ago.to_datetime.strftime("%Y-%m-%d")
+            fill_in 'q[created_at_lteq_datetime]', with: 2.days.from_now.to_datetime.strftime("%Y-%m-%d")
             click_on 'Filter'
 
             within '#index_table_posts' do
               page.should have_content('Quick Brown Fox')
             end
 
-            fill_in 'q[created_at_gteq]', with: 1.day.from_now.to_datetime.strftime("%Y-%m-%d")
+            fill_in 'q[created_at_gteq_datetime]', with: 1.day.from_now.to_datetime.strftime("%Y-%m-%d")
             click_on 'Filter'
             page.should_not have_content('Quick Brown Fox')
 
-            fill_in 'q[created_at_gteq]', with: ''
-            fill_in 'q[created_at_lteq]', with: ''
+            fill_in 'q[created_at_gteq_datetime]', with: ''
+            fill_in 'q[created_at_lteq_datetime]', with: ''
             click_on 'Filter'
 
             page.should have_content('Displaying 1 Post')
@@ -213,7 +213,6 @@
         posts_size.times { |n|
           Post.create!(title: "Quick Brown Fox #{n}", body: 'The quick brown fox jumps over the lazy dog.', view_count: 5, admin_user: admin_user, other_user: other_user)
         }
-
         click_on 'Posts'
       end
 
diff --git a/spec/support/debug.rb b/spec/support/debug.rb
@@ -0,0 +1,3 @@
+def debugit( *args, &block )
+  it( *args, { driver: :poltergeist_debug, inspector: true }, &block )
+end
diff --git a/test_app/Gemfile b/test_app/Gemfile
@@ -1,24 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'activeadmin', github: 'Zhomart/active_admin'
+gem 'activeadmin'
+gem 'activeadmin-mongoid', path: ',.'
 
 # Test app stuff
 
-gem 'rails', '~> 4.1'
+gem 'rails', '~> 5.0.3'
 
 gem 'pry'
 
 gem 'devise'
 
-gem 'mongoid', '~> 4.0'
+gem 'mongoid', '~> 6.0.3', require: true
+gem 'kaminari', '~> 1.0'
+gem 'kaminari-mongoid'
+gem 'ransack'
 
 # Gems used only for assets and not required
 # in production environments by default.
 gem 'sass-rails'
 gem 'coffee-rails'
 
-gem 'ransack_mongo'
-
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 gem 'uglifier'
diff --git a/test_app/app/admin/posts.rb b/test_app/app/admin/posts.rb
@@ -10,6 +10,7 @@
   filter :admin_user, as: :select
   filter :other_user, as: :check_boxes
 
+
   index do
     selectable_column
     column :title
diff --git a/test_app/app/assets/javascripts/active_admin.js b/test_app/app/assets/javascripts/active_admin.js
diff --git a/test_app/config/initializers/active_admin.rb b/test_app/config/initializers/active_admin.rb
diff --git a/test_app/config/initializers/mongoid.rb b/test_app/config/initializers/mongoid.rb
diff --git a/test_app/config/mongoid.5.yml b/test_app/config/mongoid.5.yml
diff --git a/test_app/config/mongoid.6.yml b/test_app/config/mongoid.6.yml

-Original file line number
+Diff line change
 services:
   - mongodb
 rvm:
 -  - 1.9.3
 -  - 2.0.0
 +  - 2.2.7
 +  - 2.3.4
 +  - 2.4.1