activeadmin-mongoidv3 0.0.1 → 0.0.2

data/lib/active_admin/mongoid/adaptor.rb

@@ -4,11 +4,12 @@ module ActiveAdmin
       class Search
         attr_reader :base, :query, :query_hash, :search_params
 
-        def initialize(object, 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)
-          @query = @base.where(@query_hash)
+          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)
@@ -26,7 +27,7 @@ module ActiveAdmin
         private
 
         def is_query(method_id)
-          method_id.to_s =~ /_(contains|eq|gt|lt|gte|lte)$/
+          method_id.to_s =~ /_(contains|eq|in|gt|lt|gte|lte)$/
         end
 
         def get_query_hash(search_params)
@@ -42,6 +43,8 @@ module ActiveAdmin
             [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$/

data/lib/active_admin/mongoid/filter_form_builder.rb

@@ -4,7 +4,7 @@ class ActiveAdmin::FilterFormBuilder
       case column.type.name.downcase.to_sym
       when :date, :datetime, :time
         return :date_range
-      when :string, :text
+      when :string, :text, :object
         return :string
       when :integer
         return :select if reflection_for(method.to_s.gsub('_id','').to_sym)

data/lib/active_admin/mongoid/resource.rb

@@ -6,10 +6,17 @@ 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
@@ -22,7 +29,6 @@ class ActiveAdmin::ResourceController
   end
 
   def search(chain)
-    @search = ActiveAdmin::Mongoid::Adaptor::Search.new(chain, clean_search_params(params[:q]))
+    @search = ActiveAdmin::Mongoid::Adaptor::Search.new(chain, clean_search_params(params[:q]), active_admin_config.mongoid_per_page, params[:page])
   end
-
 end

data/lib/active_admin/mongoid/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Mongoid
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-mongoidv3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: