filter_form 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61af5ef0d5917e255602f6569418187119a6f180
-  data.tar.gz: 1b30d938f722535d762a193b17463fc88a55d2b7
+  metadata.gz: b830a861ee39acd8f2c1b5ed04935ad77f3b509a
+  data.tar.gz: c311699b26fb7f0bca2ef57e6173287121735121
 SHA512:
-  metadata.gz: c6751e3a4c26d7b2cb544e56153b7f0640bab894cefc0e04c3579e68a963573344b1fc3fb831f620a026f83615c74f8c95b8d881388dccd2563efc115058f464
-  data.tar.gz: 6a0df1220993e23dc094cc829dcb0c272491bb636fccc0421837be3b0187462204390d97207e87821aa82fa226c843a8510211276e212b8f80a9fb00cf82279e
+  metadata.gz: 69267fd08e65bbb07f3757f1f37a2d4893c802fb12515a1043c864744d9ef8c7ec7d0f87b2251725c2edf243677fbd627cdce8c3dd337bc3b2271ff4bd97ad05
+  data.tar.gz: 72c09ffcc2dd31f588dd6866f3ad7a7655c3b1e6c414f7000a8879d936046e6784f70dcd86aafdfd4112b841b473ea578b4ad7c0c1244284d9cd7d5ac6bde616

data/README.md

@@ -47,6 +47,7 @@ In your view file:
      Mapping         | Database Column Type                            | Default predicate     | Generated HTML Element    |
      --------------- |:------------------------------------------------|:----------------------|:--------------------------|
      `string`        | `string`                                        | `cont`                | `input[type=text]`        |
+     `select2`       | `string`                                        | `eq`                  | `select`                  |
      `integer`       | `integer`                                       | `eq`                  | `input[type=text]`        |
      `datetime`      | `datetime`                                      | `eq`                  | `input[type=text]`        |
      `date`          | `date`                                          | `eq`                  | `input[type=text]`        |
@@ -59,7 +60,8 @@ Of course you can customize your filter, like:
 
 ```erb
 <%= filter_form_for @q do |f| %>
-  <%= f.filter_input :year, as: :select, collection: ((Date.today.year - 3)..(Date.today.year + 3)).to_a, predicate: :not_eq %>
+  <%= f.filter_input :title, as: :select2 %>
+  <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
   <%= f.button :submit %>
 <% end %>
 ```

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

@@ -3,5 +3,8 @@
 #= require select2
 
 $ ->
+  $('.filter_form_select2').select2()
+
   $('.filter_form_date').datepicker
     dateFormat: 'yy-mm-dd'
+

data/lib/filter_form/input_builder.rb

@@ -2,6 +2,7 @@ require 'filter_form/inputs/base'
 
 require 'filter_form/inputs/select/base'
 require 'filter_form/inputs/select/belongs_to'
+require 'filter_form/inputs/select/select2'
 
 require 'filter_form/inputs/string/base'
 require 'filter_form/inputs/string/date'
@@ -30,7 +31,7 @@ module FilterForm
     def predicate
       return custom_predicate if custom_predicate
 
-      case attribute_type
+      case type
       when :string
         :cont
       else
@@ -52,6 +53,8 @@ module FilterForm
         'string/money'
       when :belongs_to
         'select/belongs_to'
+      when :select2
+        'select/select2'
       else
         _type
       end

data/lib/filter_form/inputs/base.rb

@@ -3,16 +3,32 @@ module FilterForm
     class Base
       include ActiveModel::Model
 
+      INPUT_CLASS = ''
+
       attr_accessor :attribute_name, :object, :predicate
 
       def options
+        result = default_options.merge(additional_options)
+        result[:input_html].merge!(additional_input_options)
+        result
+      end
+
+    private
+
+      def default_options
         {
           required:   false,
           input_html: { name: input_name }
         }
       end
 
-    private
+      def additional_options
+        {}
+      end
+
+      def additional_input_options
+        { class: self.class::INPUT_CLASS }
+      end
 
       def input_name
         "q[#{ attribute_name }_#{ predicate }]"

data/lib/filter_form/inputs/select/base.rb

@@ -2,11 +2,7 @@ module FilterForm
   module Inputs
     module Select
       class Base < FilterForm::Inputs::Base
-        def options
-          super.merge(additional_options)
-        end
-
-      private
+        private
 
         def additional_options
           {
@@ -18,7 +14,7 @@ module FilterForm
         end
 
         def collection
-          []
+          object.klass.uniq.pluck(attribute_name)
         end
       end
     end

data/lib/filter_form/inputs/select/select2.rb

@@ -0,0 +1,9 @@
+module FilterForm
+  module Inputs
+    module Select
+      class Select2 < FilterForm::Inputs::Select::Base
+        INPUT_CLASS = 'filter_form_select2'
+      end
+    end
+  end
+end

data/lib/filter_form/inputs/string/base.rb

@@ -2,18 +2,14 @@ module FilterForm
   module Inputs
     module String
       class Base < FilterForm::Inputs::Base
-        def options
-          result = super.merge(as: :string)
-          result[:input_html].merge!(additional_input_options)
-          result
-        end
+        private
 
-      private
+        def additional_options
+          { as: :string }
+        end
 
         def additional_input_options
-          {
-            value: input_value
-          }
+          super.merge(value: input_value)
         end
       end
     end

data/lib/filter_form/inputs/string/date.rb

@@ -2,13 +2,7 @@ module FilterForm
   module Inputs
     module String
       class Date < FilterForm::Inputs::String::Base
-        DATE_CLASS = 'filter_form_date'
-
-      private
-
-        def additional_input_options
-          super.merge(class: DATE_CLASS)
-        end
+        INPUT_CLASS = 'filter_form_date'
       end
     end
   end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Evgeny Li
@@ -114,6 +114,7 @@ files:
 - lib/filter_form/inputs/base.rb
 - lib/filter_form/inputs/select/base.rb
 - lib/filter_form/inputs/select/belongs_to.rb
+- lib/filter_form/inputs/select/select2.rb
 - lib/filter_form/inputs/string/base.rb
 - lib/filter_form/inputs/string/date.rb
 - lib/filter_form/inputs/string/money.rb