filter_form 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78fdf1d68e74091137048d29a94868cdfbddc346
-  data.tar.gz: 550744655f66c00cd600d498516f048144535dfa
+  metadata.gz: 6189d3b110196894801cee283b727c4dc3018086
+  data.tar.gz: af46f72476125da17a24b32f887d6cba28ff58d2
 SHA512:
-  metadata.gz: c91ac9e4cadbebc9a360b63ad1f85437a2910ffe8b830f5842444b6968e40badcba0f44edac83b4eef8e52f78eb11181b4d7a22196ed60eb9b326235387248ea
-  data.tar.gz: 68025c40f3714c55947b4e20c553293fbb0173e0bd602a51d58f4dc2d2aafa432dc4f91ace31f7335ce4ab4e5862facdd215c38cb2ccd131adaf63efe3fcfe54
+  metadata.gz: 17c3223cc02252a317a0a6ad186ef4c28a938141abbad1ffa94292fd790df2d4b0aa2395dfb73d9ae4abad771ae3d4953ace647269d6750eb2435ffde8b07838
+  data.tar.gz: 56fbb4db9539de5d13bc1882a32295e8f1363f95e88fea3c87745d230b130d085fe653bf95ecaac8a2824fc43cbc3aa34834c0267cc40863bf9918c689d4ecf1

data/README.md

@@ -82,6 +82,17 @@ You can show predicate selector:
 <% end %>
 ```
 
+#### Money
+
+To filter by monetized attribute please add your controller:
+
+```erb
+class ApplicationController < ActionController::Base
+  include FilterForm::MoneyConverter
+  ...
+end
+```
+
 #### Select2
 
 You can wrap your select in `select2`:

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

@@ -10,6 +10,10 @@ module FilterForm
           end
         end
 
+        def input_name
+          "q[#{ attribute_name }_#{ predicate }]"
+        end
+
         def input_attribute_name
           "#{ attribute_name }_cents"
         end

data/lib/filter_form/money_converter.rb

@@ -0,0 +1,28 @@
+module FilterForm
+  module MoneyConverter
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :convert_money_param_name_and_value, only: :index
+    end
+
+    private
+
+    def convert_money_param_name_and_value
+      money_column_name = resource_class.column_names.select { |c| c.end_with?('_cents') }.first
+
+      if money_column_name && params[:q]
+        money_attribute_name = money_column_name.dup.gsub('_cents', '')
+        money_param_name = params[:q].keys.select { |c| c.start_with?(money_attribute_name) }.first
+
+        if money_param_name
+          params[:q][money_param_name.gsub(money_attribute_name, "#{ money_attribute_name }_cents")] = params[:q].delete(money_param_name).to_f * 100
+        end
+      end
+    end
+
+    def resource_class
+      self.class.name.split('::').last.gsub('Controller', '').singularize.constantize
+    end
+  end
+end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/filter_form.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -120,7 +120,7 @@ files:
 - lib/filter_form/input_options/string/base.rb
 - lib/filter_form/input_options/string/date.rb
 - lib/filter_form/input_options_builder.rb
-- lib/filter_form/ransack/search.rb
+- lib/filter_form/money_converter.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/ransack/search.rb

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