filter_form 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a7c1d58fb2ba9912bb9c2c660473c86ccef6b15
-  data.tar.gz: 3eb6fb9a2b37a54faf157db67bc20ebaeb8dbad8
+  metadata.gz: 4ba17c92cfab5acf0f06e3b806295e51792f71cf
+  data.tar.gz: 0e5b396897ede23f430c1d889a342453621fac43
 SHA512:
-  metadata.gz: eefd55897f30e589ec381a3adc540f3a866c9e38b6bed0a1313e35e746533fe736905ff20da89a99caf4b7bb766d13065f97f4daa963a360869a66885685872e
-  data.tar.gz: 075413fb4d0ba0084573ca482b628fb00a7ffeb394374610f0bf6f3ec12a682079de7a63dcd7ee578faf61c9d655fdfbe563f350541896f9ba6fefabd7817e59
+  metadata.gz: 753b1d457e8548713aea1914312a384473e200d4d434e3b1b622ef1de9750f883607256ba8e89b12db35203e4485d0903da625140d54119a9fefb18804d306b0
+  data.tar.gz: b58d8c0548ab36ae2941af0d8f90a3f97648ce2f4c7e091bff7bd375d571b9d28694d9b2340262552b2f9305709c3342a0f1001c304246530d45392de48cdcb7

data/README.md

@@ -33,20 +33,38 @@ In your view file:
 
 ```erb
 <%= filter_form_for @q do |f| %>
-  <%= f.filter_input :name %>
-  <%= f.filter_input :age %>
-  <%= f.filter_input :city %>
-  <%= f.filter_input :birthday %>
+  <%= f.filter_input :name      # string     %>
+  <%= f.filter_input :age       # integer    %>
+  <%= f.filter_input :city      # belongs_to %>
+  <%= f.filter_input :birthday  # date       %>
+  <%= f.filter_input :amount    # money      %>
   <%= f.button :submit %>
 <% end %>
 ```
 
-* 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`.
+### Available types
 
-To use datepicker add to your application.js file:
+     Mapping         | Database Column Type                            | Default predicate     | Generated HTML Element    |
+     --------------- |:------------------------------------------------|:----------------------|:--------------------------|
+     `string`        | `string`                                        | `cont`                | `input[type=text]`        |
+     `integer`       | `integer`                                       | `eq`                  | `input[type=text]`        |
+     `datetime`      | `datetime`                                      | `eq`                  | `input[type=text]`        |
+     `date`          | `date`                                          | `eq`                  | `input[type=text]`        |
+     `belongs_to`    | `belongs_to` association                        | `eq`                  | `select`                  |
+     `money`         | `money` [monetized](https://github.com/RubyMoney/money-rails) attribute | `eq` | `input[type=text]` |
+
+### Customization
+
+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: :eq %>
+  <%= f.button :submit %>
+<% end %>
+```
+
+If you want to use jQuery [datepicker](http://jqueryui.com/datepicker/) for `date` and `datetime` automatically, just add to your application.js file:
 
 ```js
 //= require jquery
@@ -60,14 +78,7 @@ And application.css:
 *= require jquery.ui.datepicker
 ```
 
-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: :eq %>
-  <%= f.button :submit %>
-<% end %>
-```
+### Other sources
 
 For more information about predicates visit [ransack](https://github.com/ernie/ransack).
 

data/lib/filter_form/input_builder.rb

@@ -5,6 +5,7 @@ require 'filter_form/inputs/select/belongs_to'
 
 require 'filter_form/inputs/string/base'
 require 'filter_form/inputs/string/date'
+require 'filter_form/inputs/string/money'
 
 module FilterForm
   class InputBuilder
@@ -38,15 +39,21 @@ module FilterForm
     end
 
     def type
-      return custom_type if custom_type
+      custom_type ? map_type(custom_type) : map_type(attribute_type)
+    end
 
-      case attribute_type
-      when :string, :integer
-        :string
+    def map_type(_type)
+      case _type
+      when :integer
+        'string/base'
       when :datetime, :date
         'string/date'
+      when :money
+        'string/money'
       when :belongs_to
         'select/belongs_to'
+      else
+        _type
       end
     end
 
@@ -54,9 +61,15 @@ module FilterForm
       object.klass.reflections[attribute_name] && object.klass.reflections[attribute_name].belongs_to?
     end
 
+    def money?
+      object.klass.columns_hash["#{ attribute_name }_cents"].present?
+    end
+
     def attribute_type
       if association_belongs_to?
         :belongs_to
+      elsif money?
+        :money
       else
         object.klass.columns_hash[attribute_name.to_s].type
       end

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

@@ -0,0 +1,19 @@
+module FilterForm
+  module Inputs
+    module String
+      class Money < FilterForm::Inputs::String::Base
+        private
+
+        def input_value
+          if object_condition
+            object_condition.values.first.value.to_f / 100
+          end
+        end
+
+        def object_condition
+          object.base.conditions.select { |c| c.a.first.name == "#{ attribute_name }_cents" }.first
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/ransack/search.rb

@@ -0,0 +1,27 @@
+module Ransack
+  class Search
+    def initialize(object, params = {}, options = {})
+      (params ||= {}).delete_if { |k, v| v.blank? && v != false }
+      convert_money_param_name_and_value!(object, params)
+      @context = Context.for(object, options)
+      @context.auth_object = options[:auth_object]
+      @base = Nodes::Grouping.new(@context, 'and')
+      build(params.with_indifferent_access)
+    end
+
+  private
+
+    def convert_money_param_name_and_value!(object, params)
+      money_attribute_name = object.column_names.select { |c| c.end_with?('_cents') }.first
+
+      if money_attribute_name
+        money_attribute_name = money_attribute_name.dup.gsub('_cents', '')
+        money_param_name = params.keys.select { |c| c.start_with?(money_attribute_name) }.first
+
+        if money_param_name
+          params[money_param_name.gsub(money_attribute_name, "#{ money_attribute_name }_cents")] = params.delete(money_param_name).to_f * 100
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/version.rb

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

data/lib/filter_form.rb

@@ -1,6 +1,7 @@
 require 'filter_form/version'
 require 'filter_form/form_helper'
 require 'filter_form/simple_form/form_builder'
+require 'filter_form/ransack/search'
 
 module FilterForm
   class Engine < ::Rails::Engine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Evgeny Li
@@ -101,6 +101,8 @@ files:
 - lib/filter_form/inputs/select/belongs_to.rb
 - lib/filter_form/inputs/string/base.rb
 - lib/filter_form/inputs/string/date.rb
+- lib/filter_form/inputs/string/money.rb
+- lib/filter_form/ransack/search.rb
 - lib/filter_form/simple_form/form_builder.rb
 - lib/filter_form/version.rb
 homepage: https://github.com/exAspArk/filter_form