forest_liana 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc72eb0fcc694931601a282824f6f4c7e432b69f
-  data.tar.gz: '0987ebcd9a2beee925d5b7c90415c94990344272'
+  metadata.gz: de10763045c82434dff0ca9e3b726912e605af44
+  data.tar.gz: 5ce6e09419a82dff4aa23e9c0b3d09ce63b2b291
 SHA512:
-  metadata.gz: e931cf78c871f82f8d8c4d55cf6072d277439a2ce314b72227f7797c8d6547b5b1be9410e4a6339b752255649f8f4108ddfcb2a6a95c0efeb994abd9f97801df
-  data.tar.gz: c0946b6177884359919755a863062e68950102dcb0a965564344bd3c6aafe622f82c15a0282ae80986c86ed1e0cbf555ac149527b7a8b49f482ac3a827cbcce4
+  metadata.gz: '08fca8e9e29f59e6d4369330728666b9edbb50d660948e03079b49cd4f24c99ff78f5f6414d902eabfcd84bfb22801aed6e58ef6b7f4323113bc6eda5af9c55e'
+  data.tar.gz: 60b985aac82b62b3774cfddb34029863089bee88256f9778efd3af1670a33ff69cd786078c0a3cbea5a6fa201d84f00112482daa63bd3850976ba65ac6e05adb

data/app/controllers/forest_liana/application_controller.rb

@@ -123,7 +123,13 @@ module ForestLiana
 
     def fields_per_model(params_fields, model)
       if params_fields
-        params_fields.to_hash.inject({}) do |fields, param_field|
+        if Rails::VERSION::MAJOR > 4
+          params_fields_hash = params_fields.to_unsafe_h
+        else
+          params_fields_hash = params_fields.to_hash
+        end
+
+        params_fields_hash.inject({}) do |fields, param_field|
           relation_name = param_field[0]
           relation_fields = param_field[1]
 

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -186,8 +186,7 @@ module ForestLiana
     end
 
     def has_acts_as_taggable?
-      @resource.respond_to?(:acts_as_taggable) &&
-        @resource.acts_as_taggable.respond_to?(:to_a)
+      @resource.taggable?
     end
 
     def has_devise?

data/app/serializers/forest_liana/serializer_factory.rb

@@ -194,7 +194,7 @@ module ForestLiana
         end
 
         # NOTICE: Format ActsAsTaggable attribute
-        if active_record_class.respond_to?(:acts_as_taggable) &&
+        if active_record_class.taggable? && active_record_class.respond_to?(:acts_as_taggable) &&
           active_record_class.acts_as_taggable.respond_to?(:to_a)
           active_record_class.acts_as_taggable.to_a.each do |key, value|
             serializer.attribute(key) do |x|

data/app/services/forest_liana/schema_adapter.rb

@@ -9,8 +9,8 @@ module ForestLiana
       add_associations
 
       # NOTICE: Add ActsAsTaggable fields
-      if @model.respond_to?(:acts_as_taggable) &&
-        @model.acts_as_taggable.respond_to?(:to_a) &&
+      if @model.taggable? && @model.respond_to?(:acts_as_taggable) &&
+        @model.acts_as_taggable.respond_to?(:to_a)
         @model.acts_as_taggable.to_a.each do |key, value|
           field = collection.fields.find { |x| x[:field] == key.to_s }
 

data/app/services/forest_liana/search_query_builder.rb

@@ -74,7 +74,7 @@ module ForestLiana
         end
 
         # ActsAsTaggable
-        if @resource.respond_to?(:acts_as_taggable)
+        if @resource.taggable? && @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)
@@ -189,7 +189,7 @@ module ForestLiana
     end
 
     def acts_as_taggable?(field)
-      @resource.respond_to?(:acts_as_taggable) &&
+      @resource.taggable? && @resource.respond_to?(:acts_as_taggable) &&
         @resource.acts_as_taggable.include?(field)
     end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Sandro Munda