effective_resources 2.8.7 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20557b39c6a58e12d87157ccc21b3ce99ac38e2a57e1c3c45b0a07333d45e05
-  data.tar.gz: 2bfc034398f369c999e26f8907c6790d127102d9416b5914e63066b16003d452
+  metadata.gz: 6a38e2952ba5fef52c6aa082b18ef2d9261c32dcd89f629fa548b22b4c5f70b6
+  data.tar.gz: 0aebae2fb3691c17fcc6cbe84d3a153592cd0fd4c49aafdeadcf77d511bd5c30
 SHA512:
-  metadata.gz: d2e218f0580ab6d3a5f7a2f7bfaf5d2d27967f1670628dbb8580d6e4d44717c80904ac4bbb33c15f1da079420e5a3518cfb0a1dc8ce00bd5c58d49396941bf43
-  data.tar.gz: d2e2f6fd1cd3ca5a6de6b6c6e3ed306d10a1615b1b9abdc534d4510fa91612a79eb947ff08cc4746b57162ebc1e5d586adf4dc385a8f773b63878b6d59442235
+  metadata.gz: da673d1b40fbdf5c6ddf6322619c4cf8e1641b3aa28a81395de8080f5220d371a272f9cca5541eae8f8206c5020418d1562f1db3f22117c0513eb9fd2df0bc72
+  data.tar.gz: b0167300f0a180b5f7bb4445aa70750b6a606a38633d9fcb4ba22ea68d5e290602cfc5b659638e4703bed29fb2df8863ce4a94cdc59def680fdeec1acfefdc0f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Code and Effect Inc.
+Copyright 2024 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/helpers/effective_resources_wizard_helper.rb

@@ -42,19 +42,32 @@ module EffectiveResourcesWizardHelper
     end
   end
 
-  def render_wizard_resource(resource, as: nil, path: nil)
+  def render_wizard_resource_step(resource, step, as: nil, path: nil)
+    render_wizard_resource(resource, only: step, as: as, path: path)
+  end
+
+  def render_wizard_resource(resource, only: [], except: [], as: nil, path: nil)
     effective_resource = Effective::Resource.new(resource)
 
+    # Render path
     as ||= effective_resource.name
-    path ||= effective_resource.view_file_path(nil)
+    path ||= effective_resource.wizard_file_path(resource)
     raise('expected a path') unless path.present?
 
     resource.render_path = path.to_s.chomp('/')
 
-    resource.render_steps.map do |partial|
-      resource.render_step = partial
+    # Render steps
+    only = Array(only)
+    except = Array(except)
+
+    steps = resource.render_steps
+    steps = (steps - except) if except.present?
+    steps = (steps & only) if only.present?
+
+    steps.map do |step|
+      resource.render_step = step
 
-      render_if_exists("#{path}/#{partial}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
+      render_if_exists("#{path}/#{step}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
     end.join.html_safe
   end
 

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

@@ -5,8 +5,10 @@ module Effective
     module I18n
       def human_action_name(action)
         if klass.respond_to?(:model_name)
-          value = ::I18n.t("activerecord.actions.#{klass.model_name.i18n_key}.#{action}")
-          return value unless value.start_with?('translation missing:')
+          key = "activerecord.actions.#{klass.model_name.i18n_key}.#{action}"
+
+          value = ::I18n.t(key)
+          return value unless value.include?(key) # missing translation
         end
 
         if crud_actions.include?(action)
@@ -19,8 +21,10 @@ module Effective
 
       def human_action_confirm(action)
         if klass.respond_to?(:model_name)
-          value = ::I18n.t("activerecord.actions.#{klass.model_name.i18n_key}.#{action}_confirm")
-          return value unless value.start_with?('translation missing:')
+          key = "activerecord.actions.#{klass.model_name.i18n_key}.#{action}_confirm"
+
+          value = ::I18n.t(key)
+          return value unless value.include?(key) # missing translation
         end
 
         "Really #{human_action_name(action)} @resource?"

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

@@ -35,6 +35,15 @@ module Effective
         File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
       end
 
+      # Wizards are kinda weird, we need some help for effective_memberships
+      def wizard_file_path(resource)
+        if resource.class.try(:effective_memberships_applicant?) || resource.class.try(:effective_memberships_applicant_review?)
+          File.join(*['effective', plural_name].compact)
+        else
+          view_file_path(nil)
+        end
+      end
+
       # Views
       def view_file(action = :index, partial: false)
         File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.8.7'.freeze
+  VERSION = '2.8.9'.freeze
 end

data/lib/effective_resources.rb

@@ -180,12 +180,13 @@ module EffectiveResources
     end
   end
 
+  # effective_translate
   def self.et(resource, attribute = nil)
     if resource.respond_to?(:datatable_name)
       resource.datatable_name
-    elsif resource.respond_to?(:model_name) == false
+    elsif resource.respond_to?(:model_name) == false # Just a string. Fees will do this
       value = I18n.t(resource)
-      raise("Missing translation: #{resource}") if value.start_with?('translation missing:')
+      raise StandardError.new("Missing translation: #{resource}") if value.include?(resource)
       value
     elsif attribute.blank?
       resource.model_name.human

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails