effective_resources 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a2e065a385451ee58c4cf054e18ffb3b2d67618aef4c6e3a417b221b7a6839
-  data.tar.gz: fa379b94d613fa510aa5261c44877a344dfff0ac6de0202a64c90d692b9157aa
+  metadata.gz: 7a4d2d6652da6f85e884ceb383ff012fda17863ad4b84c7cfaf5fec76a8632af
+  data.tar.gz: 155b5a31cc14908ea944978d940d550227bcb823e14bbc42e6f34108ece06c35
 SHA512:
-  metadata.gz: a0ed3d10e90f30f5a7b4dd9d837fe21ca6d07c557850d1931ec97c839fbb39a78e11fa795331af247cc5fa929fccdf5aec3f6f05dfd8b68d35e3e0682de0c732
-  data.tar.gz: 53d62815fc3e7fa7718fa1094b7fcb721d772631b1ec1899a9ad7a4f601705091b9efba194b59c4ebead8f0a260b9791b0b83cce9d4962a523361abe46697ef0
+  metadata.gz: 4227d0379585019dafae032ac3300cc98ceed87f81bfcb45a35ab9b10c5e15f18dd7e6420b1973bef3e1567dd8ac71d78049b6ec6711153899568ed0d3398fc3
+  data.tar.gz: 700279f4126eefafe9b14d06b4dea16b9cf49c1f2b21fd472a17a80e3e2863d2f5d6318f481d3f862653d95f753960f5a0fbc79802301e3879422cec89866df8

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.first
+        message = error.respond_to?(:message) ? error.message : error.last
+
         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,14 +185,16 @@ 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
 
   # Tableize attributes

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 },
@@ -44,7 +46,7 @@ module ActsAsSlugged
 
   # 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/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/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'

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

@@ -22,6 +22,22 @@ module Effective
         File.join('app/views', plural_name, "#{'_' if partial}#{action}.html.haml")
       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
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.7'.freeze
+  VERSION = '1.7.8'.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.7.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails