effective_resources 2.6.2 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dcfb1b1ecff7101245ed9275d996bacbe8968c78792a5d89399ad43744386db
-  data.tar.gz: f76b0ab71a95f37d8b1b9d8511ee573a35f9ca55025ddd50b10bb0f923e85340
+  metadata.gz: 8a66af4a785aeb664dcd50caa4d838c301f6d8652475a35278dc4580c527ad74
+  data.tar.gz: 77058779dd017ad9cfb78b01299f321af5de6eb5f5bcb95878f7b57e256ec9d6
 SHA512:
-  metadata.gz: e52cc7f4616d6a9d41d7bd2a18e3c1faf31db8221aecc0c8955b947c797a9b234e70f2691dd85298efd7d9fbcbde27fe6cbc8a1514d54f357872208a3bf88174
-  data.tar.gz: 2438599b31982f48e0370d49625e4fdca1c1d7b7a43a73e256f466bc9f70427f0d1d82ef2b7b40714f1be922c29ec388919da5647d02d27848eb8be02ff10601
+  metadata.gz: 7282c9e47327b814f1c8a5bbf4291aa5956ad2fcd13bafadeecbd33d2ce49a19c6dbb89c8d585b12b2a1988e3e32e22bc56340643f536251fd31f3c4c7854d20
+  data.tar.gz: d17c9a25dc8c09992eea1d640ecf9eaa103747ef338745e27d44595300ebfddbd021c6657c56931a7d80b0816c5ff25f9ef209c062cbb3a02469d6b24bfaec71

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -20,6 +20,21 @@ module Effective
         params.require(permitted_name).permit(*permitted_params)
       end
 
+      # Permit all params for the admin namespace
+      def resource_admin_permitted_params
+        raise 'expected resource class to have effective_resource do .. end' if effective_resource.model.blank?
+        raise 'expected to be called only on admin namespace' unless effective_resource.namespaces == ['admin']
+
+        permitted_name = params.key?(effective_resource.name) ? effective_resource.name : effective_resource.resource_name
+
+        if Rails.env.development?
+          Rails.logger.info "Effective::CrudController#resource_admin_permitted_params:"
+          Rails.logger.info "params.require(:#{permitted_name}).permit!"
+        end
+
+        params.require(permitted_name).permit!
+      end
+
       # If the resource is ActiveModel, just permit all
       # This can still be overridden by a controller
       def resource_active_model_permitted_params

data/app/controllers/concerns/effective/crud_controller.rb

@@ -141,6 +141,7 @@ module Effective
       end
 
       # Built in ones
+      return 'resource_admin_permitted_params' if effective_resource.model.present? && effective_resource.namespaces == ['admin']
       return 'resource_permitted_params' if effective_resource.model.present?
       return 'resource_active_model_permitted_params' if effective_resource.active_model?
 

data/app/models/concerns/acts_as_slugged.rb

@@ -64,7 +64,7 @@ module ActsAsSlugged
     end
 
     if (count = self.class.where(slug: slug).count) > 0
-      uid = (Time.zone.now.to_i - 1_600_000_000).to_s(16) # This is a unique 7-8 digit url safe hex string
+      uid = Time.zone.now.nsec.to_s(16) # This is a unique 7-8 digit url safe hex string
       slug = "#{slug}-#{uid}"
     end
 

data/app/models/concerns/acts_as_wizard.rb

@@ -137,6 +137,10 @@ module ActsAsWizard
       has_completed_step?(required_steps.last)
     end
 
+    def reset_wizard_steps!
+      update!(wizard_steps: {})
+    end
+
     def without_current_step(&block)
       existing = current_step
 

data/app/models/concerns/effective_devise_user.rb

@@ -142,6 +142,11 @@ module EffectiveDeviseUser
     super && (respond_to?(:archived?) ? !archived? : true)
   end
 
+  # Allow users to sign in even if they have a pending invitation
+  def block_from_invitation?
+    false
+  end
+
   def inactive_message
     (respond_to?(:archived?) && archived?) ? :archived : super
   end

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

@@ -6,12 +6,14 @@ module Effective
 
       def module_name
         return nil unless class_name.split('::').length > 1
+
         class_name.split('::').first
       end
 
       # Acpa
       def module_namespace
         return nil unless namespaces.present?
+
         Array(namespaces + [nil]).map { |name| name.to_s.classify } * '::'
       end
 
@@ -44,7 +46,6 @@ module Effective
       def tenant_class_name
         (Tenant.module_name + '::' + class_name) if tenant?
       end
-
     end
   end
 end

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

@@ -3,14 +3,13 @@
 module Effective
   module Resources
     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:')
         end
 
-        if(crud_actions.include?(action))
+        if crud_actions.include?(action)
           # Raises exception if not present
           return EffectiveResources.et("effective_resources.actions.#{action}")
         end
@@ -42,7 +41,6 @@ module Effective
           name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
         end
       end
-
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.6.2'.freeze
+  VERSION = '2.7.1'.freeze
 end

metadata

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