filter_form 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0687dda492a9e82d4e3b5555586410a5679a52e7
-  data.tar.gz: 167fb3b2e8dc2cd001b2dd8c618088632cb12263
+  metadata.gz: 9426e908a32ac701218c4ba33aaaadef4e6575cb
+  data.tar.gz: 78121225fa25f3cf8008e5677f16403c7d0497e5
 SHA512:
-  metadata.gz: 78954032e35a6c3e71dbdfb2e5e678a90a41a6d163e658d0f76240c775f7ec517dd0c26af01927135ad888548b9fac813f1a1d337da5540a773990cecbadb755
-  data.tar.gz: c6ed716a620c7465a14c1318c1dd130e37dad616588f276c58f9dc4ce49356f6ff32d186cbfc9bd90b2d5371f8d67752384cc622a161c53b91d319e5b393a2bf
+  metadata.gz: 1e2ec010b96b771e578d82f082392f1f9ee1543c1610e7ecf050e84611382b4d546213b559720403cee58c2aba5a0358df3b30ed15e76816774cdc31197063a2
+  data.tar.gz: 2a48d297c0ef88a01d1c9cb66cd2f1952a62e78830a91b4caf43d23e7aa8a6a9f0e7bc606618750d1423d413bf07a85cd8825bd2ce4481d93e8a3585e1af067b

data/README.md

@@ -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 `foreign key` (city_id) it will automatically build a select tag.
+For association's belongs_to `foreign key` (city_id) 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`.
 

data/lib/filter_form/input_builder.rb

@@ -0,0 +1,59 @@
+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'
+
+module FilterForm
+  class InputBuilder
+    include ActiveModel::Model
+
+    attr_accessor :attribute_name, :object
+
+    def build
+      "FilterForm::Inputs::#{ input_type.camelize }".constantize.new(attribute_name: attribute_name, object: object)
+    end
+
+  private
+
+    def input_type
+      "#{ type }_#{ predicate }"
+    end
+
+    def predicate
+      case attribute_type
+      when :string
+        :cont
+      else
+        :eq
+      end
+    end
+
+    def type
+      case attribute_type
+      when :string
+        :string
+      when :integer
+        :integer
+      when :datetime, :date
+        :date
+      when :belongs_to
+        :belongs_to
+      end
+    end
+
+    def association_belongs_to?
+      object.klass.reflections[attribute_name] && object.klass.reflections[attribute_name].belongs_to?
+    end
+
+    def attribute_type
+      if association_belongs_to?
+        :belongs_to
+      else
+        object.klass.columns_hash[attribute_name.to_s].type
+      end
+    end
+  end
+end

data/lib/filter_form/inputs/base.rb

@@ -0,0 +1,34 @@
+module FilterForm
+  module Inputs
+    class Base
+      include ActiveModel::Model
+
+      attr_accessor :attribute_name, :object
+
+      def options
+        {
+          required:   false,
+          input_html: { name: input_name }
+        }
+      end
+
+    private
+
+      def input_name
+        "q[#{ attribute_name }_#{ predicate }]"
+      end
+
+      def input_value
+        object_condition.values.first.value if object_condition
+      end
+
+      def predicate
+        self.class.to_s.underscore.split('_').last
+      end
+
+      def object_condition
+        object.base.conditions.select { |c| c.a.first.name == attribute_name.to_s }.first
+      end
+    end
+  end
+end

data/lib/filter_form/inputs/belongs_to_eq.rb

@@ -0,0 +1,36 @@
+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/date_eq.rb

@@ -0,0 +1,13 @@
+module FilterForm
+  module Inputs
+    class DateEq < FilterForm::Inputs::String
+      DATE_CLASS = 'filter_form_date'
+
+    private
+
+      def additional_input_options
+        super.merge(class: DATE_CLASS)
+      end
+    end
+  end
+end

data/lib/filter_form/inputs/integer_eq.rb

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

data/lib/filter_form/inputs/string.rb

@@ -0,0 +1,19 @@
+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

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

data/lib/filter_form/simple_form/form_builder.rb

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

data/lib/filter_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Evgeny Li
@@ -95,7 +95,13 @@ files:
 - lib/assets/javascripts/filter_form.js.coffee
 - lib/filter_form.rb
 - lib/filter_form/form_helper.rb
-- lib/filter_form/input.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/simple_form/form_builder.rb
 - lib/filter_form/version.rb
 homepage: https://github.com/exAspArk/filter_form

data/lib/filter_form/input.rb

@@ -1,113 +0,0 @@
-module FilterForm
-  class Input
-    DATE_CLASS = 'filter_form_date'
-
-    include ActiveModel::Model
-
-    attr_accessor :attribute_name, :object
-
-    def options
-      result = default_options
-
-      case type
-      when :select
-        result.merge!(select_options)
-      else
-        result[:input_html].merge!(value: input_value)
-      end
-
-      case attribute_type
-      when :datetime, :date
-        result[:input_html].merge!(class: DATE_CLASS)
-      end
-
-      result
-    end
-
-  private
-
-    def default_options
-      {
-        as:         type,
-        required:   false,
-        input_html: { name: input_name }
-      }
-    end
-
-    # Select options ------------------------------------------------------------
-
-    def select_options
-      {
-        collection:    collection,
-        include_blank: true,
-        selected:      selected
-      }
-    end
-
-    def collection
-      if reference_attribute?
-        attribute_name.to_s.gsub('_id', '').camelize.constantize.all
-      else
-        object.klass.pluck(attribute_name).uniq
-      end
-    end
-
-    def selected
-      if object_condition.present?
-        input_value
-      else
-        false
-      end
-    end
-
-    # ---------------------------------------------------------------------------
-
-    def input_name
-      "q[#{ input_attribute_name }]"
-    end
-
-    def type
-      return :select if reference_attribute?
-
-      case attribute_type
-      when :string, :integer, :datetime, :date
-        :string
-      when :float
-        :float
-      when :boolean
-        :radio_buttons
-      else
-        :select
-      end
-    end
-
-    def input_value
-      object_condition.values.first.value if object_condition
-    end
-
-    def reference_attribute?
-      attribute_name.to_s.end_with?('_id')
-    end
-
-    def object_condition
-      object.base.conditions.select { |c| c.a.first.name == attribute_name.to_s }.first
-    end
-
-    def input_attribute_name
-      "#{ attribute_name }_#{ predicate_name }"
-    end
-
-    def attribute_type
-      object.klass.columns_hash[attribute_name.to_s].type
-    end
-
-    def predicate_name
-      case attribute_type
-      when :string
-        'cont'
-      else
-        'eq'
-      end
-    end
-  end
-end