collate 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56de0dde47539238e5ee06fd1559b31e41721b16
-  data.tar.gz: d7b3f0a61cd26393b3ae3de6b7f8f2f8fe44943c
+  metadata.gz: bd2490c72305c02d1b4673b598db71192258ebf1
+  data.tar.gz: ac8e9482583d628e035304c749afc101cb4221ab
 SHA512:
-  metadata.gz: 2cbd53ab5528c010fbdf73eabf8b8535feef9f019b553bad997a96b2fd3651d76f6b97810382571d7cecdf3d278990648dbe8f13fc160b9af27418c3262e8cd5
-  data.tar.gz: 4e9544f77ec373d563704f0aaec2a28c80723360475a5317e7f41e26c9b30afd3e28820a5f8dd52b7d33b27be3671dcffbf20452a18f8f1cb0c2bff60c4d6740
+  metadata.gz: 7fca90116c85619627ae10df80d8e823cbd7fcba7f27fc972c39a184df17117961fefa372e5a46884fedcee3526f5e6b09995f2bd02b4af9f03b3d9e863c16c8
+  data.tar.gz: bfe21191da02ad18e9dfdcf1ed27c6eb30f5223215274aa9c948f5f4f1852cddb039844bc236fd5269072efda06944a56f8e79b1326b91ee14b8beacf431a3cf

data/lib/collate/active_record_extension.rb

@@ -95,6 +95,30 @@ module Collate
     end
 
     def apply_filter ar_rel, filter, param_value
+      ar_rel, ar_method, query_string, filter_value = if filter.field.is_a?(Array)
+        full_query_strings = []
+        full_filter_values = []
+
+        filter.field.each do |filter_field|
+          ar_rel, ar_method, query_string, filter_value = get_filter_data ar_rel, filter_field, filter, param_value
+
+          full_query_strings << query_string
+          full_filter_values << filter_value
+        end
+
+        [ar_rel, ar_method, full_query_strings.join(' OR '), full_filter_values.flatten]
+      else
+        get_filter_data ar_rel, filter.field.dup, filter, param_value
+      end
+
+      ar_rel = if query_string.include?('?')
+        ar_rel.send(ar_method, query_string, *filter_value)
+      else
+        ar_rel.send(ar_method, query_string)
+      end
+    end
+
+    def get_filter_data ar_rel, filter_field, filter, param_value
       filter_value = if param_value.duplicable?
         param_value.dup
       else
@@ -141,9 +165,7 @@ module Collate
 
       ar_rel = ar_rel.group(filter.grouping) if filter.grouping
 
-      ar_rel = ar_rel.select(filter.field_select) if filter.field_select
-
-      field_query = filter.field
+      field_query = filter_field
 
       filter.field_transformations.each do |ft|
         transformation = ft
@@ -230,15 +252,7 @@ module Collate
       query_string = filter_value.length.times.collect{query_string}.join(' OR ') if filter.or
       query_string = "NOT(#{query_string})" if filter.not
 
-      ar_rel = if query_string.include?('?')
-        if filter.or
-          ar_rel.send(ar_method, query_string, *filter_value)
-        else
-          ar_rel.send(ar_method, query_string, filter_value)
-        end
-      else
-        ar_rel.send(ar_method, query_string)
-      end
+      [ar_rel, ar_method, query_string, filter_value]
     end
 
   end

data/lib/collate/filter.rb

@@ -8,7 +8,7 @@ module Collate
 
     attr_accessor :field, :operator, :base_model_table_name, :field_transformations, :label,
                   :component, :joins, :value_transformations, :grouping, :html_id, :having,
-                  :joins_prefix, :not, :or, :field_select
+                  :joins_prefix, :not, :or
 
     def initialize(field, opt={})
       opt.each do |f, value|
@@ -112,7 +112,7 @@ module Collate
         key += VALUE_TRANSFORMATIONS.index(transformation).to_s
       end
 
-      "{#{key}}#{field}"
+      "{#{key}}#{field.to_s.gsub('[','').gsub(']','')}"
     end
   end
 end

data/lib/collate/version.rb

@@ -1,3 +1,3 @@
 module Collate
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collate
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Nicholas Page
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler