activeadmin-mongoid 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9525c1fd3bd558d51fd4c298764e85a33e4eda0542e41a5b22907b67d1063194
-  data.tar.gz: 18e3fbf3d3a5dcc93e32c4ddb6a6d6d12d14e403785b197622ad2ae5f13cac49
+  metadata.gz: be7b4cf7a8d6adf31b32f4a10f1719f04b859fd62c062240a2d2519d70cfc739
+  data.tar.gz: '09d014d82d99ebadda2c05ed1f06327ed99931ee371fb2433ddf0806460a1017'
 SHA512:
-  metadata.gz: c768a4b1e7a4cf1153ca94c84a950214d6e25353842a385874280c75ca2b2d2e1be9d5439e73665631f7618cc15edb314c6be02d9a812007175d7c67a7637465
-  data.tar.gz: 37dc8c7023d59e97ef50d70b1896db131fafec039e697927d90d4e88eff56adcc5e069905bcd75252f4678cf30d3d30cb84814c3d42b0c0997916c1ddeb8f9e0
+  metadata.gz: d3cc3ccc47e25617aae19eddc3db1af073df07a22f39338297616bfe1f41eb29b734b18399a7f8409712a7837eb694de4344145af7d884b64210670acadca9af
+  data.tar.gz: 4b9b1da89366e1617206aa7a76aba19a54ed91240e0834588caff0f89b9a38f66ea9a89b42dcac0650f457cb90f3bd4c1c82cf47e11ef4e911e33f62b2613890

data/.travis.yml

@@ -3,9 +3,10 @@ services:
   - mongodb
 before_install:
   - gem update --system
-  - gem install bundler   
+  - gem install bundler
+  - bundle update --bundler
 rvm:
-  - 2.3
   - 2.4
   - 2.5
-  - 2.6  
+  - 2.6
+  - 2.7

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 gem 'ransack-mongoid', git: 'https://github.com/activerecord-hackery/ransack-mongoid'
 
-gem 'rails', '~> 5.2'
+gem 'rails', '>= 5.2', '< 6.1'
 
 gem 'devise'
 

data/Gemfile.lock

@@ -7,11 +7,11 @@ GIT
 PATH
   remote: .
   specs:
-    activeadmin-mongoid (0.9.0)
+    activeadmin-mongoid (1.0.0)
       activeadmin (>= 1.4.3)
       jquery-rails
       kaminari-mongoid
-      mongoid (~> 6.0)
+      mongoid (>= 6.0, < 8.a)
       sass-rails (>= 3.1.4)
 
 GEM
@@ -40,18 +40,17 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.4.3)
-      arbre (>= 1.1.1)
-      coffee-rails
+    activeadmin (2.6.0)
+      arbre (~> 1.2, >= 1.2.1)
       formtastic (~> 3.1)
-      formtastic_i18n
-      inherited_resources (>= 1.9.0)
-      jquery-rails (>= 4.2.0)
-      kaminari (>= 0.15)
-      railties (>= 4.2, < 5.3)
-      ransack (>= 1.8.7)
-      sass (~> 3.1)
-      sprockets (< 4.1)
+      formtastic_i18n (~> 0.4)
+      inherited_resources (~> 1.7)
+      jquery-rails (~> 4.2)
+      kaminari (~> 1.0, >= 1.0.1)
+      railties (>= 5.2, < 6.1)
+      ransack (~> 2.1, >= 2.1.1)
+      sassc-rails (~> 2.1)
+      sprockets (>= 3.0, < 4.1)
     activejob (5.2.3)
       activesupport (= 5.2.3)
       globalid (>= 0.3.6)
@@ -75,8 +74,8 @@ GEM
     arbre (1.2.1)
       activesupport (>= 3.0.0)
     arel (9.0.0)
-    bcrypt (3.1.12)
-    bson (4.4.2)
+    bcrypt (3.1.13)
+    bson (4.7.1)
     builder (3.2.3)
     capybara (3.12.0)
       addressable
@@ -88,26 +87,18 @@ GEM
       xpath (~> 3.2)
     cliver (0.3.2)
     coderay (1.1.2)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    devise (4.6.2)
+    crass (1.0.5)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.3.1)
     erubi (1.8.0)
-    execjs (2.7.0)
-    ffi (1.10.0)
+    ffi (1.12.1)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
@@ -118,11 +109,11 @@ GEM
       activesupport (>= 4.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    inherited_resources (1.10.0)
-      actionpack (>= 5.0, < 6.0)
+    inherited_resources (1.11.0)
+      actionpack (>= 5.0, < 6.1)
       has_scope (~> 0.6)
-      railties (>= 5.0, < 6.0)
-      responders (~> 2.0)
+      railties (>= 5.0, < 6.1)
+      responders (>= 2, < 4)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -149,7 +140,7 @@ GEM
       mongoid
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -161,26 +152,28 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mongo (2.8.0)
+    mongo (2.11.3)
       bson (>= 4.4.2, < 5.0.0)
-    mongoid (6.4.2)
-      activemodel (>= 5.1, < 6.0.0)
+    mongoid (7.0.5)
+      activemodel (>= 5.1, < 6.1)
       mongo (>= 2.5.1, < 3.0.0)
     nio4r (2.3.1)
-    nokogiri (1.10.2)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.8)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -199,7 +192,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     railties (5.2.3)
       actionpack (= 5.2.3)
@@ -207,15 +200,12 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    ransack (2.1.1)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+    rake (12.3.3)
+    ransack (2.3.2)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
       i18n
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
+      polyamorous (= 2.3.2)
     regexp_parser (1.3.0)
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
@@ -237,17 +227,16 @@ GEM
       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.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -262,7 +251,7 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     warden (1.2.8)
@@ -286,7 +275,7 @@ DEPENDENCIES
   launchy
   poltergeist
   pry-rails
-  rails (~> 5.2)
+  rails (>= 5.2, < 6.1)
   ransack-mongoid!
   rspec-rails (~> 3.6)
   simplecov

data/README.md

@@ -6,11 +6,11 @@
 
 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.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))
+### Requirements for version 1.0.0
+* Ruby 2.4.0 or greater.
 * 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.4.3
+* ActiveAdmin 1.4.3 or greater
 * `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
@@ -38,7 +38,7 @@ 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.8.0'
+gem 'activeadmin-mongoid', '1.0.0'
 gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
 ```
 
@@ -61,6 +61,7 @@ with:
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
+require "action_view/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 ```

data/activeadmin-mongoid.gemspec

@@ -17,10 +17,10 @@ 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.required_ruby_version = '>= 2.4'
+
+  gem.add_runtime_dependency 'mongoid',     '>= 6.0', '< 8.a'
   gem.add_runtime_dependency 'activeadmin', '>= 1.4.3'
   gem.add_runtime_dependency 'kaminari-mongoid'
   gem.add_runtime_dependency 'jquery-rails'

data/lib/active_admin/mongoid.rb

@@ -13,6 +13,7 @@ require 'active_admin/mongoid/document'
 require 'active_admin/mongoid/helpers/collection'
 require 'active_admin/mongoid/criteria'
 require 'active_admin/mongoid/order_clause'
+require 'active_admin/mongoid/association/relatable'
 
 require 'active_admin/mongoid/inputs/filters/check_boxes_input'
 require 'active_admin/mongoid/inputs/filters/select_input'

data/lib/active_admin/mongoid/association/relatable.rb

@@ -0,0 +1,14 @@
+Mongoid::Association::Relatable.module_eval do
+  def macro
+    self.class.name.split('::').last.underscore.to_sym
+  end
+
+  def embeds?
+    [:embeds_one, :embeds_many].include?(macro)
+  end
+
+  def foreign_key
+    return if embeds?
+    foreign_key.to_sym rescue nil
+  end
+end

data/lib/active_admin/mongoid/document.rb

@@ -53,7 +53,7 @@ module ActiveAdmin::Mongoid::Document
   module ClassMethods
     def content_columns
       # cannot cache this, since changes in time (while defining fields)
-      fields.map(&:second).reject do |f|
+      fields.map(&:second).reject! do |f|
         f.name =~ /(^_|^(created|updated)_at)/ or Mongoid::Fields::ForeignKey === f
       end
     end

data/lib/active_admin/mongoid/filter_form_builder.rb

@@ -25,7 +25,7 @@ class ActiveAdmin::Filters::FormBuilder
   end
 
   def is_association?(method)
-    @object.klass.associations.to_a.map(&:first).include?(method.to_s)
+    @object.klass.associations.to_a.map!(&:first).include?(method.to_s)
   end
 
   def column_for(method)

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

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

data/lib/active_admin/mongoid/version.rb

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

data/lib/meta_search/searches/mongoid.rb

@@ -92,7 +92,7 @@ module MetaSearch
       end
 
       def metasearch_regexp
-        field_names = klass.fields.map(&:second).map(&:name)
+        field_names = klass.fields.map{ |field| field.second.name }
         conditions = MetaSearch::DEFAULT_WHERES.map {|condition| condition[0...-1]} # pop tail options
 
         /\A(#{field_names.join('|')})_(#{conditions.join('|')})\z/

data/spec/features/smoke_spec.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 require 'spec_helper'
-require 'activeadmin'
 
 describe 'browse the test app' do
   let(:password) { 'foobar•secret' }

data/spec/spec_helper.rb

@@ -11,8 +11,6 @@ if %w(true 1).include?(ENV['COVERAGE'])
   end
 end
 
-Bundler.require
-
 require File.expand_path("../../test_app/config/environment", __FILE__)
 require 'rspec/rails'
 

data/test_app/config/application.rb

@@ -4,6 +4,7 @@ require File.expand_path('../boot', __FILE__)
 # require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
+require "action_view/railtie"
 # require "active_resource/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"

data/test_app/config/mongoid.6.yml

@@ -1,10 +1,3 @@
-development:
-  clients:
-    default:
-      database: activeadmin_mongoid_development
-      hosts:
-        - localhost:27017
-
 test:
   clients:
     default:

data/test_app/config/mongoid.7.yml

@@ -0,0 +1,14 @@
+development:
+  clients:
+    default:
+      database: activeadmin_mongoid_development
+      hosts:
+        - localhost:27017
+
+test:
+  clients:
+    default:
+      database: activeadmin_mongoid_test
+      hosts:
+        - localhost:27017
+#scope_overwrite_exception: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Elia Schito
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.a
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +121,7 @@ files:
 - Rakefile
 - activeadmin-mongoid.gemspec
 - lib/active_admin/mongoid.rb
+- lib/active_admin/mongoid/association/relatable.rb
 - lib/active_admin/mongoid/controllers/resource_controller.rb
 - lib/active_admin/mongoid/criteria.rb
 - lib/active_admin/mongoid/csv_builder.rb
@@ -186,6 +193,7 @@ files:
 - test_app/config/mongoid.4.yml
 - test_app/config/mongoid.5.yml
 - test_app/config/mongoid.6.yml
+- test_app/config/mongoid.7.yml
 - test_app/config/routes.rb
 - test_app/db/migrate/20130514223107_create_admin_notes.rb
 - test_app/db/migrate/20130514223108_move_admin_notes_to_comments.rb
@@ -223,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -231,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin hacks to support Mongoid