effective_resources 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321d1bd446ce934af73f92967e26577e09f16de314d0c0c780630901ccc23823
-  data.tar.gz: f65a37ad4e83d73e6d3da2ac2bf3a0a1588b7ca86e425ddb2d901ba9e9dfd571
+  metadata.gz: 2c872b773ee626165d7d0dee9d363e9375fd7702c9f0330ce2492c380fcac45b
+  data.tar.gz: eadd2e25503395461ea1823d8b9e719eb80cb405373fcae2253c3467631c18ea
 SHA512:
-  metadata.gz: e828b71738b3f48d9819fbffcabf1e8a94a44ae0e410069a0a7f1b64751cdb02fb23ce75dd0ad7ffc687ce6c0955112c4da1f9c864cc62256832fd308938b936
-  data.tar.gz: d2be424f57532b120b7a1e465e158592a2f5cc20ba2c8b6ac21dba864d9f8c844143d9e229507b1ad9e7792285065665ec57c87eedcfaab760e40fedf02ec095
+  metadata.gz: 2a91bcaab5fe78374b9771ddfe9117bb0594202e1e91dfc9d39922dc153b0ea38d64a5643365488097efb9fd258d8915fbdea12e7b9b7098fec456f46f9bbe30
+  data.tar.gz: b49ff8dc969fbb45db46a4db1ed97b3f369a2734db20e2c5957b28fe0aa5928045ef73d8170e06a975170dca40d8c5a5d09d3e31600b00904783ce35dca6ea2a

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

@@ -10,25 +10,28 @@ module Effective
         raise 'expected resource class to have effective_resource do .. end' if effective_resource.model.blank?
 
         permitted_params = permitted_params_for(resource, effective_resource.namespaces)
+        permitted_name = params.key?(effective_resource.name) ? effective_resource.name : effective_resource.resource_name
 
         if Rails.env.development?
           Rails.logger.info "Effective::CrudController#resource_permitted_params:"
-          Rails.logger.info "params.require(:#{effective_resource.resource_name}).permit(#{permitted_params.to_s[1...-1]})"
+          Rails.logger.info "params.require(:#{permitted_name}).permit(#{permitted_params.to_s[1...-1]})"
         end
 
-        params.require(effective_resource.resource_name).permit(*permitted_params)
+        params.require(permitted_name).permit(*permitted_params)
       end
 
       # If the resource is ActiveModel, just permit all
       # This can still be overridden by a controller
       def resource_active_model_permitted_params
+        permitted_name = params.key?(effective_resource.name) ? effective_resource.name : effective_resource.resource_name
+
         if Rails.env.development?
           Rails.logger.info "Effective::CrudController#resource_permitted_params:"
-          Rails.logger.info "params.require(:#{effective_resource.resource_name}).permit!"
+          Rails.logger.info "params.require(:#{permitted_name}).permit!"
         end
 
-        if params[effective_resource.resource_name].present?
-          params.require(effective_resource.resource_name).permit!
+        if params[permitted_name].present?
+          params.require(permitted_name).permit!
         else
           params.require((effective_resource.namespaces + [effective_resource.resource_name]).join('_')).permit!
         end

data/app/models/concerns/effective_devise_user.rb

@@ -0,0 +1,167 @@
+# EffectiveDeviseUsr
+#
+# Mark your user model with devise_for then effective_devise_user
+
+module EffectiveDeviseUser
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_devise_user
+      include ::EffectiveDeviseUser
+    end
+  end
+
+  included do
+    effective_resource do
+      encrypted_password      :string
+      reset_password_token    :string
+      reset_password_sent_at  :datetime
+      remember_created_at     :datetime
+      sign_in_count           :integer
+      current_sign_in_at      :datetime
+      last_sign_in_at         :datetime
+      current_sign_in_ip      :inet
+      last_sign_in_ip         :inet
+
+      # Devise invitable attributes
+      invitation_token        :string
+      invitation_created_at   :datetime
+      invitation_sent_at      :datetime
+      invitation_accepted_at  :datetime
+      invitation_limit        :integer
+      invited_by_type         :string
+      invited_by_id           :integer
+      invitations_count       :integer
+
+      # Omniauth
+      uid                     :string
+      provider                :string
+
+      access_token            :string
+      refresh_token           :string
+      token_expires_at        :datetime
+
+      name                    :string
+      avatar_url              :string
+    end
+
+    # Devise invitable ignores model validations, so we manually check for duplicate email addresses.
+    before_save(if: -> { new_record? && invitation_sent_at.present? }) do
+      if email.blank?
+        self.errors.add(:email, "can't be blank")
+        raise("email can't be blank")
+      end
+
+      if self.class.where(email: email.downcase.strip).exists?
+        self.errors.add(:email, 'has already been taken')
+        raise("email has already been taken")
+      end
+    end
+
+    # Clear the provider if an oauth signed in user resets password
+    before_save(if: -> { persisted? && encrypted_password_changed? }) do
+      assign_attributes(provider: nil, access_token: nil, refresh_token: nil, token_expires_at: nil)
+    end
+  end
+
+  module ClassMethods
+    def permitted_sign_up_params # Should contain all fields as per views/users/_sign_up_fields
+      [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]
+    end
+
+    def from_omniauth(auth, params)
+      invitation_token = (params.presence || {})['invitation_token']
+
+      email = (auth.info.email.presence || "#{auth.uid}@#{auth.provider}.none").downcase
+      image = auth.info.image
+      name = auth.info.name || auth.dig(:extra, :raw_info, :login)
+
+      user = if invitation_token
+        find_by_invitation_token(invitation_token, false) || raise(ActiveRecord::RecordNotFound)
+      else
+        where(uid: auth.uid).or(where(email: email)).first || self.new()
+      end
+
+      user.assign_attributes(
+        uid: auth.uid,
+        provider: auth.provider,
+        email: email,
+        avatar_url: image,
+        name: name,
+        first_name: (auth.info.first_name.presence || name.split(' ').first.presence || 'First'),
+        last_name: (auth.info.last_name.presence || name.split(' ').last.presence || 'Last')
+      )
+
+      if auth.respond_to?(:credentials)
+        user.assign_attributes(
+          access_token: auth.credentials.token,
+          refresh_token: auth.credentials.refresh_token,
+          token_expires_at: Time.zone.at(auth.credentials.expires_at), # We are given integer datetime e.g. '1549394077'
+        )
+      end
+
+      # Make a password
+      user.password = Devise.friendly_token[0, 20] if user.encrypted_password.blank?
+
+      # Devise Invitable
+      invitation_token ? user.accept_invitation! : user.save!
+
+      # Devise Confirmable
+      user.confirm if user.respond_to?(:confirm)
+
+      user
+    end
+
+    # https://github.com/heartcombo/devise/blob/master/lib/devise/models/recoverable.rb#L134
+    def send_reset_password_instructions(attributes = {})
+      recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
+      return recoverable unless recoverable.persisted?
+
+      # Add custom errors and require a confirmation if previous sign in was provider
+      if recoverable.provider.present? && attributes[:confirm_new_password].blank?
+        recoverable.errors.add(:email, "previous sign in was with #{recoverable.provider}")
+        recoverable.errors.add(:confirm_new_password, 'please confirm to proceed')
+      end
+
+      recoverable.send_reset_password_instructions if recoverable.errors.blank?
+      recoverable
+    end
+
+  end
+
+  # EffectiveDeviseUser Instance Methods
+
+  def reinvite!
+    invite!
+  end
+
+  def active_for_authentication?
+    super && (respond_to?(:archived?) ? !archived? : true)
+  end
+
+  def inactive_message
+    (respond_to?(:archived?) && archived?) ? :archived : super
+  end
+
+  # Any password will work in development or mode
+  def valid_password?(password)
+    Rails.env.development? || Rails.env.staging? || super
+  end
+
+  # Send devise & devise_invitable emails via active job
+  def send_devise_notification(notification, *args)
+    raise('expected args Hash') unless args.respond_to?(:last) && args.last.kind_of?(Hash)
+
+
+
+    if defined?(Tenant)
+      tenant = Tenant.current || raise('expected a current tenant')
+      args.last[:tenant] ||= tenant
+    end
+
+    wait = (5 if notification == :invitation_instructions && !Rails.env.test?)
+
+    devise_mailer.send(notification, self, *args).deliver_later(wait: wait)
+  end
+
+end

data/app/models/effective/resource.rb

@@ -14,10 +14,18 @@ module Effective
     include Effective::Resources::Relation
     include Effective::Resources::Sql
 
+
+    # In practice, this is initialized two ways
+    # With a klass and a namespace from effective_datatables
+    # Or with a controller_path from crud controller
+
     # post, Post, Admin::Post, admin::Post, admin/posts, admin/post, admin/effective::post
     def initialize(input, namespace: nil, relation: nil, &block)
       _initialize_input(input, namespace: namespace, relation: relation)
+
+      # This is an effective_resource do ... end block
       _initialize_model(&block) if block_given?
+
       self
     end
 

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

@@ -7,33 +7,27 @@ module Effective
       POST_VERBS = ['POST', 'PUT', 'PATCH']
       CRUD_ACTIONS = %i(index new create show edit update destroy)
 
-      # This was written for the Edit actions fallback templates and Datatables
-      # Effective::Resource.new('admin/posts').routes[:index]
-      def routes
-        @routes ||= (
-          matches = [
-            [namespace, route_name.pluralize].compact.join('/'),
-            [namespace, route_name].compact.join('/'),
-          ]
-
-          # Check main Rails app
-          routes = Rails.application.routes.routes.select do |route|
-            (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
-          end
+      # This will have been set by init from crud_controller, or from a class and namespace
+      def controller_path
+        @controller_path ||= ([namespace, plural_name].compact * '/')
+      end
 
-          if routes.blank?
-            matches = [
-              [namespace, plural_name].compact.join('/'),
-              [namespace, name].compact.join('/')
-            ]
+      def routes
+        @routes ||= begin
+          routes = nil
+          engines = [Rails.application] + Rails::Engine.subclasses.reverse
+
+          # Check from controller_path. This is generally correct.
+          engines.each do |engine|
+            routes = engine.routes.routes.select do |route|
+              controller_path == route.defaults[:controller] && !route.name.to_s.end_with?('root')
+            end
 
-            # Check main Rails app
-            routes = Rails.application.routes.routes.select do |route|
-              (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
+            if routes.present?
+              @routes_app = engine; break
             end
           end
 
-          # Check engine routes
           if routes.blank?
             matches = [
               [namespace, route_name.pluralize].compact.join('/'),
@@ -46,21 +40,19 @@ module Effective
               ['effective', namespace, name].compact.join('/')
             ]
 
-            (Rails::Engine.subclasses.reverse + [Rails.application]).each do |engine|
+            engines.each do |engine|
               routes = engine.routes.routes.select do |route|
                 (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
               end
 
               if routes.present?
-                @routes_app = engine
-                break
+                @routes_app = engine; break
               end
-
             end
           end
 
           Array(routes).inject({}) { |h, route| h[route.defaults[:action].to_sym] = route; h }
-        )
+        end
       end
 
       def routes_app
@@ -137,58 +129,39 @@ module Effective
       end
 
       def crud_actions
-        @crud_actions ||= (actions & CRUD_ACTIONS)
+        (actions & CRUD_ACTIONS)
       end
 
       # GET actions
       def collection_actions
-        @collection_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) } - [nil]
       end
 
       def collection_get_actions
-        @collection_get_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_get_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_get_route?(route) } - [nil]
       end
 
       def collection_post_actions
-        @collection_post_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_post_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_post_route?(route) } - [nil]
       end
 
       # All actions
       def member_actions
-        @member_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) } - [nil]
       end
 
       # GET actions
       def member_get_actions
-        @member_get_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_get_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_get_route?(route) } - [nil]
       end
 
       def member_delete_actions
-        @member_delete_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_delete_route?(route) }.tap(&:compact!)
-        )
+        routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_delete_route?(route) } - [nil]
       end
 
       # POST/PUT/PATCH actions
       def member_post_actions
-        @member_post_actions ||= (
-          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_post_route?(route) }.tap(&:compact!)
-        )
-      end
-
-      # Same as controller_path in the view
-      def controller_path
-        [namespace, plural_name].compact * '/'
+        routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_post_route?(route) } - [nil]
       end
 
       private

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

@@ -8,6 +8,11 @@ module Effective
         @initialized_name = input
         @model_klass = (relation ? _klass_by_input(relation) : _klass_by_input(input))
 
+        # Consider controller_name
+        if @model_klass && input.kind_of?(String) && namespace.blank?
+          @controller_path = input
+        end
+
         # Consider namespaces
         if namespace
           @namespaces = (namespace.kind_of?(String) ? namespace.split('/') : Array(namespace))
@@ -62,30 +67,30 @@ module Effective
         end
       end
 
+
+      # 'acpa/admin/shirts'
       def _klass_by_name(input)
         input = input.to_s
         input = input[1..-1] if input.start_with?('/')
 
         names = input.split('/')
 
-        # Crazy classify
-        0.upto(names.length-1) do |index|
-          class_name = names[index..-1].map { |name| name.classify } * '::'
-          klass = class_name.safe_constantize
-
-          if klass.blank? && index > 0
-            class_name = (names[0..index-1].map { |name| name.classify.pluralize } + names[index..-1].map { |name| name.classify }) * '::'
-            klass = class_name.safe_constantize
-          end
-
-          if klass.present?
-            @namespaces ||= names[0...index]
-            @model_klass = klass
-            return klass
+        # Classify based on namespace
+        # acpa/admin/shirts
+        (names.length).downto(1).each do |n|
+          names.combination(n).to_a.each do |pieces|
+            klass_pieces = pieces.map { |piece| piece.classify } * '::'
+            klass = klass_pieces.safe_constantize
+
+            if klass.present? && klass.class != Module
+              @namespaces ||= (names - pieces)
+              @model_klass = klass
+              return klass
+            end
           end
         end
 
-        # Crazy engine
+        # Crazy effective engine.
         if names[0] == 'admin'
           class_name = (['effective'] + names[1..-1]).map { |name| name.classify } * '::'
           klass = class_name.safe_constantize

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

@@ -8,6 +8,8 @@ module Effective
 
       def datatable_klass
         if defined?(EffectiveDatatables)
+          "#{controller_path.classify.pluralize}Datatable".safe_constantize ||
+          "#{controller_path.classify}Datatable".safe_constantize ||
           "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
           "#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
           "#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||

data/lib/effective_resources/engine.rb

@@ -27,6 +27,8 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
+
+        ActiveRecord::Base.extend(EffectiveDeviseUser::Base)
         ActiveRecord::Base.extend(EffectiveResource::Base)
       end
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.7.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb
 - app/models/concerns/acts_as_wizard.rb
+- app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb