effective_resources 1.7.7 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a2e065a385451ee58c4cf054e18ffb3b2d67618aef4c6e3a417b221b7a6839
-  data.tar.gz: fa379b94d613fa510aa5261c44877a344dfff0ac6de0202a64c90d692b9157aa
+  metadata.gz: 3e9efd79bdfd45a008026c4df5eb078e141ce8291c01942aea6b40565434be38
+  data.tar.gz: 8f31ee7e20b727cab52b580a470a74c00d64e1f830e76153d080dab7f9788645
 SHA512:
-  metadata.gz: a0ed3d10e90f30f5a7b4dd9d837fe21ca6d07c557850d1931ec97c839fbb39a78e11fa795331af247cc5fa929fccdf5aec3f6f05dfd8b68d35e3e0682de0c732
-  data.tar.gz: 53d62815fc3e7fa7718fa1094b7fcb721d772631b1ec1899a9ad7a4f601705091b9efba194b59c4ebead8f0a260b9791b0b83cce9d4962a523361abe46697ef0
+  metadata.gz: 0e7bd31331526a1f9bd7d68022d5cf8587c21ed142c06e8353e2b14ea1d3acc5a26af54d69dacdce1469159b0e55c4698b381fa027067dbcf1b688d47ad42f2b
+  data.tar.gz: ac2ffd7ccd01c8f016a99bf2f7dc6472b356a4dc489d1cdf5109fbb96bba36b642859bd28b14216b60b03309c830905b828e7f422dbc924325bd74fb9d6442b6

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

@@ -53,7 +53,7 @@ module Effective
 
         respond_to do |format|
           format.html { }
-          format.js { render('new.js') }
+          format.js { render('new', formats: :js) }
         end
       end
 
@@ -95,7 +95,7 @@ module Effective
 
         respond_to do |format|
           format.html { }
-          format.js { render('show.js') }
+          format.js { render('show', formats: :js) }
         end
 
       end
@@ -112,7 +112,7 @@ module Effective
 
         respond_to do |format|
           format.html { }
-          format.js { render('edit.js') }
+          format.js { render('edit', formats: :js) }
         end
 
       end
@@ -176,7 +176,10 @@ module Effective
 
           respond_to do |format|
             format.html { }
-            format.js { render(template_present?(action) ? action : 'member_action.js', locals: { action: action }) }
+            format.js do
+              template = template_present?(action) ? action : 'member_action'
+              render(template, formats: :js, locals: { action: action })
+            end
           end
 
           return

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

@@ -76,6 +76,7 @@ module Effective
       def resource_flash(status, resource, action, e: nil)
         submit = commit_action(action)
         message = submit[status].respond_to?(:call) ? instance_exec(&submit[status]) : submit[status]
+
         return message.gsub('@resource', resource.to_s) if message.present?
         return nil if message.blank? && submit.key?(status)
 
@@ -93,6 +94,9 @@ module Effective
 
       # Should return a new resource based on the passed one
       def duplicate_resource(resource)
+        return resource.duplicate if resource.respond_to?(:duplicate)
+        return resource.duplicate! if resource.respond_to?(:duplicate!)
+        return resource.deep_dup if resource.respond_to?(:deep_dup)
         resource.dup
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FlashMessages
     extend ActiveSupport::Concern
@@ -6,7 +8,11 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      "Successfully #{action_verb(action)} #{name || resource}".html_safe
+      name ||= begin
+        resource.destroyed? ? resource.class.model_name.to_s.downcase.split('::').last : resource.to_s.presence
+      end
+
+      "Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
     end
 
     # flash.now[:danger] = flash_danger(@post)
@@ -18,7 +24,9 @@ module Effective
 
       messages = flash_errors(resource, e: e)
 
-      name ||= resource.to_s.presence
+      name ||= begin
+        resource.destroyed? ? resource.class.model_name.to_s.downcase.split('::').last : resource.to_s.presence
+      end
 
       ["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe
     end
@@ -27,7 +35,10 @@ module Effective
     def flash_errors(resource, e: nil)
       raise 'expected an ActiveRecord resource' unless resource.respond_to?(:errors)
 
-      messages = resource.errors.map do |attribute, message|
+      messages = resource.errors.map do |error|
+        attribute = error.respond_to?(:attribute) ? error.attribute : error
+        message = error.respond_to?(:message) ? error.message : resource.errors[attribute].to_sentence
+
         if message[0] == message[0].upcase # If the error begins with a capital letter
           message
         elsif attribute == :base
@@ -52,6 +63,8 @@ module Effective
         'deleted'
       elsif word == 'undo'
         'undid'
+      elsif word == 'run'
+        'ran'
       elsif word.end_with?('e')
         action.sub(word, word + 'd')
       elsif ['a', 'i', 'o', 'u'].include?(word[-1])

data/app/helpers/effective_resources_helper.rb

@@ -151,16 +151,24 @@ module EffectiveResourcesHelper
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?("form_#{action}", controller._prefixes, :partial)
-      render "form_#{action}", atts
-    elsif lookup_context.template_exists?('form', controller._prefixes, :partial)
-      render 'form', atts
-    elsif lookup_context.template_exists?('form', effective_resource.plural_name, :partial)
-      render "#{effective_resource.plural_name}/form", atts
-    elsif lookup_context.template_exists?('form', effective_resource.name, :partial)
-      render "#{effective_resource.name}/form", atts
-    else
-      render 'form', atts  # Will raise the regular error
+      return render("form_#{action}", atts)
+    end
+
+    if lookup_context.template_exists?('form', controller._prefixes, :partial)
+      return render('form', atts)
+    end
+
+    effective_resource.view_paths.each do |view_path|
+      if lookup_context.template_exists?("form_#{action}", [view_path], :partial)
+        return render(view_path + '/' + "form_#{action}", atts)
+      end
+
+      if lookup_context.template_exists?('form', [view_path], :partial)
+        return render(view_path + '/' + 'form', atts)
+      end
     end
+
+    render('form', atts) # Will raise the regular error
   end
 
   # Similar to render_resource_form
@@ -177,15 +185,18 @@ module EffectiveResourcesHelper
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
-      render(effective_resource.name, atts)
-    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.plural_name], :partial)
-      render(effective_resource.plural_name + '/' + effective_resource.name, atts)
-    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.name], :partial)
-      render(effective_resource.name + '/' + effective_resource.name, atts)
-    else
-      render(resource, atts)  # Will raise the regular error
+      return render(effective_resource.name, atts)
     end
+
+    effective_resource.view_paths.each do |view_path|
+      if lookup_context.template_exists?(effective_resource.name, [view_path], :partial)
+        return render(view_path + '/' + effective_resource.name, atts)
+      end
+    end
+
+    render(resource, atts)  # Will raise the regular error
   end
+  alias_method :render_resource, :render_resource_partial
 
   # Tableize attributes
   # This is used by effective_orders, effective_logging, effective_trash and effective_mergery

data/app/models/concerns/acts_as_slugged.rb

@@ -16,7 +16,9 @@ module ActsAsSlugged
   included do
     extend FinderMethods
 
-    before_validation { self.slug ||= build_slug }
+    before_validation do
+      assign_attributes(slug: build_slug) if slug.blank?
+    end
 
     validates :slug,
       presence: true, uniqueness: true, exclusion: { in: excluded_slugs }, length: { maximum: 255 },
@@ -40,11 +42,16 @@ module ActsAsSlugged
 
       where(slug: args.first).or(where(id: args.first)).first || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'slug'=#{args.first}"))
     end
+
+    def find_by_slug_or_id(*args)
+      where(slug: args.first).or(where(id: args.first)).first
+    end
+
   end
 
   # Instance Methods
   def build_slug
-    slug = self.to_s.parameterize.downcase[0, 250]
+    slug = to_s.parameterize.downcase[0, 250]
 
     if self.class.excluded_slugs.include?(slug)
       slug = "#{slug}-#{self.class.name.demodulize.parameterize}"

data/app/models/concerns/effective_devise_user.rb

@@ -66,6 +66,7 @@ module EffectiveDeviseUser
 
   module ClassMethods
     def permitted_sign_up_params # Should contain all fields as per views/users/_sign_up_fields
+      raise('please define a self.permitted_sign_up_params')
       [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]
     end
 
@@ -152,8 +153,6 @@ module EffectiveDeviseUser
   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

data/app/models/concerns/has_many_rich_texts.rb

@@ -0,0 +1,57 @@
+# HasManyRichTexts
+#
+# Mark your model with 'has_many_rich_texts'
+# Then it will automatically create a region when using a method named rich_text_*
+# object.rich_text_body = "<p>Stuff</p>"
+# object.rich_text_body => ActionText::RichText<name="body" body="<p>Stuff</p>">
+
+module HasManyRichTexts
+  extend ActiveSupport::Concern
+
+  module Base
+    def has_many_rich_texts(options = nil)
+      include ::HasManyRichTexts
+    end
+  end
+
+  included do
+    has_many :rich_texts, class_name: 'ActionText::RichText', as: :record, inverse_of: :record, dependent: :destroy
+    accepts_nested_attributes_for :rich_texts, allow_destroy: true
+  end
+
+  module ClassMethods
+  end
+
+  # Find or build
+  def rich_text(name)
+    name = name.to_s
+    rich_texts.find { |rt| rt.name == name } || rich_texts.build(name: name)
+  end
+
+  def assign_rich_text_body(name, body)
+    rich_text(name).assign_attributes(body: body)
+  end
+
+  # Prevents an ActiveModel::UnknownAttributeError
+  # https://github.com/rails/rails/blob/main/activemodel/lib/active_model/attribute_assignment.rb#L48
+  def respond_to?(*args)
+    args.first.to_s.start_with?('rich_text_') ? true : super
+  end
+
+  def method_missing(method, *args, &block)
+    super if block_given?
+    super unless respond_to?(method)
+
+    method = method.to_s
+    name = method.chomp('=').sub('rich_text_', '')
+
+    if method.end_with?('=')
+      send(:assign_rich_text_body, name, *args)
+    elsif args.length == 0
+      send(:rich_text, name, *args)
+    else
+      super
+    end
+  end
+
+end

data/app/models/effective/resource.rb

@@ -7,6 +7,7 @@ module Effective
     include Effective::Resources::Init
     include Effective::Resources::Instance
     include Effective::Resources::Forms
+    include Effective::Resources::Generator
     include Effective::Resources::Klass
     include Effective::Resources::Model
     include Effective::Resources::Naming

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

@@ -9,7 +9,7 @@ module Effective
 
       # 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 * '/')
+        @controller_path ||= route_name #[namespace, plural_name].compact * '/')
       end
 
       def routes
@@ -20,7 +20,7 @@ module Effective
           # 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')
+              controller_path == route.defaults[:controller] && !(route.name || '').end_with?('root')
             end
 
             if routes.present?
@@ -29,20 +29,11 @@ module Effective
           end
 
           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('/'),
-              ['effective', namespace, name].compact.join('/')
-            ]
+            matches = route_name_fallbacks()
 
             engines.each do |engine|
               routes = engine.routes.routes.select do |route|
-                (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
+                (matches & [route.defaults[:controller]]).present? && !(route.name || '').end_with?('root')
               end
 
               if routes.present?

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

@@ -7,6 +7,7 @@ module Effective
         case (type || sql_type(name))
         when :belongs_to
           { as: :select }.merge(search_form_field_collection(belongs_to(name)))
+
         when :belongs_to_polymorphic
           constant_pluralized = name.to_s.upcase
           constant = name.to_s.pluralize.upcase
@@ -18,7 +19,7 @@ module Effective
             collection ||= (klass.const_get(constant_pluralized) rescue nil) if defined?("#{klass.name}::#{constant_pluralized}")
           end
 
-          { as: :select, polymorphic: true, collection: collection }.compact
+          { as: :select, polymorphic: true, collection: (collection || []) }.compact
         when :has_and_belongs_to_many
           { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many

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

@@ -0,0 +1,31 @@
+module Effective
+  module Resources
+    module Generator
+
+      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
+
+      # Admin::Courses
+      def module_namespaced
+        (Array(namespaces).map { |name| name.to_s.classify } + [plural_name.classify.pluralize]) * '::'
+      end
+
+      def namespaced_class_name # 'Admin::Effective::Post'
+        (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
+      end
+
+      def namespaced_module_name # 'Admin::EffectivePosts'
+        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
+      end
+
+    end
+  end
+end

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

@@ -72,8 +72,7 @@ module Effective
       def _klass_by_name(input)
         input = input.to_s
         input = input[1..-1] if input.start_with?('/')
-
-        names = input.split('/')
+        names = input.split(%r{\/|::})
 
         # Classify based on namespace
         # acpa/admin/shirts

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

@@ -19,8 +19,27 @@ module Effective
         @initialized_name
       end
 
+      # There could be a few, this is the best guess.
       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
+        names = class_name.split('::')
+
+        if names.length > 1
+          Array(names[0]) + namespaces + Array(names[1..-1])
+        else
+          namespaces + names
+        end.compact.map(&:downcase).join('/').pluralize
+      end
+
+      def route_name_fallbacks
+        mod = class_name.split('::').first.downcase
+
+        matches = [
+          route_name.singularize,
+          [*namespace, plural_name].join('/'),
+          [*namespace, name].join('/'),
+          [mod, *namespace, plural_name].join('/'),
+          [mod, *namespace, name].join('/')
+        ]
       end
 
       def class_name # 'Effective::Post'
@@ -31,14 +50,6 @@ module Effective
         class_name.split('::')[0...-1].map { |name| name.underscore } * '/'
       end
 
-      def namespaced_class_name # 'Admin::Effective::Post'
-        (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
-      end
-
-      def namespaced_module_name # 'Admin::EffectivePosts'
-        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
-      end
-
       def namespace # 'admin/things'
         (namespaces.join('/') if namespaces.present?)
       end
@@ -55,6 +66,15 @@ module Effective
         name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
+      def tenant
+        return nil unless defined?(Tenant)
+        return nil unless klass.present?
+        return nil unless class_name.include?('::')
+
+        name = class_name.split('::').first.downcase.to_sym
+        name if Rails.application.config.tenants[name].present?
+      end
+
     end
   end
 end

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

@@ -1,25 +1,68 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Paths
 
+      def tenant_path
+        return unless tenant.present?
+        Tenant.engine_path(tenant).sub("#{Rails.root}/", '')
+      end
+
       def model_file
-        File.join('app/models', class_path.to_s, "#{name}.rb")
+        File.join(*[tenant_path, 'app/models', class_path, "#{name}.rb"].compact)
       end
 
       def controller_file
-        File.join('app/controllers', namespace.to_s, "#{plural_name}_controller.rb")
+        File.join(*[tenant_path, 'app/controllers', class_path, namespace, "#{plural_name}_controller.rb"].compact)
       end
 
       def datatable_file
-        File.join('app/datatables', namespace.to_s, "#{plural_name}_datatable.rb")
+        File.join(*[tenant_path, 'app/datatables', class_path, namespace, "#{plural_name}_datatable.rb"].compact)
       end
 
       def view_file(action = :index, partial: false)
-        File.join('app/views', namespace.to_s, (namespace.present? ? '' : class_path), plural_name, "#{'_' if partial}#{action}.html.haml")
+        File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      end
+
+      def view_file_path(action = :index)
+        File.join(*[class_path, namespace, plural_name, action].compact)
       end
 
       def flat_view_file(action = :index, partial: false)
-        File.join('app/views', plural_name, "#{'_' if partial}#{action}.html.haml")
+        File.join(*[tenant_path, 'app/views', class_path, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      end
+
+      def routes_file
+        File.join(*[tenant_path, 'config/routes.rb'].compact)
+      end
+
+      def abilities_file
+        File.join(*[tenant_path, 'app/models/', class_path, 'ability.rb'].compact)
+      end
+
+      def menu_file
+        File.join(*[tenant_path, 'app/views/layouts', class_path, '_navbar.html.haml'].compact)
+      end
+
+      def admin_menu_file
+        File.join(*[tenant_path, 'app/views/layouts', class_path, '_navbar_admin.html.haml'].compact)
+      end
+
+      # Used by render_resource_partial and render_resource_form to guess the view path
+      def view_paths
+        mod = class_name.split('::').first.downcase
+
+        [
+          [mod, *namespace, plural_name].join('/'),
+          [mod, *namespace, name].join('/'),
+          [*namespace, mod, plural_name].join('/'),
+          [*namespace, mod, name].join('/'),
+          [mod, plural_name].join('/'),
+          [mod, name].join('/'),
+          [*namespace, plural_name].join('/'),
+          [*namespace, name].join('/')
+        ]
       end
 
     end

data/lib/effective_resources.rb

@@ -31,4 +31,19 @@ module EffectiveResources
     (['Save', 'Continue', 'Add New'] & Array(config.default_submits)).inject({}) { |h, v| h[v] = true; h }
   end
 
+  # Utilities
+
+  def self.truthy?(value)
+    if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
+      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+    else
+      ::ActiveRecord::Type::Boolean.new.cast(value)
+    end
+  end
+
+  def self.deliver_method
+    config = Rails.application.config
+    (config.respond_to?(:active_job) && config.active_job.queue_adapter) ? :deliver_later : :deliver_now
+  end
+
 end

data/lib/effective_resources/engine.rb

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

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.7'.freeze
+  VERSION = '1.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,7 @@ files:
 - app/models/concerns/acts_as_wizard.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
+- app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb
 - app/models/effective/attribute.rb
@@ -155,6 +156,7 @@ files:
 - app/models/effective/resources/attributes.rb
 - app/models/effective/resources/controller.rb
 - app/models/effective/resources/forms.rb
+- app/models/effective/resources/generator.rb
 - app/models/effective/resources/init.rb
 - app/models/effective/resources/instance.rb
 - app/models/effective/resources/klass.rb