effective_resources 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e36a25d824db2b9794dd755ee4311385e59e0061448ce72f6e018c37ae2dc09
-  data.tar.gz: a9ac9af3756f705d50a545810e22e5179f2febdd9754fbbdf2e0b825e12bc149
+  metadata.gz: 81e95260653fd5965100cb1472f50ed8d5132c1fb37574b8f726c62fbb6b7788
+  data.tar.gz: 8a17f54272e74b3ffdeb7ecd14651d6506cb1f4051e15c30429064ca7df02ee9
 SHA512:
-  metadata.gz: 6acf08c36bf3ce4c15c225a1605594d1d2e6b19c20c3cb199bb13e9f312ce8a0edaff5c8665811c71491802c5a53cee2f6dab383e92de4485a8217c9eb4f9004
-  data.tar.gz: b94c04b3a8e3512af8f3f554091b604f2317511e9575900d3c8fc541a56b16729f620e02a5ad60b8b3b598a1bee4cdd9a2fb94d7597e4330af87ec10503b4dc4
+  metadata.gz: 2fd66ded174e4688bd8a432da093828e7f58444269b3ac40a9fb44cd545792137f6942a57d5cfa8190f04e375979ffe345e3800e90b9218e3121a7084b41626d
+  data.tar.gz: d9af4ef456b4de382ff1e947f432e2aa676dc56dfa0ec418735051b9b1bbcffe89c27c82d0613324c79a3829dccecca68720ef2e8052257205954bd6f6d021a2

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/concerns/acts_as_wizard.rb

@@ -57,6 +57,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def all_steps
+      wizard_step_keys
+    end
+
     def completed_steps
       wizard_steps.keys
     end
@@ -89,7 +93,7 @@ module ActsAsWizard
     # For use in the summary partials. Does not include summary.
     def render_steps
       blacklist = [:start, :billing, :checkout, :submitted, :summary]
-      (required_steps + completed_steps - blacklist).select { |step| has_completed_step?(step) }
+      ((required_steps | completed_steps) - blacklist).select { |step| has_completed_step?(step) }
     end
 
     def wizard_step_title(step)

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.3'.freeze
+  VERSION = '2.7.5'.freeze
 end

metadata

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