filter_form 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ecd45deccc48a229e6d8faff117fb5a87b22f4
-  data.tar.gz: 9f70f5ff1d832d6c5169e8a639e1250550ccf397
+  metadata.gz: 7846d2bebe60316a75904652d6ac5eb2c71ea17b
+  data.tar.gz: 4b0fe390d1905a11a7b7e664c072e2b91e7f08be
 SHA512:
-  metadata.gz: 115cdd02a42840913def1a8f18dd274678cd7bef569b6a85b2d41ee2b93cbd686e30d773cfc71e78857e5ae1bb2eb98313ce5a0ac677771fac9b8c1a74368b88
-  data.tar.gz: f15b1c850a2d4e467d77546ce5b9ddd14d969959b37d4aa8d7ac158894db7c05fe136f0dfc517a3432a5cb7223363d7bd96069359dee811e5129c0f078c41063
+  metadata.gz: 40f9320073c6f929ba9590edb721fa4362b8ed97548b1f23dfe747874cc285cc4a99f8d2d390361fac649b61067b189b9f2aada46009c498a0a4b3a1095fb35e
+  data.tar.gz: 7aa22b8d064a6f030b6caf683671c56aa3274bf42ecba1ff7003a35630453bdf49c9bac69a6ebbe1b2101172ab508d0efe8a0f5a84d6519a58a9bd7572dc1cc1

data/README.md

@@ -58,32 +58,22 @@ In your view file:
 
 ### Customization
 
-#### Assets
-
-If you want to use jQuery [Datepicker](http://jqueryui.com/datepicker/) for `date` and `datetime` automatically or [Select2](http://ivaynberg.github.io/select2/), add to your application.js file:
-
-```js
-//= require jquery
-//= require jquery.ui.datepicker
-//= require select2
+#### Custom predicate
 
-//= require filter_form
+```erb
+<%= filter_form_for @q do |f| %>
+  <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
+  <%= f.button :submit %>
+<% end %>
 ```
 
-And application.css:
-
-```css
-*= require jquery.ui.datepicker
-*= require select2
-
-*= require filter_form
-```
+#### Predicate selector
 
-#### Custom predicate
+You can show predicate selector:
 
 ```erb
 <%= filter_form_for @q do |f| %>
-  <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
+  <%= f.filter_input :id, predicate_selector: [['=', 'eq'], ['>', 'gt'], ['<', 'lt']] %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -99,15 +89,27 @@ You can wrap your select in `select2`:
 <% end %>
 ```
 
-#### Predicate selector
+#### Assets
 
-You can show predicate selector:
+If you want to use predicate selector, jQuery [Datepicker](http://jqueryui.com/datepicker/) for `date` and `datetime` automatically or [Select2](http://ivaynberg.github.io/select2/), add to your application.js file:
 
-```erb
-<%= filter_form_for @q do |f| %>
-  <%= f.filter_input :id, predicate_selector: [['=', 'eq'], ['>', 'gt'], ['<', 'lt']] %>
-  <%= f.button :submit %>
-<% end %>
+```js
+//= require jquery
+//= require jquery.ui.datepicker
+
+//= require select2
+
+//= require filter_form
+```
+
+And application.css:
+
+```css
+*= require jquery.ui.datepicker
+
+*= require select2
+
+*= require filter_form
 ```
 
 ### Other sources

data/lib/filter_form/input_options/base.rb

@@ -60,10 +60,12 @@ module FilterForm
       end
 
       def object_condition
-        object.base.conditions.select do |condition|
-          condition.a.first.name == input_attribute_name.to_s &&
-          condition.predicate.name == predicate.to_s
-        end.first
+        result = object.base.conditions.select { |condition| condition.a.first.name == input_attribute_name.to_s }
+        if result.size > 1
+          result.select { |condition| condition.predicate.name == predicate.to_s }.first
+        else
+          result.first
+        end
       end
 
       def input_attribute_name

data/lib/filter_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Evgeny Li