activeadmin-ajax_filter 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c7f4aee3fd33b595a1ffc93607105ddf846bd5
-  data.tar.gz: e8f49b3b765797df812bea7f0a0eb83a544c76ad
+  metadata.gz: 9cb7aa5a0c59aba7801bdc4fe6a30bfd7a691df5
+  data.tar.gz: 37be94d419e2fc0892eb813380544b034100d7db
 SHA512:
-  metadata.gz: dd107194fc32f19bf54573adcf15d6e63d5cee4d770d6584771c9b67c4e3421053b2b1de824e7832e0edda824ff0a35284e890da0c209583406266f0614e23b6
-  data.tar.gz: 80cd974c4dbd3ea41b283af0cfc049e839f82ad59f2cf0c5fd6f09a1c53dd2ffe80bda9448450e0fdc3b88a77a4f94b89ef1e931c0fe3ae88b4423b13b003245
+  metadata.gz: 5243df321869f832fc8205e5b682ed819b587db49532d1585bbc8bc1ce2764eb11369bbd19c68654abddfb98370b7a0344cd7334ae24a2f85c3fccaaf6654161
+  data.tar.gz: 5e29bcd580b55b2e0cd673d067f06e92835cc6e5c85f63a59b8b076e457b3e349adcc23a4f3663d56cac8e3a3e0a822f26b4e55d43ca87371ba63fffd83afc75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeadmin-ajax_filter (0.3.4)
+    activeadmin-ajax_filter (0.3.5)
       activeadmin (>= 1.0.0.pre1)
       coffee-rails (>= 4.1.0)
       selectize-rails (>= 0.11.2)
@@ -127,16 +127,14 @@ GEM
     mime-types (2.99.1)
     mini_portile2 (2.1.0)
     minitest (5.8.4)
-    multi_json (1.12.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    phantomjs (1.9.8.0)
+    phantomjs (2.1.1.0)
     pkg-config (1.1.7)
-    poltergeist (1.6.0)
+    poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
@@ -243,8 +241,8 @@ DEPENDENCIES
   database_cleaner (~> 1.5.0)
   factory_girl_rails
   launchy (~> 2.4.3)
-  phantomjs (~> 1.9.8)
-  poltergeist (~> 1.6.0)
+  phantomjs (~> 2.1.1)
+  poltergeist (~> 1.10.0)
   rake (~> 10.0)
   rspec (~> 3.3, >= 3.3.0)
   rspec-rails (~> 3.3)

data/activeadmin-ajax_filter.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'temping', '~> 3.3', '>= 3.3.0'
   gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
   gem.add_development_dependency 'capybara', '~> 2.1'
-  gem.add_development_dependency 'phantomjs', '~> 1.9.8'
-  gem.add_development_dependency 'poltergeist', '~> 1.6.0'
+  gem.add_development_dependency 'phantomjs', '~> 2.1.1'
+  gem.add_development_dependency 'poltergeist', '~> 1.10.0'
   gem.add_development_dependency 'database_cleaner', '~> 1.5.0'
   gem.add_development_dependency 'launchy', '~> 2.4.3'
 end

data/lib/active_admin/ajax_filter.rb

@@ -14,8 +14,7 @@ module ActiveAdmin
       def included(dsl)
         dsl.instance_eval do
           collection_action :filter, method: :get do
-            scope = collection.ransack(params[:q]).result
-            scope = scope.order(params[:order]).limit(params[:limit] || 10)
+            scope = collection.order(params[:order]).limit(params[:limit] || 10)
             scope = apply_collection_decorator(scope)
 
             render plain: scope.to_json

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

data/lib/active_admin/inputs/ajax_core.rb

@@ -30,7 +30,7 @@ module ActiveAdmin
       end
 
       def collection_from_association
-        super.try(:limit, collection_limit)
+        super.try(:limit, collection_limit).try(:ransack, static_ransack).result
       end
 
       def value_field
@@ -72,4 +72,4 @@ module ActiveAdmin
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -202,28 +202,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.8
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.8
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: AJAX filters for ActiveAdmin