effective_resources 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 962a290756ff82a2d328b486f9d381cb7f97568b
-  data.tar.gz: 3059d2ba54c29292b5b704ca2fde4b40feaf3969
+  metadata.gz: 31a59a4d537c8d4f363e2a5bb86758f2d0ad2b01
+  data.tar.gz: 9ce2460bcb27b1afe0d204f9d3528c6e92cbc6a5
 SHA512:
-  metadata.gz: c87bbabac3cc1e732d1e673a0462068ba9b13623c5e4ed3418c5b51443684063ac8217c2e15238136c0d2d7c6c2a132319b16ac9a7e4eec9112269b0a0a36b59
-  data.tar.gz: 4a1cf91f0d0cf9d593658df108f80831f4fee7ff5d30af83a113f4b637dd779879b81add4869525cfed905822db94d666e4067bf56d95837fab5e9cb8d643a20
+  metadata.gz: 33394fcfcde825f6383a5d74a19ae2349ab2d94e7bcff15e9f9ac80fdaa4ae583636b5424982695d3384283eddb538f9ce02df93f06b94a72105ee532badfa59
+  data.tar.gz: 1efe1addab462d093e0e25f52a5d08a90299ff8a48c5402a192fa9acb5317aa5bcd49d8d360365992bc081af3037286a66bea9694b0c5ba0b2cf80a2ae15b015

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

@@ -26,7 +26,7 @@ module Effective
 
       def has_ones
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        klass.reflect_on_all_associations(:has_one)
+        klass.reflect_on_all_associations(:has_one).reject { |ass| ass.class_name.to_s.start_with?('ActiveStorage::') }
       end
 
       def has_ones_ids
@@ -35,7 +35,7 @@ module Effective
 
       def has_manys
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        klass.reflect_on_all_associations(:has_many).reject { |ass| ass.options[:autosave] }
+        klass.reflect_on_all_associations(:has_many).reject { |ass| ass.options[:autosave] || ass.class_name.to_s.start_with?('ActiveStorage::') }
       end
 
       def has_and_belongs_to_manys
@@ -43,6 +43,24 @@ module Effective
         klass.reflect_on_all_associations(:has_and_belongs_to_many)
       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' }
+      end
+
+      def active_storage_has_manys_ids
+        active_storage_has_manys.map { |ass| ass.name.to_s.gsub(/_attachments\z/, '').to_sym }
+      end
+
+      def active_storage_has_ones
+        return [] unless klass.respond_to?(:reflect_on_all_associations)
+        klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActiveStorage::Attachment' }
+      end
+
+      def active_storage_has_ones_ids
+        active_storage_has_ones.map { |ass| ass.name.to_s.gsub(/_attachment\z/, '').to_sym }
+      end
+
       def nested_resources
         return [] unless klass.respond_to?(:reflect_on_all_associations)
         klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] } +

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

@@ -45,6 +45,13 @@ module Effective
         { effective_assets: [:effective_assets] }
       end
 
+      def active_storage_attributes
+        {}.tap do |retval|
+          active_storage_has_ones_ids.each { |k, v| retval[k] = [:string] }
+          active_storage_has_manys_ids.each { |k, v| retval[k] = [:array] }
+        end
+      end
+
       # All will include primary_key, created_at, updated_at and belongs_tos
       # This is the attributes as defined by the effective_resources do .. end block
       # { :name => [:string, { permitted: false }], ... }
@@ -58,6 +65,7 @@ module Effective
             .merge(has_ones_attributes)
             .merge(effective_addresses_attributes)
             .merge(effective_assets_attributes)
+            .merge(active_storage_attributes)
             .merge(atts)
         else  # This is the migrator. This should match table_attributes
           belong_tos_attributes.merge(atts.reject { |_, v| v[0] == :permitted_param })
@@ -81,19 +89,12 @@ module Effective
 
       # Used by effective_crud_controller to generate the permitted params
       def permitted_attributes
-        # id = {klass.primary_key.to_sym => [:integer]}
-        # bts = belong_tos_ids.inject({}) { |h, ass| h[ass] = [:integer]; h }
-        # has_manys = has_manys_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
-        # has_manys.each { |k, _| has_manys[k] = model_attributes[k] if model_attributes.key?(k) }
-        # Does not include nested, as they are added recursively elsewhere
-        # id.merge(bts).merge(model_attributes).merge(has_manys)
-
         model_attributes(all: true)
       end
 
       # All attributes from the klass, sorted as per model attributes block.
       # Does not include :id, :created_at, :updated_at unless all is passed
-      def klass_attributes(all: false)
+      def klass_attributes(all: false, sort: false)
         attributes = (klass.new().attributes rescue nil)
         return [] unless attributes
 
@@ -108,7 +109,7 @@ module Effective
           end; h
         end
 
-        sort_by_model_attributes(attributes)
+        sort ? sort_by_model_attributes(attributes) : attributes
       end
 
       private

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails