activeadmin-mongoid 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6da33a191ec2b498b1c60af1f60f5a1532c83acca6bb9b6de27d5185bb174ca
-  data.tar.gz: a06a98d29c14d147a96ffebd21c84ae34fe8cde13e9aec72c2cdf2acc8b49283
+  metadata.gz: 9525c1fd3bd558d51fd4c298764e85a33e4eda0542e41a5b22907b67d1063194
+  data.tar.gz: 18e3fbf3d3a5dcc93e32c4ddb6a6d6d12d14e403785b197622ad2ae5f13cac49
 SHA512:
-  metadata.gz: 7f645440724c5a60a3a38eb184bac5af562bb17411251cfac0c55e5e0f57d643db030d69613090f9541ad5e767529599466bf8c23bd9310d9633839be48faed2
-  data.tar.gz: cc2fb3f311e28347f84241d20c74d15761a4df5e672ce7eeb16912a88d23858eb13486f114fef6b0f28102dcaef2cb031b82cd4f3f3afb3bc3936bbe61919d18
+  metadata.gz: c768a4b1e7a4cf1153ca94c84a950214d6e25353842a385874280c75ca2b2d2e1be9d5439e73665631f7618cc15edb314c6be02d9a812007175d7c67a7637465
+  data.tar.gz: 37dc8c7023d59e97ef50d70b1896db131fafec039e697927d90d4e88eff56adcc5e069905bcd75252f4678cf30d3d30cb84814c3d42b0c0997916c1ddeb8f9e0

data/.gitignore

@@ -2,7 +2,6 @@
 *.rbc
 .config
 .yardoc
-/Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 services:
   - mongodb
+before_install:
+  - gem update --system
+  - gem install bundler   
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6  

data/Gemfile

@@ -1,38 +1,20 @@
 source 'https://rubygems.org'
 
-# Declare your gem's dependencies in activeadmin-mongoid.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'ransack', github: 'activerecord-hackery/ransack'
-gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
+gem 'ransack-mongoid', git: 'https://github.com/activerecord-hackery/ransack-mongoid'
 
-# Test app stuff
-
-gem 'rails', '~> 5.1'
-gem 'kaminari', '~> 1.0'
-gem 'kaminari-mongoid'
+gem 'rails', '~> 5.2'
 
 gem 'devise'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '>= 5.0.6'
-  gem 'coffee-rails', '~> 4.0'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-  gem 'uglifier', '>= 1.0.3'
-end
+gem 'pry-rails'
 
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'jslint'
 
 group :test do
-  gem 'pry-rails'
   gem 'capybara'
   gem 'poltergeist'
   gem 'launchy'

data/{test_app/Gemfile.lock → Gemfile.lock}

@@ -1,79 +1,91 @@
+GIT
+  remote: https://github.com/activerecord-hackery/ransack-mongoid
+  revision: bd1935293d2f285fa7cf33d2c5c90d981bf67338
+  specs:
+    ransack-mongoid (0.1.0)
+
 PATH
-  remote: ..
+  remote: .
   specs:
-    activeadmin-mongoid (0.6.0)
-      activeadmin (>= 1.3.0)
+    activeadmin-mongoid (0.9.0)
+      activeadmin (>= 1.4.3)
       jquery-rails
+      kaminari-mongoid
       mongoid (~> 6.0)
       sass-rails (>= 3.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.3.0)
+    activeadmin (1.4.3)
       arbre (>= 1.1.1)
       coffee-rails
       formtastic (~> 3.1)
       formtastic_i18n
-      inherited_resources (>= 1.7.0)
+      inherited_resources (>= 1.9.0)
       jquery-rails (>= 4.2.0)
       kaminari (>= 0.15)
       railties (>= 4.2, < 5.3)
-      ransack (~> 1.3)
+      ransack (>= 1.8.7)
       sass (~> 3.1)
       sprockets (< 4.1)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activesupport (5.1.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arbre (1.1.1)
+    arbre (1.2.1)
       activesupport (>= 3.0.0)
-    arel (8.0.0)
+    arel (9.0.0)
     bcrypt (3.1.12)
-    bson (4.3.0)
+    bson (4.4.2)
     builder (3.2.3)
-    capybara (2.15.1)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     cliver (0.3.2)
     coderay (1.1.2)
     coffee-rails (4.2.2)
@@ -83,33 +95,34 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
-    devise (4.4.3)
+    devise (4.6.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    docile (1.1.5)
-    erubi (1.7.1)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
     execjs (2.7.0)
-    ffi (1.9.23)
+    ffi (1.10.0)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     has_scope (0.7.2)
       actionpack (>= 4.1)
       activesupport (>= 4.1)
-    i18n (1.0.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    inherited_resources (1.8.0)
-      actionpack (>= 4.2, <= 5.2)
+    inherited_resources (1.10.0)
+      actionpack (>= 5.0, < 6.0)
       has_scope (~> 0.6)
-      railties (>= 4.2, <= 5.2)
-      responders
+      railties (>= 5.0, < 6.0)
+      responders (~> 2.0)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -136,91 +149,110 @@ GEM
       mongoid
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.8.2)
-    mini_mime (0.1.4)
-    mini_portile2 (2.3.0)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (6.0.3)
-      activemodel (~> 5.0)
-      mongo (~> 2.3)
-    nio4r (2.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    mongo (2.8.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (6.4.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    poltergeist (1.16.0)
-      capybara (~> 2.1)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    polyamorous (1.3.3)
-      activerecord (>= 3.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.0)
-    rack (2.0.5)
+      method_source (~> 0.9.0)
+    pry-rails (0.3.8)
+      pry (>= 0.10.4)
+    public_suffix (3.0.3)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
-    ransack (1.8.6)
-      actionpack (>= 3.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    ransack (2.1.1)
+      actionpack (>= 5.0)
+      activerecord (>= 5.0)
+      activesupport (>= 5.0)
       i18n
-      polyamorous (~> 1.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    sass (3.5.6)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slop (3.6.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -228,45 +260,36 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-    warden (1.2.7)
-      rack (>= 1.0)
-    websocket-driver (0.6.5)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin (~> 1.3.0)
   activeadmin-mongoid!
   capybara
-  coffee-rails
   devise
   jquery-rails
   jquery-ui-rails
   jslint
-  kaminari (~> 1.0)
-  kaminari-mongoid
   launchy
-  mongoid (~> 6.0.3)
   poltergeist
-  pry
-  rails (~> 5.1.6)
-  ransack (< 1.8.7)
-  sass-rails
+  pry-rails
+  rails (~> 5.2)
+  ransack-mongoid!
+  rspec-rails (~> 3.6)
   simplecov
-  sprockets (>= 3.7.2)
-  uglifier
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

data/README.md

@@ -1,14 +1,17 @@
 # ActiveAdmin-Mongoid
+[![Version         ][rubygems_badge]][rubygems]
+[![Build Status](https://travis-ci.org/activeadmin/activeadmin-mongoid.svg?branch=master)](https://travis-ci.org/activeadmin/activeadmin-mongoid)
 
 ## Updates
 
-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.
+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 Grzegorz Jakubiak, Nic Boie, JD Guzman, Elia Schito and other ActiveAdmin and community members.
 
-### Requirements for version 0.7.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))
-* Tested working on Rails 5.1.x
+### Requirements for version 0.9.0
+* Ruby 2.3.0 or greater. (Note, ruby-2.4.0 fails specs, see [this issue](https://github.com/DatabaseCleaner/database_cleaner/issues/466))
+* Tested working on Rails 5.2.3
 * Mongoid 6.x (**WARNING**:, using a Mongoid version >= 6.1.x has resulted in a fair amount of errors seen in the wild.  Test your upgrade very carefully with any apps in which you're using this gem with Mongoid >= 6.1.x!)
-* ActiveAdmin 1.3
+* ActiveAdmin 1.4.3
+* `ransack-mongoid` - it needs to be explicitly declared in Gemfile, pointing to github's master since it has no releases on rubygems yet.
 
 ## Previous versions
 * Rails 4.x with Mongoid 5.x use branch rails4-mongoid5
@@ -19,9 +22,6 @@ ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin
 
 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.
@@ -38,7 +38,8 @@ For more on Mongoid support in ActiveAdmin see [this issue](https://github.com/g
 Add the following gems to your application's Gemfile, and lock the version:
 
 ```ruby
-gem 'activeadmin-mongoid', '0.7.0'
+gem 'activeadmin-mongoid', '0.8.0'
+gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
 ```
 
 You can safely remove the following lines, since are already activeadmin-mongoid dependencies:
@@ -99,3 +100,6 @@ And that's pretty much it !
 ## Copyright
 
 Copyright © 2012 Elia Schito. See LICENSE for details.
+
+[rubygems_badge]: https://img.shields.io/gem/v/activeadmin-mongoid.svg
+[rubygems]: https://rubygems.org/gems/activeadmin-mongoid

data/activeadmin-mongoid.gemspec

@@ -17,9 +17,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = ActiveAdmin::Mongoid::VERSION
   gem.license       = 'MIT'
+  
+  gem.required_ruby_version = '>= 2.3'
 
   gem.add_runtime_dependency 'mongoid',     ['~> 6.0']
-  gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
+  gem.add_runtime_dependency 'activeadmin', '>= 1.4.3'
+  gem.add_runtime_dependency 'kaminari-mongoid'
   gem.add_runtime_dependency 'jquery-rails'
   gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4']
 

data/lib/active_admin/mongoid.rb

@@ -2,13 +2,11 @@ require 'active_admin/mongoid/version'
 require 'active_model'
 require 'mongoid'
 require 'ransack'
-# require 'active_admin/mongoid/engine'
+require 'kaminari/mongoid'
 require 'active_admin'
 require 'devise'
 require 'rails'
 
-# require 'active_admin/mongoid/comments'
-# require 'active_admin/mongoid/adaptor' # This appears to no longer be used.
 require 'active_admin/mongoid/filter_form_builder'
 require 'active_admin/mongoid/resource'
 require 'active_admin/mongoid/document'
@@ -32,14 +30,4 @@ module ActiveAdmin
       end
     end
   end
-
-  # class << self
-  #   alias setup_without_mongoid setup
-  #
-  #   # Load monkey patches *after* the setup process
-  #   def setup *args, &block
-  #     setup_without_mongoid *args, &block
-  #
-  #   end
-  # end
 end

data/lib/active_admin/mongoid/document.rb

@@ -1,5 +1,4 @@
 require 'delegate'
-# require 'meta_search/searches/mongoid'
 
 module ActiveAdmin::Mongoid::Document
   extend ActiveSupport::Concern
@@ -37,8 +36,6 @@ module ActiveAdmin::Mongoid::Document
   # CLASS METHODS
 
   included do
-    # include MetaSearch::Searches::Mongoid
-
     unless respond_to? :primary_key
       class << self
         attr_accessor :primary_key
@@ -54,48 +51,6 @@ module ActiveAdmin::Mongoid::Document
   end
 
   module ClassMethods
-
-    # Metasearch
-
-    # def joins_values *args
-    #   criteria
-    # end
-
-    # def group_by *args, &block
-    #   criteria
-    # end
-
-    # def ransack *args
-    #   scoped
-
-    #   scoped.class.class_eval do
-    #     def result
-    #       self
-    #     end
-    #   end
-
-    #   scoped
-    # end
-
-
-    # Cache
-
-    # def [] name
-    #   raise name.inspect
-    #   cache[name]
-    # end
-
-    # def []= name, value
-    #   cache[name]= value
-    # end
-
-    # def cache
-    #   @cache ||= {}
-    # end
-
-
-    # Columns
-
     def content_columns
       # cannot cache this, since changes in time (while defining fields)
       fields.map(&:second).reject do |f|
@@ -103,32 +58,6 @@ module ActiveAdmin::Mongoid::Document
       end
     end
 
-    # def columns
-    #   @columns ||= fields.map(&:second).map{ |c| ColumnWrapper.new(c) }
-    # end
-
-    # def column_names
-    #   @column_names ||= fields.map(&:first)
-    # end
-
-    # def columns_hash
-    #   columns.index_by(&:name)
-    # end
-
-
-
-    # def reorder sorting
-    #   return unscoped if sorting.blank?
-    #   if sorting.match /\".*\".*/
-    #     options = sorting.split(/ |\./)
-    #     options.shift if options.count == 3
-    #   else
-    #     options = sorting.split(' ')
-    #   end
-    #   field, order = *options
-    #   unscoped.order_by(field => order)
-    # end
-
     def connection
       @connection ||= Connection.new(self)
     end
@@ -153,4 +82,3 @@ module ActiveAdmin::Mongoid::Document
 end
 
 Mongoid::Document.send :include, ActiveAdmin::Mongoid::Document
-# Mongoid::Document.send :include, MetaSearch::Searches::Mongoid

data/lib/active_admin/mongoid/filters/resource_extension.rb

@@ -3,7 +3,8 @@ require 'active_admin/filters/resource_extension'
 module ActiveAdmin::Filters::ResourceExtension
   def default_association_filters
     if resource_class.respond_to?(:reflect_on_all_associations)
-      poly, not_poly = resource_class.reflect_on_all_associations.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
+      without_embedded = resource_class.reflect_on_all_associations.reject { |e| [:embeds_many, :embeds_one].include? e.macro }
+      poly, not_poly = without_embedded.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
 
       filters = poly.map(&:foreign_type) + not_poly.map(&:name)
       filters.map &:to_sym

data/lib/active_admin/mongoid/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Mongoid
-    VERSION = '0.7.0'
+    VERSION = '0.9.0'
   end
 end

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@ Bundler.require
 
 require File.expand_path("../../test_app/config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Elia Schito
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -33,14 +33,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.3
+- !ruby/object:Gem::Dependency
+  name: kaminari-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +109,12 @@ files:
 - ".travis.yml"
 - CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - activeadmin-mongoid.gemspec
 - lib/active_admin/mongoid.rb
-- lib/active_admin/mongoid/adaptor.rb
-- lib/active_admin/mongoid/comments.rb
 - lib/active_admin/mongoid/controllers/resource_controller.rb
 - lib/active_admin/mongoid/criteria.rb
 - lib/active_admin/mongoid/csv_builder.rb
@@ -130,8 +143,6 @@ files:
 - tasks/test.rake
 - test_app/.gitignore
 - test_app/.rspec
-- test_app/Gemfile
-- test_app/Gemfile.lock
 - test_app/README.rdoc
 - test_app/Rakefile
 - test_app/app/admin/admin_users.rb
@@ -212,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -220,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin hacks to support Mongoid

data/lib/active_admin/mongoid/adaptor.rb

@@ -1,65 +0,0 @@
-module ActiveAdmin
-  module Mongoid
-    class Search
-      attr_reader :base, :query, :query_hash, :search_params
-
-      def initialize(object, search_params = {}, per_page = 30, page = 1)
-        @base = object
-        @search_params = search_params
-        @query_hash = get_query_hash(search_params)
-        vpage = page.to_i > 0 ? page.to_i : 1
-        @query = @base.where(@query_hash).limit(per_page).skip(per_page * (vpage - 1))
-      end
-
-      def respond_to?(method_id)
-        @query.send(:respond_to?, method_id)
-      end
-
-      def method_missing(method_id, *args, &block)
-        if is_query(method_id)
-          @search_params[method_id.to_s]
-        else
-          @query.send(method_id, *args, &block)
-        end
-      end
-
-      private
-
-      def is_query(method_id)
-        method_id.to_s =~ /_(contains|eq|in|gt|lt|gte|lte)$/
-      end
-
-      def get_query_hash(search_params)
-        searches = search_params.map do|k, v|
-          mongoidify_search(k,v)
-        end
-        Hash[searches]
-      end
-
-      def mongoidify_search(k, v)
-        case k
-        when /_contains$/
-          [get_attribute(k, '_contains'), Regexp.new(Regexp.escape("#{v}"), Regexp::IGNORECASE)]
-        when /_eq$/
-          [get_attribute(k, '_eq'), v]
-        when /_in$/
-          [get_attribute(k, '_in').to_sym.in, v]
-        when /_gt$/
-          [get_attribute(k, "_gt").to_sym.gt, v]
-        when /_lt$/
-          [get_attribute(k, "_lt").to_sym.lt, v]
-        when /_gte$/
-          [get_attribute(k, "_gte").to_sym.gte, v]
-        when /_lte$/
-          [get_attribute(k, "_lte").to_sym.lte, v]
-        else
-          [k, v]
-        end
-      end
-
-      def get_attribute(k, postfix)
-        k.match(/^(.*)#{postfix}$/)[1]
-      end
-    end
-  end
-end

data/lib/active_admin/mongoid/comments.rb

@@ -1,14 +0,0 @@
-require 'active_admin/comments/namespace_helper'
-# ActiveAdmin::Application.allow_comments = false
-
-module ActiveAdmin
-  module Comments
-
-    module NamespaceHelper
-      def comments?
-        false
-      end
-    end
-
-  end
-end

data/test_app/Gemfile

@@ -1,41 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activeadmin-mongoid', path: '../'
-gem 'activeadmin', '~> 1.3.0'
-
-# Test app stuff
-
-gem 'rails', '~> 5.1.6'
-
-gem 'pry'
-
-gem 'devise'
-
-gem 'mongoid', '~> 6.0.3', require: true
-gem 'kaminari', '~> 1.0'
-gem 'kaminari-mongoid'
-gem 'ransack', '< 1.8.7'
-
-gem 'sprockets', '>= 3.7.2'
-
-# Gems used only for assets and not required
-# in production environments by default.
-gem 'sass-rails'
-gem 'coffee-rails'
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', :platforms => :ruby
-gem 'uglifier'
-
-gem 'jquery-rails'
-# gem "jquery-rails", "~> 2.3.0"
-
-gem 'jquery-ui-rails'
-gem 'jslint'
-
-group :test do
-  gem 'capybara'
-  gem 'poltergeist'
-  gem 'launchy'
-  gem 'simplecov', require: false
-end