filter_form 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc130994d3c55ed5c6f1c4b2688cd4813ba6af91
-  data.tar.gz: 487b03ce0bb806abf0dbd6f4a3f0a83e2673dac8
+  metadata.gz: ec225cccac2f53560a86cf1547c0cda96bb1eb02
+  data.tar.gz: 88eec85cf485d5d6dea24a750c76adf5b76ac438
 SHA512:
-  metadata.gz: 9b956134196f326345e0656770dfd4940adc3bc8046ff938a7da764282e99a18ecde2b6c0ce0f37cbea4068a64ff86b95a5c48d3e72aef92409deaf75b185501
-  data.tar.gz: e18ec3457dabad9c5daf5f2fe186f615a52c7e05e1987703f32ebc730c816b77d09ac8e02e1a71d2e3db8ef3623fb2d3c0f705db71899030cac2cc0fc3409f44
+  metadata.gz: 5f51d1760f2ea0cd3783cc77a1e4aafc0ce3d020b70ab1f0e0d35e2cadbaba239779e7206bb5ceb9cb611493d20f121398fe4933e12567c73fb31daf4d76a973
+  data.tar.gz: 8e7e507e2ad44f545339961cdca23edeee59d86d23b60d729e586ddafeb7c90a76b9b86afba0de9aa336f2c37cd2bf1e4801b3f1110d3f3c30c289f049509ef0

data/README.md

@@ -59,7 +59,8 @@ Of course you can customize your filter, like:
 
 ```erb
 <%= filter_form_for @q do |f| %>
-  <%= f.filter_input :title, as: :select, in: :select2 %>
+  <%= 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 %>
@@ -80,6 +81,8 @@ And application.css:
 ```css
 *= require jquery.ui.datepicker
 *= require select2
+
+*= require filter_form
 ```
 
 ### Other sources

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

@@ -1,6 +1,58 @@
+class PredicateSelector
+  _select: null
+
+  _predicates: [
+    { name: '=', value: 'eq' },
+    { name: '>', value: 'gt' },
+    { name: '<', value: 'lt' }
+  ]
+
+  @element_for_attribute: ->
+    { name: 'with', value: 'predicate_selector' }
+
+  @class_name: ->
+    'predicate_selector'
+
+  constructor: (@element) ->
+    @insert_selector()
+    @set_onchange_listener()
+    @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).insertBefore(@element)
+
+  set_onchange_listener: ->
+    self = @
+    $(@_select).change ->
+      predicate = self.find_predicate_by_name $(@).val()
+      self.set_name_to_element(predicate)
+
+  set_name_to_element: (predicate) ->
+    new_name = "q[#{ $(@element).attr('id').replace('q_', '') }_#{ predicate.value }]"
+    $(@element).attr('name', new_name)
+
+  find_predicate_by_name: (name) ->
+    for predicate in @_predicates
+      return predicate if predicate.name is name
+
+  set_current_predicate: ->
+    if @current_predicate()
+      $(@_select).val(@current_predicate().name).change()
+
+  current_predicate: ->
+    for predicate in @_predicates
+      return predicate if predicate.value is $(@element).data('current-predicate')
+
+###############################################################################
+
 $ ->
+  for element in $("[data-#{ PredicateSelector.element_for_attribute().name }='#{ PredicateSelector.element_for_attribute().value }']")
+    new PredicateSelector(element)
+
   $('.filter_form_select2').select2()
 
   $('.filter_form_date').datepicker
     dateFormat: 'yy-mm-dd'
-

data/lib/assets/stylesheets/filter_form.css.sass

@@ -0,0 +1,12 @@
+.form-group
+  .predicate_selector
+    width: 20%
+    display: block
+    margin-right: 10px
+    float: left
+
+  input[data-with="predicate_selector"]
+    width: 60%
+
+  label
+    display: block

data/lib/filter_form/input_options/base.rb

@@ -14,7 +14,7 @@ module FilterForm
       def default_options
         {
           required:   false,
-          input_html: { name: input_name }.merge(additional_input_options).merge(options.delete(:input_html) || {})
+          input_html: additional_input_options.merge(options.delete(:input_html) || {})
         }
       end
 
@@ -23,7 +23,17 @@ module FilterForm
       end
 
       def additional_input_options
-        input_class ? { class: input_class } : {}
+        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
+      end
+
+      def current_predicate
+        object.base.conditions.first.predicate.name if object.base.conditions.any?
       end
 
       def input_class

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -107,6 +107,7 @@ files:
 - Rakefile
 - filter_form.gemspec
 - lib/assets/javascripts/filter_form.js.coffee
+- lib/assets/stylesheets/filter_form.css.sass
 - lib/filter_form.rb
 - lib/filter_form/form_helper.rb
 - lib/filter_form/input_options/base.rb