filter_form 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171340b9c0fc1d7d02673af21730771c2b0418cb
-  data.tar.gz: ed3e5ceb3b980f7be6b180473324c5f0fbc32f1a
+  metadata.gz: 7dcaf4e227c17f563b101cefe9a484d9fd066d48
+  data.tar.gz: 7bdd04c0838a27f3e04789a51de8b73e0d4b3d80
 SHA512:
-  metadata.gz: 1f6ac120444c85f9e17379f20d90785be8292ef3c8b77134955f064c646457d3fb880f8f9b44024e8760603f23adfa77b5b0b5edbde7f8bf99c29aa03f1ff31d
-  data.tar.gz: a77bb4a9608392182ee035c692b0ce6c6211823db6eeed231674358d1047567dde3927db2a1ab2973959b4d8b780c6ba5a5e8102502171aa55493e32071abf14
+  metadata.gz: 2f17dca9f965ebf77df3b5b2c7cbb6982cd706e0f41f20573d24c0076aba27896f769124aefac747d9ff03e401a0d2fb4f5c82a1938fdbaeb175f7c427c0dee7
+  data.tar.gz: ccfbb999edd00621a83ff4e968816572cbab2667ef9c40c340f6205b78ad0568de7e8e305b88963442c1b5e08d2669c1cd23a28b9aef2938b24531933ec82310

data/README.md

@@ -33,13 +33,13 @@ In your view file:
 
 ```erb
 <%= filter_form_for @q do |f| %>
+  <%= f.filter_input :married   # boolean    %>
   <%= f.filter_input :name      # string     %>
   <%= f.filter_input :age       # integer    %>
+  <%= f.filter_input :birthday  # date       %>
   <%= f.filter_input :city      # belongs_to %>
   <%= f.filter_input :parents   # has_many   %>
-  <%= f.filter_input :birthday  # date       %>
   <%= f.filter_input :amount    # money      %>
-  <%= f.filter_input :married   # boolean    %>
   <%= f.button :submit %>
 <% end %>
 ```

data/lib/filter_form/input_options/base.rb

@@ -3,7 +3,9 @@ module FilterForm
     class Base
       include ActiveModel::Model
 
-      attr_accessor :attribute_name, :object, :predicate, :options
+      DEFAULT_PREDICATE = nil
+
+      attr_accessor :attribute_name, :object, :custom_predicate, :options
 
       def simple_form_options
         default_options.merge(additional_options).merge(options)
@@ -81,6 +83,10 @@ module FilterForm
       def input_attribute_name
         attribute_name
       end
+
+      def predicate
+        custom_predicate || self.class::DEFAULT_PREDICATE
+      end
     end
   end
 end

data/lib/filter_form/input_options/checkbox/base.rb

@@ -2,6 +2,8 @@ module FilterForm
   module InputOptions
     module Checkbox
       class Base < FilterForm::InputOptions::Base
+        DEFAULT_PREDICATE = :true
+
         private
 
         def additional_options

data/lib/filter_form/input_options/number/base.rb

@@ -2,6 +2,8 @@ module FilterForm
   module InputOptions
     module Number
       class Base < FilterForm::InputOptions::Base
+        DEFAULT_PREDICATE = :eq
+
         private
 
         def additional_options

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

@@ -2,6 +2,8 @@ module FilterForm
   module InputOptions
     module Select
       class Base < FilterForm::InputOptions::Base
+        DEFAULT_PREDICATE = :eq
+
         private
 
         def additional_options

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

@@ -2,6 +2,8 @@ module FilterForm
   module InputOptions
     module String
       class Base < FilterForm::InputOptions::Base
+        DEFAULT_PREDICATE = :cont
+
         private
 
         def additional_options

data/lib/filter_form/input_options_builder.rb

@@ -17,7 +17,7 @@ module FilterForm
     attr_accessor :attribute_name, :object, :custom_predicate, :custom_type
 
     def build(options)
-      input_options_class.new(attribute_name: attribute_name, object: object, predicate: predicate, options: options).simple_form_options
+      input_options_class.new(attribute_name: attribute_name, object: object, custom_predicate: custom_predicate, options: options).simple_form_options
     end
 
   private
@@ -34,19 +34,6 @@ module FilterForm
       "FilterForm::InputOptions::#{ class_name }".constantize
     end
 
-    def predicate
-      return custom_predicate if custom_predicate
-
-      case type
-      when :string
-        :cont
-      when :boolean
-        :true
-      else
-        :eq
-      end
-    end
-
     def type
       custom_type ? map_type(custom_type) : map_type(attribute_type)
     end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Evgeny Li