effective_resources 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5735d626c13c149f4c5e519769686ac75a3c9b
-  data.tar.gz: 5b86c718b4b6814616ffabf641befd81cb4b7897
+  metadata.gz: a0117aeab19438c015a73b6b2bc942ff97a4e5db
+  data.tar.gz: 3415edf3209e6c044cd78e0797e540368396512b
 SHA512:
-  metadata.gz: aced45e77272bc6492bda40dec68233e19d00bf04c7a391950b76c1a802a83d05c3406843bd36fa9a81e552042a2d153e483737a2680e2a49b057803dbee5505
-  data.tar.gz: 6f05a66c4a972d894dd598654362ff4f32abbf68c4351d38720e4fe16782b88071c2b67eedcb81b8ddf4e1fb824585954a3a2da17131f1dfe6587bcc6ac43cd0
+  metadata.gz: 9c2561f4d6256068aa36ac4f9cd69e34d67f0d5807eca9b7b56d6275277f6069d96958978a02afe1e81a784f7145377baf0bc832e8aaab0cb4ad6c526b8c1ddb
+  data.tar.gz: c35bee54d8ba06c58db0a6dccc2d963590d0830b97fd1956aef6b6927ba5710cdee6de7e6e735a41abb82d75bfa633dc507dcd3630b2607e4e23a7a804d62efe

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

@@ -12,7 +12,7 @@ module Effective
     included do
       define_actions_from_routes
       define_permitted_params_from_model
-      define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_error
+      define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
     end
 
     module ClassMethods

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

@@ -15,6 +15,10 @@ module Effective
         _insert_callbacks(names, blk) { |name, options| set_callback(:resource_after_save, :after, name, options) }
       end
 
+      def after_commit(*names, &blk)
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_after_commit, :after, name, options) }
+      end
+
       def after_error(*names, &blk)
         _insert_callbacks(names, blk) { |name, options| set_callback(:resource_error, :after, name, options) }
       end

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

@@ -27,7 +27,11 @@ module Effective
           Rails.logger.info "params.require(:#{effective_resource.name}).permit!"
         end
 
-        params.require(effective_resource.name).permit!
+        if params[effective_resource.name].present?
+          params.require(effective_resource.name).permit!
+        else
+          params.require((effective_resource.namespaces + [effective_resource.name]).join('_')).permit!
+        end
       end
 
       private

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

@@ -23,6 +23,9 @@ module Effective
             #reload_resource unless action == :destroy # Removed.
             render(action) # action.js.erb
           end
+        elsif response_body.present? # We might have done something weird like send_data in an after_save
+          format.html { flash.now[:success] ||= resource_flash(:success, resource, action) }
+          format.js { flash.now[:success] ||= resource_flash(:success, resource, action) }
         else # Default
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)

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

@@ -20,11 +20,12 @@ module Effective
       # This calls the appropriate member action, probably save!, on the resource.
       def save_resource(resource, action = :save, &block)
         save_action = ([:create, :update].include?(action) ? :save : action)
-
         raise "expected @#{resource_name} to respond to #{save_action}!" unless resource.respond_to?("#{save_action}!")
 
         resource.current_user ||= current_user if resource.respond_to?(:current_user=)
 
+        success = false
+
         ActiveRecord::Base.transaction do
           begin
             run_callbacks(:resource_before_save)
@@ -37,7 +38,7 @@ module Effective
 
             run_callbacks(:resource_after_save)
 
-            return true
+            success = true
           rescue => e
             if Rails.env.development?
               Rails.logger.info "  \e[31m\e[1mFAILED\e[0m\e[22m" # bold red
@@ -60,12 +61,13 @@ module Effective
             else
               raise(e) # This is a real error that should be sent to 500. Client should not see the message.
             end
-
           end
         end
 
-        run_callbacks(:resource_error)
-        false
+        run_callbacks(:resource_error) unless success
+        run_callbacks(:resource_after_commit)
+
+        success
       end
 
       def resource_flash(status, resource, action, e: nil)

data/app/helpers/effective_resources_helper.rb

@@ -57,7 +57,10 @@ module EffectiveResourcesHelper
   # locals: {} render locals
   # you can also pass all action names and true/false such as edit: true, show: false
   def render_resource_actions(resource, atts = {}, &block)
-    raise 'expected first argument to be an ActiveRecord::Base object or Array of objects' unless resource.kind_of?(ActiveRecord::Base) || resource.kind_of?(Class) || resource.kind_of?(Array)
+    unless resource.kind_of?(ActiveRecord::Base) || resource.kind_of?(Class) || resource.kind_of?(Array) || resource.class.ancestors.include?(ActiveModel::Model)
+      raise 'expected first argument to be an ActiveRecord::Base object or Array of objects' 
+    end
+    
     raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
 
     btn_class = atts[:btn_class]

data/app/models/concerns/acts_as_archived.rb

@@ -62,7 +62,7 @@ module ActsAsArchived
 
   included do
     scope :archived, -> { where(archived: true) }
-    scope :unarchived, -> { where(archived: false) }
+    scope :unarchived, -> { where(archived: [false, nil]) }
 
     effective_resource do
       archived :boolean,  permitted: false

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

@@ -49,10 +49,14 @@ module Effective
         names = input.split('/')
 
         0.upto(names.length-1) do |index|
-          class_name = (names[index..-1].map { |name| name.classify } * '::')
-
+          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

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.2.10'.freeze
+  VERSION = '1.2.11'.freeze
 end

metadata

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