activeadmin-mongoid 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9157f6b8aa66c4264bfb42bf5220ace2e7c79d30
-  data.tar.gz: 3f67da796eb5c7b42c9ecc313c030315d452fe7c
+  metadata.gz: f252b1a213790dedb791b66a2371f0d22a25a479
+  data.tar.gz: 90e7f395fc61dc91bd66d9ccb8fa64243e740e2d
 SHA512:
-  metadata.gz: f41834ee3606eff87869fcf5e741bc888fa8492329f19be35ea27a0526be6c76e9f745891a983d1c3a3befe644a1e80e56d780554f972ab81ca518b097fa99a5
-  data.tar.gz: c1f54fe99d590b2346591b3a38f2b6d22f5c3097b3f881aa9bd2be342146f0700fc1f36d811438597c159771032d192622f7ea98dfe8653a7440fa7a15fc4b56
+  metadata.gz: a605334c710e2ad8471ded1fd48163035a9e86f9a667df83e41bfa0322c98f2f7afb68d33614423d5d3e852680efcac15e30bf509a73bceffbbbd4910184f8f6
+  data.tar.gz: 7fedb4c3668e2d7cc6154c341a9e6e24ed39e1dfbaf8fd9899196198cdc8493519791c19429fb04cbb251231859c189c0925ae921c289cba812240360061a4d6

data/.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

data/CONDUCT.md

@@ -0,0 +1,13 @@
+This document provides community guidelines for a safe, respectful, productive,
+and collaborative place for any person who is willing to contribute to the project
+community. It applies to all “collaborative space”, which is defined as
+community communications channels (such as mailing lists, submitted patches,
+commit comments, etc.).
+
+* Participants will be tolerant of opposing views.
+* Participants must ensure that their language and actions are free of personal
+  attacks and disparaging personal remarks.
+* When interpreting the words and actions of others, participants should always
+  assume good intentions.
+* Behaviour which can be reasonably considered harassment will not be
+  tolerated.

data/Gemfile

@@ -5,16 +5,21 @@ source 'https://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
+gem 'ransack', github: 'activerecord-hackery/ransack'
 
 # Test app stuff
 
-gem 'rails', '~> 3.2.6'
+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',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  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
@@ -26,6 +31,7 @@ gem 'jquery-ui-rails'
 gem 'jslint'
 
 group :test do
+  gem 'pry-rails'
   gem 'capybara'
   gem 'poltergeist'
   gem 'launchy'

data/README.md

@@ -1,23 +1,46 @@
-# ActiveAdmin::Mongoid
+# 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.
+
+### 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
 
-[![Build Status](https://secure.travis-ci.org/elia/activeadmin-mongoid.png?branch=master)](http://travis-ci.org/elia/activeadmin-mongoid)
-[![Gem Version](https://badge.fury.io/rb/activeadmin-mongoid.png)](http://badge.fury.io/rb/activeadmin-mongoid)
+#### Rails 4 with
 
+## ♻️ INFO
+
+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:
+Some ActiveAdmin features are disabled or not working properly:
 
-- comments
+- comments are disabled by default
+- 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:

data/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', '~> 0.6'
-  gem.add_runtime_dependency 'jquery-rails', '< 3.0' # in which they remove jquery-ui
-  gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4', '< 5.0']
-  gem.add_runtime_dependency 'meta_search',  '~> 1.1.3'
+  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.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

data/lib/active_admin/mongoid.rb

@@ -1,11 +1,13 @@
 require 'active_admin/mongoid/version'
+require 'active_model'
+require 'mongoid'
+require 'ransack'
 # require 'active_admin/mongoid/engine'
 require 'active_admin'
 require 'devise'
 require 'rails'
-require 'mongoid'
 
-require 'active_admin/mongoid/comments'
+# require 'active_admin/mongoid/comments'
 require 'active_admin/mongoid/adaptor'
 require 'active_admin/mongoid/filter_form_builder'
 require 'active_admin/mongoid/resource'
@@ -13,6 +15,8 @@ require 'active_admin/mongoid/document'
 require 'active_admin/mongoid/helpers/collection'
 require 'active_admin/mongoid/criteria'
 
+require 'active_admin/mongoid/order_clause'
+
 module ActiveAdmin
   module Mongoid
     class Railtie < ::Rails::Railtie

data/lib/active_admin/mongoid/document.rb

@@ -1,5 +1,5 @@
 require 'delegate'
-require 'meta_search/searches/mongoid'
+# require 'meta_search/searches/mongoid'
 
 module ActiveAdmin::Mongoid::Document
   extend ActiveSupport::Concern
@@ -13,7 +13,7 @@ module ActiveAdmin::Mongoid::Document
     def type
       _super = super
       case _super
-      when Moped::BSON::ObjectId, Object
+      when BSON::ObjectId, Object
         :string
       else
         _super.name.underscore.to_sym
@@ -37,7 +37,7 @@ module ActiveAdmin::Mongoid::Document
   # CLASS METHODS
 
   included do
-    include MetaSearch::Searches::Mongoid
+    # include MetaSearch::Searches::Mongoid
 
     unless respond_to? :primary_key
       class << self
@@ -45,7 +45,11 @@ module ActiveAdmin::Mongoid::Document
       end
     end
 
-    self.primary_key ||= [:_id]
+    self.primary_key ||= :id
+
+    def column_for_attribute(name)
+      self.class.fields[name.to_sym]
+    end
 
   end
 
@@ -53,41 +57,41 @@ module ActiveAdmin::Mongoid::Document
 
     # Metasearch
 
-    def joins_values *args
-      criteria
-    end
+    # def joins_values *args
+    #   criteria
+    # end
 
-    def group_by *args, &block
-      criteria
-    end
+    # def group_by *args, &block
+    #   criteria
+    # end
 
-    def ransack *args
-      scoped
+    # def ransack *args
+    #   scoped
 
-      scoped.class.class_eval do
-        def result
-          self
-        end
-      end
+    #   scoped.class.class_eval do
+    #     def result
+    #       self
+    #     end
+    #   end
 
-      scoped
-    end
+    #   scoped
+    # end
 
 
     # Cache
 
-    def [] name
-      raise name.inspect
-      cache[name]
-    end
+    # def [] name
+    #   raise name.inspect
+    #   cache[name]
+    # end
 
-    def []= name, value
-      cache[name]= value
-    end
+    # def []= name, value
+    #   cache[name]= value
+    # end
 
-    def cache
-      @cache ||= {}
-    end
+    # def cache
+    #   @cache ||= {}
+    # end
 
 
     # Columns
@@ -99,27 +103,31 @@ module ActiveAdmin::Mongoid::Document
       end
     end
 
-    def columns
-      @columns ||= fields.map(&:second).map{ |c| ColumnWrapper.new(c) }
-    end
+    # def columns
+    #   @columns ||= fields.map(&:second).map{ |c| ColumnWrapper.new(c) }
+    # end
 
-    def column_names
-      @column_names ||= fields.map(&:first)
-    end
+    # def column_names
+    #   @column_names ||= fields.map(&:first)
+    # end
 
-    def columns_hash
-      columns.index_by(&:name)
-    end
+    # def columns_hash
+    #   columns.index_by(&:name)
+    # end
 
 
 
-    def reorder sorting
-      return unscoped if sorting.blank?
-      options = sorting.split(/ |\./)
-      options.shift if options.count == 3
-      field, order = *options
-      unscoped.order_by(field => order)
-    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)
@@ -141,6 +149,4 @@ module ActiveAdmin::Mongoid::Document
 end
 
 Mongoid::Document.send :include, ActiveAdmin::Mongoid::Document
-Mongoid::Document.send :include, MetaSearch::Searches::Mongoid
-
-
+# Mongoid::Document.send :include, MetaSearch::Searches::Mongoid

data/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)

data/lib/active_admin/mongoid/helpers/collection.rb

@@ -1,9 +1,19 @@
 module ActiveAdmin
   module Helpers
     module Collection
-      def collection_size(collection=collection)
-        collection.count(true)
+
+      alias original_collection_size collection_size
+      original_collection_size = instance_method(:collection_size)
+
+      def collection_size(collection = nil)
+        collection ||= self.collection
+        if collection.is_a?(::Mongoid::Criteria)
+          collection.entries.count
+        else
+          original_collection_size(collection)
+        end
       end
+
     end
   end
 end

data/lib/active_admin/mongoid/order_clause.rb

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  class OrderClause
+
+    def to_sql
+      to_mongo_options
+    end
+
+    def to_mongo_options
+      { @column => @order.downcase.to_sym }
+    end
+  end
+end

data/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