filter_form 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba51d29e8704d894da94e7f88229feef17ed3bfc
-  data.tar.gz: ddae4ac17d72019aaf3834b262dfbec3ac51c79e
+  metadata.gz: 99ecd45deccc48a229e6d8faff117fb5a87b22f4
+  data.tar.gz: 9f70f5ff1d832d6c5169e8a639e1250550ccf397
 SHA512:
-  metadata.gz: 46f3b727047056bca25cfe8aac65e956e0d5075bdcda74ea17c895d3004e216e976837518d15835028ffc2eeb9109127f768ac84782ec9da9362778386cf10d3
-  data.tar.gz: 93b278eb9cf40452f63cd08ca810ef9ec71ea656f414b25f33e659cf49f444edfc487f8b9e32542105e48271bb17bef3c02a77fef792602584be11f0909ec0c8
+  metadata.gz: 115cdd02a42840913def1a8f18dd274678cd7bef569b6a85b2d41ee2b93cbd686e30d773cfc71e78857e5ae1bb2eb98313ce5a0ac677771fac9b8c1a74368b88
+  data.tar.gz: f15b1c850a2d4e467d77546ce5b9ddd14d969959b37d4aa8d7ac158894db7c05fe136f0dfc517a3432a5cb7223363d7bd96069359dee811e5129c0f078c41063

data/lib/filter_form/input_options/base.rb

@@ -52,7 +52,7 @@ module FilterForm
       end
 
       def input_name
-        "q[#{ attribute_name }_#{ predicate }]"
+        "q[#{ input_attribute_name }_#{ predicate }]"
       end
 
       def input_value
@@ -60,7 +60,14 @@ module FilterForm
       end
 
       def object_condition
-        object.base.conditions.select { |c| c.a.first.name == attribute_name.to_s }.first
+        object.base.conditions.select do |condition|
+          condition.a.first.name == input_attribute_name.to_s &&
+          condition.predicate.name == predicate.to_s
+        end.first
+      end
+
+      def input_attribute_name
+        attribute_name
       end
     end
   end

data/lib/filter_form/input_options/select/belongs_to.rb

@@ -4,19 +4,11 @@ module FilterForm
       class BelongsTo < FilterForm::InputOptions::Select::Base
         private
 
-        def object_condition
-          object.base.conditions.select { |c| c.a.first.name == custom_attribute_name }.first
-        end
-
         def collection
           options[:collection] || attribute_name.to_s.camelize.constantize.all
         end
 
-        def input_name
-          "q[#{ custom_attribute_name }_#{ predicate }]"
-        end
-
-        def custom_attribute_name
+        def input_attribute_name
           "#{ attribute_name }_id"
         end
       end

data/lib/filter_form/input_options/select/collection.rb

@@ -4,19 +4,11 @@ module FilterForm
       class Collection < FilterForm::InputOptions::Select::Base
         private
 
-        def object_condition
-          object.base.conditions.select { |c| c.a.first.name == custom_attribute_name }.first
-        end
-
         def collection
           options[:collection] || attribute_name.to_s.camelize.singularize.constantize.all
         end
 
-        def input_name
-          "q[#{ custom_attribute_name }_#{ predicate }]"
-        end
-
-        def custom_attribute_name
+        def input_attribute_name
           "#{ attribute_name }_id"
         end
       end

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

@@ -10,8 +10,8 @@ module FilterForm
           end
         end
 
-        def object_condition
-          object.base.conditions.select { |c| c.a.first.name == "#{ attribute_name }_cents" }.first
+        def input_attribute_name
+          "#{ attribute_name }_cents"
         end
       end
     end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form