filter_form 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b926b0a351c9f2123caa31f855bd694e1d576cf5
-  data.tar.gz: 9df2378898485ab118798cdb0ada280ae3cb801e
+  metadata.gz: 0bdd28148acf26ef60072eae5ad45e275b4c2299
+  data.tar.gz: 3ba9fe6625752961a0dfd497c9e3d70474d44e34
 SHA512:
-  metadata.gz: c0cc369611f6e9eb2e402381e982218d3aac29d647edf7bb9fc3630aa87931d874bd944dd89ec95c090f9fec91278c2b4e28d4aefbb5f67ffae3d11a69b69491
-  data.tar.gz: 75d3adf19bb9f28bd17c77c217a73a22a210ccb4fb43c9a60f2a54318519164b27c6075378cd7afe9bb77e0d310663cdfb6dba99920f9776b103460301675919
+  metadata.gz: be205121e2fb7611e75a85bedfdfb216870fd7c733cb42621a8a9d624d5be7c1a818a529f371c04aeb6c02cc5640fbda692c59841920024d747e47ee8c304b48
+  data.tar.gz: 451d19c190406e4f9ef48ede4ed448ca8b41e6caea2795d05195cc8857e8432199438cf8fd389701a2303a2b7ecbbb4dcaffdd460efec6c0f83a70eeaa11e88e

data/lib/filter_form/input_options/base.rb

@@ -2,6 +2,7 @@ module FilterForm
   module InputOptions
     class Base
       DEFAULT_PREDICATE = nil
+      PREDICATE_IN = :in
 
       attr_accessor :attribute_name, :object, :custom_predicate, :options
 
@@ -84,8 +85,14 @@ module FilterForm
         nil
       end
 
+      def multiple?
+        options[:input_html].try(:[], :multiple)
+      end
+
       def input_name
-        "q[#{ input_attribute_name }_#{ predicate }]"
+        result = "q[#{ input_attribute_name }_#{ predicate }]"
+        result << "[]" if multiple?
+        result
       end
 
       def input_value
@@ -106,8 +113,12 @@ module FilterForm
         attribute_name
       end
 
+      def default_predicate
+        multiple? ? PREDICATE_IN : self.class::DEFAULT_PREDICATE
+      end
+
       def predicate
-        custom_predicate || self.class::DEFAULT_PREDICATE
+        custom_predicate || default_predicate
       end
     end
   end

data/lib/filter_form/input_options/checkbox/base.rb

@@ -4,10 +4,12 @@ module FilterForm
       class Base < FilterForm::InputOptions::Base
         include FilterForm::InputOptions::Shared::WithAssociations
 
-        DEFAULT_PREDICATE = :in
-
         private
 
+        def default_predicate
+          PREDICATE_IN
+        end
+
         def additional_options
           {
             as: :check_boxes,

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

@@ -11,7 +11,9 @@ module FilterForm
         end
 
         def input_name
-          "q[#{ attribute_name }_#{ predicate }]"
+          result = "q[#{ attribute_name }_#{ predicate }]"
+          result << "[]" if multiple?
+          result
         end
 
         def input_attribute_name

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/spec/fixtures/locale.yml

@@ -10,3 +10,4 @@ ransack:
     'true': "IS TRUE"
     cont: "CONTAINS"
     eq: "EQUALS"
+    in: "IN"

data/spec/models/input_options_builder_spec.rb

@@ -22,15 +22,20 @@ describe FilterForm::InputOptionsBuilder do
   end
 
   context 'string' do
-    before do
-      builder.attribute_name = :name
-    end
-
     context 'default predicate' do
       it 'returns correct options with predicate "cont"' do
-        result  = builder.build
-        options = { as: :string, required: false, label: 'NAME CONTAINS', input_html: { name: 'q[name_cont]' } }
-        expect(result).to eq(options)
+        builder.attribute_name = :name
+
+        expect(builder.build).to eq({ as: :string, required: false, label: 'NAME CONTAINS', input_html: { name: 'q[name_cont]' } })
+      end
+    end
+
+    context "multiple" do
+      it "returns attribute name as array with default predicate 'in'" do
+        builder.attribute_name = :name
+        result = builder.build(input_html: { multiple: true })
+
+        expect(result).to eq({ as: :string, required: false, label: "NAME IN", input_html: { name: "q[name_in][]", multiple: true } })
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form