activeadmin-ajax_filter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 623bc73b23aeeffb17a649881dd93aac161501e7
-  data.tar.gz: 20c10cfbdf0e62cf2c4a9398e1b347c4607bf86f
+  metadata.gz: 0615541e8662246ec0d547129a2429e9a4a43d50
+  data.tar.gz: 28c1e167ae37b2893b37e58e6de7ed1cc40d7e87
 SHA512:
-  metadata.gz: 332257481022b85e17431c08bd7dd30535c56ae3fec0bdbe4161583089bbe44643515e4bebe18741b59ae88c666c815af15219bb3e224abb375f817fbfff7468
-  data.tar.gz: 3d2a382207e390bdba1ecbf104e48751d4511414c254ce706bb3309ebf4553ca80fbee3f6ad580c4e05501691eb4ec72cb3fc4c9f632c03843449b85862a9117
+  metadata.gz: 681e7958936fa07a57f811621b0358c2f16c479a17d4d4fc755ba10d5042574c91ed3d441eeeb5020b625fe71b8f8e69c0f6ab920e27e8a769ac31ba059ff159
+  data.tar.gz: 86b64b3ee8d2d5ba8b638421a7e720ec7fd001465a4666dfb6940dc5afc2d9990e6b699ce2f6e0466daaa77a7e453756626a9c6d9117bcdcf9f03346a1cd3ec9

data/.travis.yml

@@ -3,5 +3,11 @@ rvm:
   - 2.1.5
   - 2.2.4
   - 2.3.0
-  - ruby-head
 before_install: gem install bundler -v 1.10.6
+
+script:
+  - bundle exec rspec
+
+addons:
+  code_climate:
+    repo_token: 9c938a047651a943393f0f52bfc1d03d71fce0f19bf0f8c1265033af9b09a56e

data/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://travis-ci.org/holyketzer/activeadmin-ajax_filter.svg?branch=master)](https://travis-ci.org/holyketzer/activeadmin-ajax_filter)
+[![Code Climate](https://codeclimate.com/github/holyketzer/activeadmin-ajax_filter/badges/gpa.svg)](https://codeclimate.com/github/holyketzer/activeadmin-ajax_filter)
+[![Test Coverage](https://codeclimate.com/github/holyketzer/activeadmin-ajax_filter/badges/coverage.svg)](https://codeclimate.com/github/holyketzer/activeadmin-ajax_filter/coverage)
+[![Gem Version](https://badge.fury.io/rb/activeadmin-ajax_filter.svg)](https://badge.fury.io/rb/activeadmin-ajax_filter)
+
 # Activeadmin::AjaxFilter
 
 This gem extends ActiveAdmin so that your can use filters with AJAX-powered input.
@@ -27,34 +32,38 @@ Or install it yourself as:
 Include this line in your JavaScript code (active_admin.js.coffee)
 
 ```coffeescript
-    #= require activeadmin-ajax_filter
+#= require activeadmin-ajax_filter
 ```
 
 Include this line in your CSS code (active_admin.scss)
 
 ```scss
-    @import "activeadmin-ajax_filter";
+@import "activeadmin-ajax_filter";
 ```
 
 Include `ActiveAdmin::AjaxFilter` module to the ActiveAdmin relation resource for which you want to support filtering and add `ajax_select` filter to main resource. For example:
 
 ```ruby
-    # Relation-resource
-    ActiveAdmin.register User do
-        include ActiveAdmin::AjaxFilter
-    ...
-
-    # Main resource
-    ActiveAdmin.register Invoice do
-        filter :user, as: :ajax_select, data: { search_fields: [:email, :customer_uid], limit: 7 }
+# Relation-resource
+ActiveAdmin.register User do
+  include ActiveAdmin::AjaxFilter
+  # ...
+end
+
+# Main resource
+ActiveAdmin.register Invoice do
+  filter :user, as: :ajax_select, data: { search_fields: [:email, :customer_uid], limit: 7 }
+  # ...
+end
 ```
 
 You can use next parameters in `data` hash:
 
-* limit - count of the items which will be requested by AJAX, by default `5`
-* value_field - value field for html select element, by default `id`
-* search_fields - fields by which AJAX search will be performed, required parameter 
-* ransack - ransack query which will be applied, by default it's builded from `search_fields` with `or` and `contains` clauses, e.g.: `email_or_customer_uid_cont`
+* `limit` - count of the items which will be requested by AJAX, by default `5`
+* `value_field` - value field for html select element, by default `id`
+* `search_fields` - fields by which AJAX search will be performed, required 
+* `ordering` - sort string like `email ASC, customer_uid DESC`, by default it uses first value of `search_fields` with `ASC` direction
+* `ransack` - ransack query which will be applied, by default it's builded from `search_fields` with `or` and `contains` clauses, e.g.: `email_or_customer_uid_cont`
 
 ## Development
 
@@ -64,8 +73,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/holyketzer/activeadmin-ajax_filter. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/holyketzer/activeadmin-ajax_filter. This project is intended to be a safe, welcoming space for collaboration.
 
 ## License
 

data/activeadmin-ajax_filter.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
   gem.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.11'
   gem.add_development_dependency 'temping', '~> 3.3', '>= 3.3.0'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
 end

data/app/assets/javascripts/activeadmin-ajax_filter.js.coffee

@@ -3,6 +3,7 @@ $ ->
     select = $(select)
     valueField = select.data('value-field')
     searchFields = select.data('search-fields').split(' ')
+    ordering = select.data('ordering')
 
     loadOptions = (q, callback) ->
       $.ajax
@@ -12,6 +13,7 @@ $ ->
         data:
           q: q
           limit: select.data('limit')
+          order: ordering
         error: ->
           callback()
         success: (res) ->
@@ -21,6 +23,9 @@ $ ->
       valueField: valueField
       labelField: searchFields[0]
       searchField: searchFields
+      sortField: ordering.split(',').map (clause)->
+        c = clause.trim().split(' ')
+        { field: c[0], direction: c[1] }
       options: []
       create: false
       render:

data/lib/active_admin/ajax_filter.rb

@@ -14,7 +14,7 @@ module ActiveAdmin
           collection_action :filter, method: :get do
             scope = collection.ransack(params[:q]).result
 
-            render json: scope.order(:created_at).limit(params[:limit] || 10)
+            render json: scope.order(params[:order]).limit(params[:limit] || 10)
           end
         end
       end

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/active_admin/inputs/filters/ajax_select_input.rb

@@ -17,6 +17,7 @@ module ActiveAdmin
             'data-limit' => collection_limit,
             'data-value-field' => value_field,
             'data-search-fields' => search_fields,
+            'data-ordering' => ordering,
             'data-ransack' => ransack,
             'data-selected-value' => selected_value,
           )
@@ -38,6 +39,10 @@ module ActiveAdmin
           ajax_data[:search_fields] || raise(ArgumentError, 'search_fields in required')
         end
 
+        def ordering
+          ajax_data[:ordering] || "#{search_fields.first} ASC"
+        end
+
         def ransack
           ajax_data[:ransack] || "#{search_fields.join('_or_')}_cont"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -132,6 +132,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Allows to define filter by relation for ActiveAdmin resource pages using
   Ransacker to dynamicaly load items while user is typing symbols in filter
 email: