effective_resources 1.6.6 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323b70f4a0eb470c2e96edf3651c83493763ad203659f03bb25832cf487812a1
-  data.tar.gz: f997c5dcd62f4de1d49065c5fb3d5d882ea3eca30c47fe518bb6642dbd43e65a
+  metadata.gz: 321d1bd446ce934af73f92967e26577e09f16de314d0c0c780630901ccc23823
+  data.tar.gz: f65a37ad4e83d73e6d3da2ac2bf3a0a1588b7ca86e425ddb2d901ba9e9dfd571
 SHA512:
-  metadata.gz: 4d78587039acac7fa236913c588946277481a5df90933141db13a7d447491233452f8dd6c3c96ebf7bff8dfd95ba217e56c65e826128d9674532331d6971422c
-  data.tar.gz: daff8c0e7009dd67297f2e62a90744b7dcc67008f107543b53c53b24476ca8534284202aae98b0579e394fddbdbb498925b0294f47c95e70f9bbf8b551cab4a3
+  metadata.gz: e828b71738b3f48d9819fbffcabf1e8a94a44ae0e410069a0a7f1b64751cdb02fb23ce75dd0ad7ffc687ce6c0955112c4da1f9c864cc62256832fd308938b936
+  data.tar.gz: d2be424f57532b120b7a1e465e158592a2f5cc20ba2c8b6ac21dba864d9f8c844143d9e229507b1ad9e7792285065665ec57c87eedcfaab760e40fedf02ec095

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

@@ -11,13 +11,14 @@ module Effective
 
     included do
       define_actions_from_routes
-      define_permitted_params_from_model
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
     end
 
     module ClassMethods
       include Effective::CrudController::Dsl
 
+      # This is used to define_actions_from_routes and for the buttons/submits/ons
+      # It doesn't really work with the resource_scope correctly but the routes are important here
       def effective_resource
         @_effective_resource ||= Effective::Resource.new(controller_path)
       end
@@ -32,17 +33,6 @@ module Effective
           define_method(action) { collection_action(action) }
         end
       end
-
-      def define_permitted_params_from_model
-        if effective_resource.model.present?
-          define_method(:effective_resource_permitted_params) { resource_permitted_params } # save.rb
-        end
-
-        if effective_resource.active_model?
-          define_method(:effective_resource_permitted_params) { resource_active_model_permitted_params } # save.rb
-        end
-      end
-
     end
 
     def resource # @thing
@@ -62,11 +52,29 @@ module Effective
     end
 
     def effective_resource
-      self.class.effective_resource
+      @_effective_resource ||= begin
+        relation = instance_exec(&resource_scope_relation) if respond_to?(:resource_scope_relation)
+
+        if respond_to?(:resource_scope_relation) && !relation.kind_of?(ActiveRecord::Relation)
+          raise('resource_scope must return an ActiveRecord::Relation')
+        end
+
+        resource = Effective::Resource.new(controller_path, relation: relation)
+
+        unless resource.relation.kind_of?(ActiveRecord::Relation) || resource.active_model?
+          raise("unable to build resource_scope for #{resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.")
+        end
+
+        resource
+      end
     end
 
     private
 
+    def resource_scope
+      effective_resource.relation
+    end
+
     def resource_name # 'thing'
       effective_resource.name
     end
@@ -83,30 +91,6 @@ module Effective
       effective_resource.plural_name
     end
 
-    # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method
-    def resource_scope # Thing
-      @_effective_resource_relation ||= (
-        relation = case @_effective_resource_scope  # If this was initialized by the resource_scope before_action
-        when ActiveRecord::Relation
-          @_effective_resource_scope
-        when Hash
-          effective_resource.klass.where(@_effective_resource_scope)
-        when Symbol
-          effective_resource.klass.send(@_effective_resource_scope)
-        when nil
-          effective_resource.klass.respond_to?(:all) ? effective_resource.klass.all : effective_resource.klass
-        else
-          raise "expected resource_scope method to return an ActiveRecord::Relation or Hash"
-        end
-
-        unless relation.kind_of?(ActiveRecord::Relation) || effective_resource.active_model?
-          raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.")
-        end
-
-        relation
-      )
-    end
-
     def resource_datatable_attributes
       resource_scope.where_values_hash.symbolize_keys
     end
@@ -128,7 +112,16 @@ module Effective
     end
 
     def resource_params_method_name
-      ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params', 'effective_resource_permitted_params', ('resource_permitted_params' if effective_resource.model.present?)].compact.find { |name| respond_to?(name, true) } || 'params'
+      ['permitted_params', "#{resource_name}_params", "#{resource_plural_name}_params"].each do |name|
+        return name if respond_to?(name, true)
+      end
+
+      # Built in ones
+      return 'resource_permitted_params' if effective_resource.model.present?
+      return 'resource_active_model_permitted_params' if effective_resource.active_model?
+
+      # Fallback
+      'params'
     end
 
   end

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

@@ -79,9 +79,12 @@ module Effective
       def resource_scope(obj = nil, opts = {}, &block)
         raise 'expected a proc or block' unless (obj.respond_to?(:call) || block_given?)
 
-        instance_exec do
-          before_action(opts) { @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj)) }
+        if block_given?
+          define_method(:resource_scope_relation) { return block }
+        else
+          define_method(:resource_scope_relation) { return obj }
         end
+
       end
 
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module CrudController
     module Respond
@@ -94,7 +96,10 @@ module Effective
       end
 
       def template_present?(action)
-        lookup_context.template_exists?("#{action}.#{request.format.symbol.to_s.sub('json', 'js').presence || 'html'}", _prefixes)
+        #lookup_context.template_exists?("#{action}.#{request.format.symbol.to_s.sub('json', 'js').presence || 'html'}", _prefixes)
+
+        formats = [request.format.symbol.to_s.sub('json', 'js').presence || 'html']
+        lookup_context.template_exists?(action, _prefixes, formats: formats)
       end
 
     end

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

@@ -8,6 +8,7 @@ module Effective
     include Effective::WizardController::Actions
     include Effective::WizardController::BeforeActions
     include Effective::WizardController::Save
+    include Effective::WizardController::WickedOverrides
 
     included do
       raise("please install gem 'wicked' to use Effective::WizardController") unless defined?(Wicked)
@@ -54,9 +55,11 @@ module Effective
       effective_resource.klass.const_get(:WIZARD_STEPS).keys
     end
 
+    # It could be :new, :start
+    # Or resource, step
     def resource_wizard_path(resource, step)
-      path_helper = effective_resource.action_path_helper(:show).to_s.sub('_path', '_build_path')
-      public_send(path_helper, resource, step)
+      param = (resource.respond_to?(:to_param) ? resource.to_param : resource)
+      wizard_path(step, resource_name_id => param)
     end
 
   end

data/app/controllers/concerns/effective/wizard_controller/actions.rb

@@ -21,6 +21,7 @@ module Effective
         Rails.logger.info 'Processed by Effective::WizardController#update'
 
         resource.assign_attributes(send(resource_params_method_name))
+        assign_current_step
 
         save_wizard_resource(resource)
       end

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -54,7 +54,7 @@ module Effective
       end
 
       # before_action :assign_current_step, only: [:show, :update]
-      # Assign the urrent step to resource
+      # Assign the current step to resource
       def assign_current_step
         if respond_to?(:current_user) && resource.respond_to?(:current_user=)
           resource.current_user = current_user

data/app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb

@@ -0,0 +1,23 @@
+module Effective
+  module WizardController
+    module WickedOverrides
+
+      # Changes made here to work inside an effective rails engine
+      #
+      # https://github.com/zombocom/wicked/blob/main/lib/wicked/controller/concerns/path.rb
+      # https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/routing/url_for.rb#L180
+      def wizard_path(goto_step = nil, options = {})
+        options = options.respond_to?(:to_h) ? options.to_h : options
+        options = { :controller => wicked_controller,
+                    :action     => 'show',
+                    :id         => goto_step || params[:id],
+                    :only_path  => true
+                   }.merge(options)
+
+        merged_url_options = options.reverse_merge!(url_options)
+        effective_resource.url_helpers.url_for(merged_url_options)
+      end
+
+    end
+  end
+end

data/app/helpers/effective_resources_helper.rb

@@ -107,15 +107,16 @@ module EffectiveResourcesHelper
 
     # Select Partial
     partial = if partial.kind_of?(Symbol)
-      "effective/resource/actions_#{partial}.html"
+      "effective/resource/actions_#{partial}"
     else
-      "#{partial.presence || 'effective/resource/actions'}.html"
+      partial.presence || 'effective/resource/actions'
     end
 
     # Assign Locals
     locals = {
       resource: resource,
       effective_resource: effective_resource,
+      formats: [:html],
       format_block: (block if block_given?),
       namespace: namespace,
       actions: actions,
@@ -123,7 +124,14 @@ module EffectiveResourcesHelper
     }.compact.merge(locals)
 
     if resource.kind_of?(Array)
-      render(partial: partial, collection: resource, as: :resource, locals: locals.except(:resource), spacer_template: spacer_template)
+      render(
+        partial: partial,
+        formats: [:html],
+        collection: resource,
+        as: :resource,
+        locals: locals.except(:resource),
+        spacer_template: spacer_template
+      )
     else
       render(partial, locals)
     end

data/app/models/concerns/acts_as_slugged.rb

@@ -58,8 +58,7 @@ module ActsAsSlugged
   end
 
   def to_param
-    slug
+    slug_was || slug
   end
 
 end
-

data/app/models/concerns/acts_as_wizard.rb

@@ -68,6 +68,10 @@ module ActsAsWizard
       wizard_steps[step].present?
     end
 
+    def next_step
+      required_steps.reverse.find { |step| can_visit_step?(step) } || required_steps.first
+    end
+
     def previous_step(step)
       index = required_steps.index(step)
       required_steps[index-1] unless index == 0 || index.nil?

data/app/models/effective/resource.rb

@@ -15,8 +15,8 @@ module Effective
     include Effective::Resources::Sql
 
     # post, Post, Admin::Post, admin::Post, admin/posts, admin/post, admin/effective::post
-    def initialize(input, namespace: nil, &block)
-      _initialize_input(input, namespace: namespace)
+    def initialize(input, namespace: nil, relation: nil, &block)
+      _initialize_input(input, namespace: namespace, relation: relation)
       _initialize_model(&block) if block_given?
       self
     end

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

@@ -12,8 +12,8 @@ module Effective
       def routes
         @routes ||= (
           matches = [
-            [namespace, plural_name].compact.join('/'),
-            [namespace, name].compact.join('/')
+            [namespace, route_name.pluralize].compact.join('/'),
+            [namespace, route_name].compact.join('/'),
           ]
 
           # Check main Rails app
@@ -21,9 +21,25 @@ module Effective
             (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
           end
 
+          if routes.blank?
+            matches = [
+              [namespace, plural_name].compact.join('/'),
+              [namespace, 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
+          end
+
           # Check engine routes
           if routes.blank?
             matches = [
+              [namespace, route_name.pluralize].compact.join('/'),
+              [namespace, route_name].compact.join('/'),
+              ['effective', namespace, route_name.pluralize].compact.join('/'),
+              ['effective', namespace, route_name].compact.join('/'),
               [namespace, plural_name].compact.join('/'),
               [namespace, name].compact.join('/'),
               ['effective', namespace, plural_name].compact.join('/'),
@@ -35,7 +51,11 @@ module Effective
                 (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
               end
 
-              break if routes.present?
+              if routes.present?
+                @routes_app = engine
+                break
+              end
+
             end
           end
 
@@ -43,6 +63,14 @@ module Effective
         )
       end
 
+      def routes_app
+        @routes_app if routes.present?
+      end
+
+      def url_helpers
+        (routes_app || Rails.application).routes.url_helpers
+      end
+
       # Effective::Resource.new('admin/posts').action_path_helper(:edit) => 'edit_admin_posts_path'
       # This will return empty for create, update and destroy
       def action_path_helper(action)

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

@@ -69,12 +69,12 @@ module Effective
         active_storage_has_ones.map { |ass| ass.name.to_s.gsub(/_attachment\z/, '').to_sym }
       end
 
-      def active_texts
+      def action_texts
         klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' }
       end
 
-      def active_texts_has_ones_ids
-        active_texts.map { |ass| ass.name.to_s.gsub(/\Arich_text_/, '').to_sym }
+      def action_texts_has_ones_ids
+        action_texts.map { |ass| ass.name.to_s.gsub(/\Arich_text_/, '').to_sym }
       end
 
       def nested_resources

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

@@ -54,7 +54,7 @@ module Effective
 
       def active_text_attributes
         {}.tap do |retval|
-          active_texts_has_ones_ids.each { |k, v| retval[k] = [:string] }
+          action_texts_has_ones_ids.each { |k, v| retval[k] = [:string] }
         end
       end
 

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

@@ -4,9 +4,9 @@ module Effective
 
       private
 
-      def _initialize_input(input, namespace: nil)
+      def _initialize_input(input, namespace: nil, relation: nil)
         @initialized_name = input
-        @model_klass = _klass_by_input(input)
+        @model_klass = (relation ? _klass_by_input(relation) : _klass_by_input(input))
 
         # Consider namespaces
         if namespace
@@ -18,20 +18,24 @@ module Effective
         end
 
         # Consider relation
+        if relation.kind_of?(ActiveRecord::Relation)
+          @relation ||= relation
+        end
+
         if input.kind_of?(ActiveRecord::Relation)
           @relation ||= input
         end
 
         if input.kind_of?(ActiveRecord::Reflection::MacroReflection) && input.scope
-          @relation ||= klass.where(nil).merge(input.scope)
+          @relation ||= @model_klass.where(nil).merge(input.scope)
         end
 
         # Consider instance
-        if klass && input.instance_of?(klass)
+        if @model_klass && input.instance_of?(@model_klass)
           @instance ||= input
         end
 
-        if klass && input.kind_of?(Array) && input.last.instance_of?(klass)
+        if @model_klass && input.kind_of?(Array) && input.last.instance_of?(@model_klass)
           @instance ||= input.last
         end
       end

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

@@ -49,7 +49,7 @@ module Effective
           end
         end
 
-        has_ones.each do |association|
+        (action_texts + has_ones).each do |association|
           next if except.present? && except.include?(association.name)
           next unless only.blank? || only.include?(association.name)
 
@@ -74,9 +74,22 @@ module Effective
         attributes.delete_if { |_, value| value.blank? }
       end
 
+      def instance_action_texts_previous_changes
+        return {} unless instance.present? && action_texts.present?
+
+        action_texts
+          .map { |ass| instance.send(ass.name) }
+          .compact
+          .select { |obj| obj.previous_changes['body'].present? }
+          .inject({}) { |h, obj| h[obj.name.to_sym] = obj.previous_changes['body']; h }
+      end
+
       # used by effective_logging
       def instance_changes(only: nil, except: nil)
-        return {} unless (instance.present? && instance.previous_changes.present?)
+        return {} unless instance.present?
+
+        action_texts_changes = instance_action_texts_previous_changes()
+        return {} unless instance.previous_changes.present? || action_texts_changes.present?
 
         # Build up our only and except
         only = Array(only).map(&:to_sym)
@@ -94,6 +107,13 @@ module Effective
         changes = changes.except(*except) if except.present?
         changes = changes.slice(*only) if only.present?
 
+        action_texts_changes.each do |name, (before, after)|
+          next if except.present? && except.include?(name)
+          next unless only.blank? || only.include?(name)
+
+          changes[name] = [before.to_s, after.to_s]
+        end
+
         # Log to_s changes on all belongs_to associations
         belong_tos.each do |association|
           next if except.present? && except.include?(association.name)
@@ -110,7 +130,3 @@ module Effective
     end
   end
 end
-
-
-
-

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

@@ -19,6 +19,10 @@ module Effective
         @initialized_name
       end
 
+      def route_name # 'post' initialized from the controller_path/initialized_name and not the class
+        @route_name ||= (initialized_name.to_s.split(SPLIT).last || '').singularize.underscore
+      end
+
       def class_name # 'Effective::Post'
         @model_klass ? @model_klass.name : name.classify
       end
@@ -44,11 +48,11 @@ module Effective
       end
 
       def human_name
-        class_name.gsub('::', ' ').underscore.gsub('_', ' ')
+        name.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
       def human_plural_name
-        class_name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
+        name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
     end

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

@@ -4,8 +4,10 @@ module Effective
       TARGET_LIST_LIMIT = 1500
       TARGET_KEYS_LIMIT = 30000
 
+      # This could be active_model? in which we just return the klass itself here
+      # This value ends up being crud_controller resource_scope()
       def relation
-        @relation ||= klass.where(nil)
+        @relation ||= (klass.respond_to?(:where) ? klass.where(nil) : klass)
       end
 
       # When Effective::Resource is initialized with an ActiveRecord relation, the following

data/lib/effective_resources/engine.rb

@@ -51,9 +51,11 @@ module EffectiveResources
     # Register the acts_as_archived routes concern
     # resources :things, concerns: :acts_as_archived
     initializer 'effective_resources.routes_concern' do |app|
-      ActiveSupport.on_load :action_controller_base do
-        ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-      end
+      ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
+
+      # Doesn't seem to work with the on_load in rails 6.0
+      #ActiveSupport.on_load :action_controller_base do
+      #end
     end
 
     # Register the flash_messages concern so that it can be called in ActionController

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,7 @@ files:
 - app/controllers/concerns/effective/wizard_controller/actions.rb
 - app/controllers/concerns/effective/wizard_controller/before_actions.rb
 - app/controllers/concerns/effective/wizard_controller/save.rb
+- app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb
 - app/helpers/effective_resources_helper.rb
 - app/helpers/effective_resources_private_helper.rb
 - app/helpers/effective_resources_wizard_helper.rb