effective_resources 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddbc305a4fe6da53cc0d4a6bdb95a6bcde56fd64f9c2ce714bec57e850eb4936
-  data.tar.gz: cdc5008daa38b79bfb3a7e3f64e13c81123b6587c62ca4f803144ea07438eb92
+  metadata.gz: 0cce14845f98efb81d2fdd1ccf09e35827051f0eac750d9d8e379890d4b40ed3
+  data.tar.gz: 2e14c5298dd079ec455752023da6f7bc7202addeadb54e5629d01f1091e94ea7
 SHA512:
-  metadata.gz: '0498afe80ac145df61098606e5b245e5b33ac901a70774d6a51601bfc1cfc1ec9c359c4e0805d6d8c7c5e7fa1b4d8b89904e99137764f0503f4b899b85f78065'
-  data.tar.gz: e8361d0eed8f876bda4565c4d0c250607e447e59f6f7ce196283c44148adcfa863492aac59b92fc8b0b13cdeb521edc2a88f60417ca981b4eaf47ca0b0350221
+  metadata.gz: fe89a50199d6e6fa1d1d895b8d07fa7a7a767ea90b14f194ff7fb7002906ea86bd924ac8f7efdb8681fc036210f93a53beb809b9012fb3db16c20cd4458c7a0d
+  data.tar.gz: e1d8b4cbd15ccc3cf94bed31afceb31ac2b88bb58d53c40833b333bb4687abb2f1acb1772b1d0a1bd47aae4781255c17011bbf2320e8527abb0ab7ca60bc50cc

data/app/controllers/concerns/effective/wizard_controller/save.rb

@@ -25,7 +25,7 @@ module Effective
             redirect_to_finish_wizard(options, params)
           end
         else
-          flash.now[:danger] = options.delete(:error) || resource_flash(:danger, resource, action)
+          flash.now[:danger] ||= options.delete(:error) || resource_flash(:danger, resource, action)
           render_step(wizard_value(step), options)
         end
       end

data/app/models/concerns/acts_as_statused.rb

@@ -76,6 +76,9 @@ module ActsAsStatused
       # was_approved?
       define_method("was_#{sym}?") { send(sym_at).present? }
 
+      # just_approved?
+      define_method("just_#{sym}?") { status == sym.to_s && status_was != sym.to_s }
+
       # approved_at
       define_method(sym_at) { self[sym_at.to_s] || status_steps[sym_at] }
 

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

@@ -29,6 +29,10 @@ module Effective
         end
       end
 
+      def belong_tos_names_attributes
+        belong_tos.inject({}) { |h, ass| h[ass.name] = [:belongs_to]; h }
+      end
+
       def has_manys_attributes
         has_manys_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
       end
@@ -82,6 +86,7 @@ module Effective
       end
 
       # All table attributes. includes primary_key and belongs_tos
+      # THINK THIS IS DEPRECATED
       def table_attributes
         attributes = (klass.new().attributes rescue nil)
         return {} unless attributes
@@ -123,6 +128,14 @@ module Effective
         sort ? sort_by_model_attributes(attributes) : attributes
       end
 
+      # Similar to klass_attributes
+      # Used by table_builder
+      def resource_attributes
+        belong_tos_names_attributes
+          .merge(klass_attributes(sort: true))
+          .merge(effective_addresses_attributes)
+      end
+
       private
 
       def sort_by_model_attributes(attributes)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.4'.freeze
+  VERSION = '2.7.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails