effective_resources 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05139233c80055128a85d5d530093dce5298a30f69bf22bf4ac52e6e8edea01
-  data.tar.gz: 262b94abbdef2122707827ec1b838885b13f05689d3c274eacde638bebdbffc4
+  metadata.gz: 9df1eeb6569ea8687942cd36080e692b9e9f5d7e77fbc4bf2e407c5663e50837
+  data.tar.gz: bc8c7dbedd4b7f42535b9f80496cb6be2de1afb7b854ddee9ff7bee8471c3a90
 SHA512:
-  metadata.gz: a4a5755f86f90fd14436bbce9e4595381c7159042b4fa671171ca7c4d7a52456653e0a0acc9307f655bc3c14d840f2b188907d2266dc937fb40f807bf88b64a8
-  data.tar.gz: c81a56fbc58c5759239a1f6c7de59ccc3b0efe43bc1fa5a2332867602b029330a6820f8bc485566addd11abc7323f13036ae8d075b6bc1c0f027ac54e799264e
+  metadata.gz: 4c4bd92d1125a2cbfa3d29ce5f5dd18700c02a17e8779ed8ba1b0efd838fc9fe3638cd79efbb747c7df9edae3d061e2dd9497bdaf4a20a37ac1220df830d765b
+  data.tar.gz: fd57888df8906448c0c9513aeadf9e661e23830a15444d0b10d3935f31cd40049dac6351273146b11e5d0101d971d1d432276b56ad33d07439938537f92b6e1f

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

@@ -63,8 +63,8 @@ module ActsAsSlugged
       slug = "#{slug}-#{self.class.name.demodulize.parameterize}"
     end
 
-    if (count = self.class.where('slug ILIKE ?', "#{slug}%").count) > 0
-      uid = (Time.zone.now.to_i - 1_500_000_000).to_s(36) # This is a unique 6 digit url safe string
+    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
       slug = "#{slug}-#{uid}"
     end
 

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.1'.freeze
+  VERSION = '2.7.0'.freeze
 end

metadata

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