filter_form 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9adbbae8d73480ce1fce2c02e2f3167c0e677291
-  data.tar.gz: 5e95a42a620c695cf4b5f91899383f9db2e2e760
+  metadata.gz: c02fef85ca43118d8a79912116762f34a4697403
+  data.tar.gz: 2a74e4951bfd18c05ae5dab2db0a1e71d0aa3cc1
 SHA512:
-  metadata.gz: b37bcbbd277860589cf14bbf230ff745405ad1bd513281bf9d44fe852b4d33e1f088a7767318867a8acf0b2ad7629eded4bfc9a93eb5daae75752c99cd9eefbe
-  data.tar.gz: 33c0fdf413e10311e28f5b563d2a5373b59cfcce48f6710a425eb05cb59cc373aaeda992d4b3b4c8045474c62bbeab6abc658ba1fdb642a457638644ab4cf9e8
+  metadata.gz: af4895be95fc2d9eb690bc131a8b0f6760e0438be83cc7f0bf47572233e3eb7e97f1b2d81cae375e94cf6debfb9f3f05120d43ec7b1c8e245681c5345f488dff
+  data.tar.gz: 52367df473468f29dbcd3fb121100a42e54ece4d99d7028c780efbd7bd5b6f85459a45c678748ee4b0664d5b5d00c0068f034e1575e767a4092ff08fa7d33918

data/lib/filter_form/input_options/base.rb

@@ -51,7 +51,15 @@ module FilterForm
       end
 
       def human_attribute_name
-        object.klass.human_attribute_name(attribute_name)
+        if association
+          association.class_name.constantize.model_name.human
+        else
+          object.klass.human_attribute_name(attribute_name)
+        end
+      end
+
+      def association
+        object.klass.reflections[attribute_name]
       end
 
       def current_predicate

data/lib/filter_form/input_options/shared/with_associations.rb

@@ -11,10 +11,6 @@ module FilterForm
             object.klass.uniq.pluck(attribute_name)
           end
         end
-
-        def association
-          object.klass.reflections[attribute_name]
-        end
       end
     end
   end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form