filter_form 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd5243daad11ce3e28c7254adc4b38c1d074a832
-  data.tar.gz: 25b9b90af41360d9cde068a1776917c969c3a7a3
+  metadata.gz: a83442fb7f60aefce93393a49763bb4d66495b6e
+  data.tar.gz: 2ded8529b6e92cecce469d4b33b5153627e8a3b7
 SHA512:
-  metadata.gz: acbf8a3dfd3efd8321011eeb3cab40a6a1992257b1c36bd38c626da42efe3964a5325079e48e615b3af98f3b5fe328ff3cfacb48a6b4b363f54da586ca8bb96f
-  data.tar.gz: ea9025c3daf99539f0358fef095657e0fd09da526aa579de25dfdf8366123ddac2c62e2c1de6b081fcac9d2af36ece9cd55d7d95a426d8c6e97e6aadbb36eb72
+  metadata.gz: 9a5c647796b8f95a916084c1ebe3268677c26a496e106576ef6634b45eb72782e22a502aeeabfd37e9fc716f43cbf457dae5447338ef9786b27a9e59bdc326b3
+  data.tar.gz: b3982e9af2e8457750805d14a0be2418aa1e2419eeac7e7d8ffc61f85cb4b0b2a3a5d24875fff1911224c593e59298d7f0680c0eaaba27a2f3c6fabde5fe7647

data/README.md

@@ -36,6 +36,7 @@ In your view file:
   <%= f.filter_input :name      # string     %>
   <%= f.filter_input :age       # integer    %>
   <%= f.filter_input :city      # belongs_to %>
+  <%= f.filter_input :parents   # collection %>
   <%= f.filter_input :birthday  # date       %>
   <%= f.filter_input :amount    # money      %>
   <%= f.button :submit %>
@@ -51,6 +52,7 @@ In your view file:
      `datetime`      | `datetime`                                      | `eq`                  | `input[type=text]`        |
      `date`          | `date`                                          | `eq`                  | `input[type=text]`        |
      `belongs_to`    | `belongs_to` association                        | `eq`                  | `select`                  |
+     `collection`    | `has_many` or `has_and_belongs_to_many` association | `eq`              | `select`                  |
      `money`         | `money` [monetized](https://github.com/RubyMoney/money-rails) attribute | `eq` | `input[type=text]` |
 
 ### Customization

data/lib/filter_form/input_options/select/collection.rb

@@ -0,0 +1,25 @@
+module FilterForm
+  module InputOptions
+    module Select
+      class Collection < FilterForm::InputOptions::Select::Base
+        private
+
+        def object_condition
+          object.base.conditions.select { |c| c.a.first.name == custom_attribute_name }.first
+        end
+
+        def collection
+          options[:collection] || attribute_name.to_s.camelize.singularize.constantize.all
+        end
+
+        def input_name
+          "q[#{ custom_attribute_name }_#{ predicate }]"
+        end
+
+        def custom_attribute_name
+          "#{ attribute_name }_id"
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/input_options_builder.rb

@@ -2,6 +2,7 @@ require 'filter_form/input_options/base'
 
 require 'filter_form/input_options/select/base'
 require 'filter_form/input_options/select/belongs_to'
+require 'filter_form/input_options/select/collection'
 
 require 'filter_form/input_options/string/base'
 require 'filter_form/input_options/string/date'
@@ -56,6 +57,8 @@ module FilterForm
         'string/money'
       when :belongs_to
         'select/belongs_to'
+      when :collection
+        'select/collection'
       when :select2
         'select/select2'
       else
@@ -67,6 +70,10 @@ module FilterForm
       object.klass.reflections[attribute_name] && object.klass.reflections[attribute_name].belongs_to?
     end
 
+    def collection?
+      object.klass.reflections[attribute_name] && object.klass.reflections[attribute_name].collection?
+    end
+
     def money?
       object.klass.columns_hash["#{ attribute_name }_cents"].present?
     end
@@ -74,6 +81,8 @@ module FilterForm
     def attribute_type
       if belongs_to?
         :belongs_to
+      elsif collection?
+        :collection
       elsif money?
         :money
       else

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Evgeny Li
@@ -113,6 +113,7 @@ files:
 - lib/filter_form/input_options/base.rb
 - lib/filter_form/input_options/select/base.rb
 - lib/filter_form/input_options/select/belongs_to.rb
+- lib/filter_form/input_options/select/collection.rb
 - lib/filter_form/input_options/string/base.rb
 - lib/filter_form/input_options/string/date.rb
 - lib/filter_form/input_options/string/money.rb