filter_form 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9426e908a32ac701218c4ba33aaaadef4e6575cb
-  data.tar.gz: 78121225fa25f3cf8008e5677f16403c7d0497e5
+  metadata.gz: a5c64e1aac94322bc5abb235cab80a8d4247b2db
+  data.tar.gz: f8e50efe3a8d295b9e0365e39d73554f7454ecf5
 SHA512:
-  metadata.gz: 1e2ec010b96b771e578d82f082392f1f9ee1543c1610e7ecf050e84611382b4d546213b559720403cee58c2aba5a0358df3b30ed15e76816774cdc31197063a2
-  data.tar.gz: 2a48d297c0ef88a01d1c9cb66cd2f1952a62e78830a91b4caf43d23e7aa8a6a9f0e7bc606618750d1423d413bf07a85cd8825bd2ce4481d93e8a3585e1af067b
+  metadata.gz: ac4df24288cf564c677c9bbebcf5e7f3879600abb93fa6d02d891b053fabd61f67506e7e320b1c9dc59e434a338ec238b5931969123b7a551da80f5abe1dafb7
+  data.tar.gz: 5280ac3c9afb28987196dd4cc2676c069075a0f8525ac2a2d9650008eaf5e1027dd634ae7e8afd609e0ba6b42116524b62442cd86796ac93d067844fbedcc902

data/README.md

@@ -35,7 +35,7 @@ In your view file:
 <%= filter_form_for @q do |f| %>
   <%= f.filter_input :name %>
   <%= f.filter_input :age %>
-  <%= f.filter_input :city_id %>
+  <%= f.filter_input :city %>
   <%= f.filter_input :birthday %>
   <%= f.button :submit %>
 <% end %>
@@ -45,7 +45,7 @@ For `string` attribute (like name) it will automatically create a text input wit
 
 For `integer` type (age) it will set predicate `eq`.
 
-For association's belongs_to `foreign key` (city_id) it will automatically build a select tag.
+For association `belongs_to` (city) it will automatically build a select tag.
 
 For `date` and `datetime` (birthday) it will automatically add jQuery [datepicker](http://jqueryui.com/datepicker/) and set predicate `eq`.
 
@@ -63,6 +63,16 @@ And application.css:
 *= require jquery.ui.datepicker
 ```
 
+And also 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: :eq %>
+  <%= f.button :submit %>
+<% end %>
+```
+
+
 For more information about predicates visit [ransack](https://github.com/ernie/ransack).
 
 If you want to customize your form visit [simple_form](https://github.com/plataformatec/simple_form).

data/lib/filter_form/input_builder.rb

@@ -1,25 +1,33 @@
 require 'filter_form/inputs/base'
-require 'filter_form/inputs/string'
 
-require 'filter_form/inputs/belongs_to_eq'
-require 'filter_form/inputs/string_cont'
-require 'filter_form/inputs/integer_eq'
-require 'filter_form/inputs/date_eq'
+require 'filter_form/inputs/select/base'
+require 'filter_form/inputs/select/belongs_to_eq'
+
+require 'filter_form/inputs/string/base'
+require 'filter_form/inputs/string/string_cont'
+require 'filter_form/inputs/string/integer_eq'
+require 'filter_form/inputs/string/date_eq'
 
 module FilterForm
   class InputBuilder
     include ActiveModel::Model
 
-    attr_accessor :attribute_name, :object
+    attr_accessor :attribute_name, :object, :options
 
     def build
-      "FilterForm::Inputs::#{ input_type.camelize }".constantize.new(attribute_name: attribute_name, object: object)
+      "FilterForm::Inputs::#{ input_type.camelize }".constantize.new attribute_name: attribute_name,
+                                                                     object:         object,
+                                                                     predicate:      options[:predicate]
     end
 
   private
 
     def input_type
-      "#{ type }_#{ predicate }"
+      if options[:as]
+        "#{ options[:as] }/base"
+      else
+        "#{ type }_#{ predicate }"
+      end
     end
 
     def predicate
@@ -34,13 +42,13 @@ module FilterForm
     def type
       case attribute_type
       when :string
-        :string
+        'string/string'
       when :integer
-        :integer
+        'string/integer'
       when :datetime, :date
-        :date
+        'string/date'
       when :belongs_to
-        :belongs_to
+        'select/belongs_to'
       end
     end
 

data/lib/filter_form/inputs/base.rb

@@ -3,7 +3,7 @@ module FilterForm
     class Base
       include ActiveModel::Model
 
-      attr_accessor :attribute_name, :object
+      attr_accessor :attribute_name, :object, :predicate
 
       def options
         {
@@ -15,15 +15,15 @@ module FilterForm
     private
 
       def input_name
-        "q[#{ attribute_name }_#{ predicate }]"
+        "q[#{ attribute_name }_#{ predicate_name }]"
       end
 
       def input_value
         object_condition.values.first.value if object_condition
       end
 
-      def predicate
-        self.class.to_s.underscore.split('_').last
+      def predicate_name
+        predicate || self.class.to_s.underscore.split('_').last
       end
 
       def object_condition

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

@@ -0,0 +1,26 @@
+module FilterForm
+  module Inputs
+    module Select
+      class Base < FilterForm::Inputs::Base
+        def options
+          super.merge(additional_options)
+        end
+
+      private
+
+        def additional_options
+          {
+            as:            :select,
+            collection:    collection,
+            include_blank: true,
+            selected:      input_value
+          }
+        end
+
+        def collection
+          []
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module FilterForm
+  module Inputs
+    module Select
+      class BelongsToEq < FilterForm::Inputs::Select::Base
+        private
+
+        def object_condition
+          object.base.conditions.select { |c| c.a.first.name == custom_attribute_name }.first
+        end
+
+        def collection
+          attribute_name.to_s.camelize.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/inputs/string/base.rb

@@ -0,0 +1,21 @@
+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
+
+        def additional_input_options
+          {
+            value: input_value
+          }
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/inputs/{date_eq.rb → string/date_eq.rb}

@@ -1,6 +1,6 @@
 module FilterForm
   module Inputs
-    class DateEq < FilterForm::Inputs::String
+    class DateEq < FilterForm::Inputs::String::Base
       DATE_CLASS = 'filter_form_date'
 
     private

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

@@ -0,0 +1,6 @@
+module FilterForm
+  module Inputs
+    class IntegerEq < FilterForm::Inputs::String::Base
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module FilterForm
+  module Inputs
+    class StringCont < FilterForm::Inputs::String::Base
+    end
+  end
+end

data/lib/filter_form/simple_form/form_builder.rb

@@ -3,7 +3,7 @@ require 'filter_form/input_builder'
 module SimpleForm
   class FormBuilder < ActionView::Helpers::FormBuilder
     def filter_input(attribute_name, options = {}, &block)
-      filter_form_input = FilterForm::InputBuilder.new(attribute_name: attribute_name, object: object).build
+      filter_form_input = FilterForm::InputBuilder.new(attribute_name: attribute_name, options: options, object: object).build
 
       options.reverse_merge!(filter_form_input.options)
 

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Evgeny Li
@@ -97,11 +97,12 @@ files:
 - lib/filter_form/form_helper.rb
 - lib/filter_form/input_builder.rb
 - lib/filter_form/inputs/base.rb
-- lib/filter_form/inputs/belongs_to_eq.rb
-- lib/filter_form/inputs/date_eq.rb
-- lib/filter_form/inputs/integer_eq.rb
-- lib/filter_form/inputs/string.rb
-- lib/filter_form/inputs/string_cont.rb
+- lib/filter_form/inputs/select/base.rb
+- lib/filter_form/inputs/select/belongs_to_eq.rb
+- lib/filter_form/inputs/string/base.rb
+- lib/filter_form/inputs/string/date_eq.rb
+- lib/filter_form/inputs/string/integer_eq.rb
+- lib/filter_form/inputs/string/string_cont.rb
 - lib/filter_form/simple_form/form_builder.rb
 - lib/filter_form/version.rb
 homepage: https://github.com/exAspArk/filter_form

data/lib/filter_form/inputs/belongs_to_eq.rb

@@ -1,36 +0,0 @@
-module FilterForm
-  module Inputs
-    class BelongsToEq < FilterForm::Inputs::Base
-      def options
-        super.merge(additional_options)
-      end
-
-    private
-
-      def additional_options
-        {
-          as:            :select,
-          collection:    collection,
-          include_blank: true,
-          selected:      input_value
-        }
-      end
-
-      def object_condition
-        object.base.conditions.select { |c| c.a.first.name == custom_attribute_name }.first
-      end
-
-      def collection
-        attribute_name.to_s.camelize.constantize.all
-      end
-
-      def input_name
-        "q[#{ custom_attribute_name }_#{ predicate }]"
-      end
-
-      def custom_attribute_name
-        "#{ attribute_name }_id"
-      end
-    end
-  end
-end

data/lib/filter_form/inputs/integer_eq.rb

@@ -1,6 +0,0 @@
-module FilterForm
-  module Inputs
-    class IntegerEq < FilterForm::Inputs::String
-    end
-  end
-end

data/lib/filter_form/inputs/string.rb

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

data/lib/filter_form/inputs/string_cont.rb

@@ -1,6 +0,0 @@
-module FilterForm
-  module Inputs
-    class StringCont < FilterForm::Inputs::String
-    end
-  end
-end