effective_resources 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c4f700e19057fb28260220750481c0e31de2b9800b3620b4ec480deaf15814c
-  data.tar.gz: 2004bea3ba5a18301aef5fa315c35b6f3c3421559f9263734ca04c0e73587f0b
+  metadata.gz: 97764ee0170d441cf4e7c5f1c19dfd934725a44ef8989a62c3ea0489c964f9f5
+  data.tar.gz: b0ad99c6f0ec0ed3646749acba55682d6598dc03ab6fad18afaa7b86a992f97f
 SHA512:
-  metadata.gz: 1fa70e959c9286c9334765cce3f4070adcfbda17a749ae664c121819482fb22c14451dfa82a192979e74f166c2261e21e77e755e7ba1d4aa93b67f612a2022a7
-  data.tar.gz: 747e552fc23f61ff06467ab36cec1f67a8cb92e46859c3a7271036d7a6be0e8aa51dc1a4a30871c1ad62122841cd2ebdf84009eff1a1ab8f1246f228d2eda330
+  metadata.gz: 7f9cb800b96d5e537f9ed9a015daa19f0a12626855d1f68aad9c845befbb2fc4ad8bbcaacac5ebbed4c384a3b603ee359308a423b3ff27080a0fcf4dc17180d1
+  data.tar.gz: fa827846f103b4c1113e74670898d79e586cb4c624d58ee0339c28c023456a2be3a3fe5554d47769d6f483b1ad4fbe4b2f6a009b3e097e8c1efaa1ae3ec1af9a

data/app/models/effective/attribute.rb

@@ -60,6 +60,7 @@ module Effective
         when :effective_addresses         ; :effective_addresses
         when :effective_obfuscation       ; :effective_obfuscation
         when :effective_roles             ; :effective_roles
+        when :active_storage              ; :active_storage
         else
           raise "unsupported type for #{obj}"
         end
@@ -137,6 +138,8 @@ module Effective
             value.to_s
           end
         end
+      when :active_storage
+        value.to_s
       else
         raise "unsupported type #{type}"
       end

data/app/models/effective/resources/associations.rb

@@ -43,6 +43,11 @@ module Effective
         klass.reflect_on_all_associations(:has_and_belongs_to_many)
       end
 
+      def active_storages
+        return [] unless klass.respond_to?(:reflect_on_all_associations)
+        klass.reflect_on_all_associations.select { |ass| ass.class_name == 'ActiveStorage::Attachment' }
+      end
+
       def active_storage_has_manys
         return [] unless klass.respond_to?(:reflect_on_all_associations)
         klass.reflect_on_all_associations(:has_many).select { |ass| ass.class_name == 'ActiveStorage::Attachment' }
@@ -118,6 +123,11 @@ module Effective
         Effective::Address.where(category: category).where(addressable_type: class_name)
       end
 
+      def active_storage(name)
+        name = name.to_sym
+        active_storages.find { |ass| ass.name.to_s.gsub(/_attachment(s?)\z/, '').to_sym == name }
+      end
+
       def nested_resource(name)
         name = name.to_sym
         nested_resources.find { |ass| ass.name == name }

data/app/models/effective/resources/relation.rb

@@ -40,6 +40,9 @@ module Effective
           relation
             .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction, limit: limit))
             .order(Arel.sql("#{sql_column(klass.primary_key)} #{sql_direction}"))
+        when :active_storage
+          relation.send("with_attached_#{name}").references("#{name}_attachment")
+            .order(Arel.sql("active_storage_blobs.filename #{sql_direction}"))
         when :effective_roles
           relation.order(Arel.sql("#{sql_column(:roles_mask)} #{sql_direction}"))
         when :string, :text
@@ -101,6 +104,9 @@ module Effective
           relation.where("#{sql_column} = ?", (value == term ? 0 : term))
         when :effective_roles
           relation.with_role(term)
+        when :active_storage
+          relation.send("with_attached_#{name}").references("#{name}_attachment")
+            .where(ActiveStorage::Blob.arel_table[:filename].matches("%#{term}%"))
         when :boolean
           relation.where("#{sql_column} = ?", term)
         when :datetime, :date

data/app/models/effective/resources/sql.rb

@@ -52,6 +52,8 @@ module Effective
           :belongs_to_polymorphic
         elsif has_and_belongs_to_many(name)
           :has_and_belongs_to_many
+        elsif active_storage(name)
+          :active_storage
         elsif name == 'id' && defined?(EffectiveObfuscation) && klass.respond_to?(:deobfuscate)
           :effective_obfuscation
         elsif name == 'roles' && defined?(EffectiveRoles) && klass.respond_to?(:with_role)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.4.6'.freeze
+  VERSION = '1.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails