forest_liana 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7e0cdd4e20fd9429e3432ce2b2e7a47c18791f
-  data.tar.gz: 5d24a288485b23ac6d9deb6f395025dd3fb2e4e9
+  metadata.gz: 65bc0a94633ab9554e51ace04fb84e302b2afb0b
+  data.tar.gz: f026a0b61db387f8045b4f50a48ba54288e75b20
 SHA512:
-  metadata.gz: 4345b6f83549d7f2528a58c42ab1b9f4cc88e68701ebc309940c15b51ecc74e9dfd2e67c0406b2994aca9d3d76fe2f08462eb1acc962a385b4e35e769c50d12d
-  data.tar.gz: 20336271af11919fab0c756f0fb32e349e900b7feaa80207f5bb6b2f2802ace847e4449ea6843af2121c843422e411a36b5d4f1f71f110d82bf84594aba2c578
+  metadata.gz: 80fd90903e69868ed3132c6b5a49b9526922ca38a7961b415fcf977db027c03589f3142ed77b39511921aef38061b6928cd774322d7981ac10eb260197ebd739
+  data.tar.gz: c818a6da4a756d1deafbb07caef9299866fea4d72fb85aa20ae49d68017abc5f25d626a6c39970e48e355bb9d150fe628f69caf21a8ce791aa2d6e9bec48149d

data/app/services/forest_liana/search_query_builder.rb

@@ -34,6 +34,16 @@ module ForestLiana
       ForestLiana::AdapterHelper.format_column_name(table_name, column_name)
     end
 
+    def acts_as_taggable_query(tagged_records)
+      ids = tagged_records
+        .map {|t| t[@resource.primary_key]}
+        .join(',')
+
+      if ids.present?
+        return "#{@resource.primary_key} IN (#{ids})"
+      end
+    end
+
     def search_param
       if @params[:search]
         conditions = []
@@ -60,6 +70,15 @@ module ForestLiana
           end
         end
 
+        # ActsAsTaggable
+        if @resource.respond_to?(:acts_as_taggable)
+          @resource.acts_as_taggable.each do |field|
+            tagged_records = @records.tagged_with(@params[:search].downcase)
+            condition = acts_as_taggable_query(tagged_records)
+            conditions << condition if condition
+          end
+        end
+
         SchemaUtils.one_associations(@resource).map(&:name).each do |association|
           if @includes.include? association.to_sym
             resource = @resource.reflect_on_association(association.to_sym)
@@ -84,13 +103,25 @@ module ForestLiana
     def filter_param
       if @params[:filterType] && @params[:filter]
         conditions = []
+
         @params[:filter].each do |field, values|
-          next if association?(field)
+          # ActsAsTaggable
+          if acts_as_taggable?(field)
+            tagged_records = @records.tagged_with(values.tr('*', ''))
+
+            if @params[:filterType] == 'and'
+              @records = tagged_records
+            elsif @params[:filterType] == 'or'
+              conditions << acts_as_taggable_query(tagged_records)
+            end
+          else
+            next if association?(field)
 
-          values.split(',').each do |value|
-            operator, value = OperatorValueParser.parse(value)
-            conditions << OperatorValueParser.get_condition(field, operator,
-              value, @resource, @params[:timezone])
+            values.split(',').each do |value|
+              operator, value = OperatorValueParser.parse(value)
+              conditions << OperatorValueParser.get_condition(field, operator,
+                value, @resource, @params[:timezone])
+            end
           end
         end
 
@@ -113,10 +144,15 @@ module ForestLiana
       [:has_many, :has_and_belongs_to_many].include?(association.try(:macro))
     end
 
+    def acts_as_taggable?(field)
+      @resource.respond_to?(:acts_as_taggable) &&
+        @resource.acts_as_taggable.include?(field)
+    end
+
     def has_many_filter
       if @params[:filter]
         @params[:filter].each do |field, values|
-          next unless has_many_association?(field)
+          next if !has_many_association?(field) || acts_as_taggable?(field)
 
           values.split(',').each do |value|
             if field.include?(':')

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails