filter_form 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aef1584f174e74d19da2a06e479a5bfb6ca9c2c
-  data.tar.gz: 5173a78a306554918eab38acfd79799439f49d92
+  metadata.gz: 7a7c1d58fb2ba9912bb9c2c660473c86ccef6b15
+  data.tar.gz: 3eb6fb9a2b37a54faf157db67bc20ebaeb8dbad8
 SHA512:
-  metadata.gz: ea6408cc040d3030b60ca0312ed9b645559827f44723b367d94d29d53725fd9fd121726bfa53b644ce1fe75e7cbf1f103bc6f6a076bf057edff9c6491a5b8f70
-  data.tar.gz: 95fcbab79211432aeb981dd8c147a947043d17340e1554151ed28fa0808241a7d046f65202d9f346f03cbdd2eb6eb46205c0fafe00177c054ba9e226a2343c18
+  metadata.gz: eefd55897f30e589ec381a3adc540f3a866c9e38b6bed0a1313e35e746533fe736905ff20da89a99caf4b7bb766d13065f97f4daa963a360869a66885685872e
+  data.tar.gz: 075413fb4d0ba0084573ca482b628fb00a7ffeb394374610f0bf6f3ec12a682079de7a63dcd7ee578faf61c9d655fdfbe563f350541896f9ba6fefabd7817e59

data/README.md

@@ -41,15 +41,12 @@ In your view file:
 <% end %>
 ```
 
-For `string` attribute (like name) it will automatically create a text input with predicate `cont` (contains).
+* For `string` attribute (like name) it will automatically create a text input with predicate `cont` (contains).
+* For `integer` type (age) it will set predicate `eq`.
+* For association `belongs_to` (city) it will automatically build a select tag with `eq`.
+* For `date` and `datetime` (birthday) it will automatically add jQuery [datepicker](http://jqueryui.com/datepicker/) and set predicate `eq`.
 
-For `integer` type (age) it will set predicate `eq`.
-
-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`.
-
-If you want to use datepicker add to your application.js file:
+To use datepicker add to your application.js file:
 
 ```js
 //= require jquery
@@ -63,7 +60,7 @@ And application.css:
 *= require jquery.ui.datepicker
 ```
 
-And also you can customize your filter, like:
+Of course you can customize your filter, like:
 
 ```erb
 <%= filter_form_for @q do |f| %>
@@ -72,7 +69,6 @@ And also you can customize your filter, like:
 <% 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,36 +1,34 @@
 require 'filter_form/inputs/base'
 
 require 'filter_form/inputs/select/base'
-require 'filter_form/inputs/select/belongs_to_eq'
+require 'filter_form/inputs/select/belongs_to'
 
 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'
+require 'filter_form/inputs/string/date'
 
 module FilterForm
   class InputBuilder
     include ActiveModel::Model
 
-    attr_accessor :attribute_name, :object, :options
+    attr_accessor :attribute_name, :object, :custom_predicate, :custom_type
 
     def build
-      "FilterForm::Inputs::#{ input_type.camelize }".constantize.new attribute_name: attribute_name,
-                                                                     object:         object,
-                                                                     predicate:      options[:predicate]
+      input_class.new(attribute_name: attribute_name, object: object, predicate: predicate)
     end
 
   private
 
-    def input_type
-      if options[:as]
-        "#{ options[:as] }/base"
-      else
-        "#{ type }_#{ predicate }"
-      end
+    def input_class
+      result = "FilterForm::Inputs::#{ "#{ type }".camelize }".constantize
+      raise NameError if result.class == Module
+      result
+    rescue NameError
+      "FilterForm::Inputs::#{ "#{ type }/base".camelize }".constantize
     end
 
     def predicate
+      return custom_predicate if custom_predicate
+
       case attribute_type
       when :string
         :cont
@@ -40,11 +38,11 @@ module FilterForm
     end
 
     def type
+      return custom_type if custom_type
+
       case attribute_type
-      when :string
-        'string/string'
-      when :integer
-        'string/integer'
+      when :string, :integer
+        :string
       when :datetime, :date
         'string/date'
       when :belongs_to

data/lib/filter_form/inputs/base.rb

@@ -15,17 +15,13 @@ module FilterForm
     private
 
       def input_name
-        "q[#{ attribute_name }_#{ predicate_name }]"
+        "q[#{ attribute_name }_#{ predicate }]"
       end
 
       def input_value
         object_condition.values.first.value if object_condition
       end
 
-      def predicate_name
-        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

data/lib/filter_form/inputs/select/{belongs_to_eq.rb → belongs_to.rb}

@@ -1,7 +1,7 @@
 module FilterForm
   module Inputs
     module Select
-      class BelongsToEq < FilterForm::Inputs::Select::Base
+      class BelongsTo < FilterForm::Inputs::Select::Base
         private
 
         def object_condition

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

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

data/lib/filter_form/simple_form/form_builder.rb

@@ -3,9 +3,12 @@ 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, options: options, object: object).build
+      input_builder = FilterForm::InputBuilder.new attribute_name:   attribute_name,
+                                                   object:           object,
+                                                   custom_type:      options[:as],
+                                                   custom_predicate: options[:predicate]
 
-      options.reverse_merge!(filter_form_input.options)
+      options.reverse_merge!(input_builder.build.options)
 
       input(attribute_name, options, &block)
     end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -98,11 +98,9 @@ files:
 - lib/filter_form/input_builder.rb
 - lib/filter_form/inputs/base.rb
 - lib/filter_form/inputs/select/base.rb
-- lib/filter_form/inputs/select/belongs_to_eq.rb
+- lib/filter_form/inputs/select/belongs_to.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/inputs/string/date.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/string/integer_eq.rb

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

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

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