filter_form 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de52ff4dcefee188a2c1d139f5e27afde3980718
-  data.tar.gz: f99e98e31a17545668f9b08a9a8e491b43912174
+  metadata.gz: 978b3ad1c97b1aba6b76e8880fa080108b5c9690
+  data.tar.gz: e4b7527a7625e13362064dcc1934203efe1c9ac7
 SHA512:
-  metadata.gz: 7a3e203a07a1cb7c2f160877831cadea8812f14221756db54b6c7540e744e1c61ea3ae6991e5606594fc7291b92ad1973f62a144944b228fa0cc28737e72f134
-  data.tar.gz: b362914fb99e373c758da55220a280f625c2944e1d80b08233aed3548156cf34fe5eec9b606a7dd51108e167af593fac699ea20729d37f2cbf743e4f13894f14
+  metadata.gz: b9092311064803c9b527109ba1e2194c4bb38c2f9870564723d7daad1509a72e8419380a583130a0292343846536795cf4bd44c21cdbe03a0c0ed1269c38bb0c
+  data.tar.gz: 80c5249be7a0d51c7d814b25d2bc6ec833457d5849cfe54d0b8ce5a48bdd3d98ec4af3a040ca083e2607fe929ecb1936cfe0d9655f4916e151a50a679271bdd1

data/README.md

@@ -55,16 +55,7 @@ In your view file:
 
 ### Customization
 
-Of course you can customize your filter, like:
-
-```erb
-<%= filter_form_for @q do |f| %>
-  <%= f.filter_input :id, with: :predicate_selector    # will add select to change predicates in your form %>
-  <%= f.filter_input :title, as: :select, in: :select2 # wraps select in select2 %>
-  <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
-  <%= f.button :submit %>
-<% end %>
-```
+#### Assets
 
 If you want to use jQuery [Datepicker](http://jqueryui.com/datepicker/) for `date` and `datetime` automatically or [Select2](http://ivaynberg.github.io/select2/), add to your application.js file:
 
@@ -85,6 +76,37 @@ And application.css:
 *= require filter_form
 ```
 
+#### Custom predicate
+
+```erb
+<%= filter_form_for @q do |f| %>
+  <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
+  <%= f.button :submit %>
+<% end %>
+```
+
+#### Select2
+
+You can wrap your select in `select2`:
+
+```erb
+<%= filter_form_for @q do |f| %>
+  <%= f.filter_input :title, as: :select, in: :select2 %>
+  <%= f.button :submit %>
+<% end %>
+```
+
+#### Predicate selector
+
+You can show predicate selector:
+
+```erb
+<%= filter_form_for @q do |f| %>
+  <%= f.filter_input :id, predicate_selector: [['=', 'eq'], ['>', 'gt'], ['<', 'lt']] %>
+  <%= f.button :submit %>
+<% end %>
+```
+
 ### Other sources
 
 For more information about predicates visit [ransack](https://github.com/ernie/ransack).

data/lib/assets/javascripts/filter_form.js.coffee

@@ -1,17 +1,13 @@
 class PredicateSelector
+  @CLASS_NAME: 'predicate_selector'
+
   _select: null
 
-  _predicates: [
-    { name: '=', value: 'eq' },
-    { name: '>', value: 'gt' },
-    { name: '<', value: 'lt' }
-  ]
+  _predicates: ->
+    JSON.parse($(@element).attr(@constructor.element_for_attribute()))
 
   @element_for_attribute: ->
-    { name: 'with', value: 'predicate_selector' }
-
-  @class_name: ->
-    'predicate_selector'
+    'data-predicate-selector'
 
   constructor: (@element) ->
     @insert_selector()
@@ -19,9 +15,9 @@ class PredicateSelector
     @set_current_predicate()
 
   insert_selector: ->
-    @_select = $("<select for='#{ $(@element).attr('id') }' class='#{ @constructor.class_name() }'><select>")
-    for predicate in @_predicates
-      $(@_select).append("<option value='#{ predicate.name }'>#{ predicate.name }</option>")
+    @_select = $("<select for='#{ $(@element).attr('id') }' class='#{ @constructor.CLASS_NAME }'><select>")
+    for predicate in @_predicates()
+      $(@_select).append("<option value='#{ predicate[0] }'>#{ predicate[0] }</option>")
     $(@_select).insertBefore(@element)
 
   set_onchange_listener: ->
@@ -31,25 +27,25 @@ class PredicateSelector
       self.set_name_to_element(predicate)
 
   set_name_to_element: (predicate) ->
-    new_name = "q[#{ $(@element).attr('id').replace('q_', '') }_#{ predicate.value }]"
+    new_name = "q[#{ $(@element).attr('id').replace('q_', '') }_#{ predicate[1] }]"
     $(@element).attr('name', new_name)
 
   find_predicate_by_name: (name) ->
-    for predicate in @_predicates
-      return predicate if predicate.name is name
+    for predicate in @_predicates()
+      return predicate if predicate[0] is name
 
   set_current_predicate: ->
     if @current_predicate()
-      $(@_select).val(@current_predicate().name).change()
+      $(@_select).val(@current_predicate()[0]).change()
 
   current_predicate: ->
-    for predicate in @_predicates
-      return predicate if predicate.value is $(@element).data('current-predicate')
+    for predicate in @_predicates()
+      return predicate if predicate[1] is $(@element).data('current-predicate')
 
 ###############################################################################
 
 $ ->
-  for element in $("[data-#{ PredicateSelector.element_for_attribute().name }='#{ PredicateSelector.element_for_attribute().value }']")
+  for element in $("[#{ PredicateSelector.element_for_attribute() }]")
     new PredicateSelector(element)
 
   $('.filter_form_select2').select2()

data/lib/filter_form/input_options/base.rb

@@ -25,9 +25,9 @@ module FilterForm
       def additional_input_options
         result = { name: input_name, data: {} }
 
-        result[:class]                    = input_class       if input_class
-        result[:data][:with]              = options[:with]    if options[:with]
-        result[:data][:current_predicate] = current_predicate if current_predicate
+        result[:class]                     = input_class                  if input_class
+        result[:data][:predicate_selector] = options[:predicate_selector] if options[:predicate_selector]
+        result[:data][:current_predicate]  = current_predicate            if current_predicate
 
         result
       end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form