effective_resources 1.0.19 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1f8af977978cf1bb45d0cc6a737396cba17f55
-  data.tar.gz: b57662a6e2e9934e8824b1b1f9a3d209eaeef8d6
+  metadata.gz: 962a290756ff82a2d328b486f9d381cb7f97568b
+  data.tar.gz: 3059d2ba54c29292b5b704ca2fde4b40feaf3969
 SHA512:
-  metadata.gz: 63bd096d0c815c10a817790ff5245ef946e41cb4b1beec69d3f9eb2461a79824867e46a8267efa44a043a8e337002e9323badf0dd5102d82c508b6cc831d63bf
-  data.tar.gz: d240fa175ec01452e98214ad4e28dc2ee2fef2f43ed74349520ab7268546192e95c435c005e977d8faa66b3ad133ffea97ebf11d38834336cf54664568b35e7b
+  metadata.gz: c87bbabac3cc1e732d1e673a0462068ba9b13623c5e4ed3418c5b51443684063ac8217c2e15238136c0d2d7c6c2a132319b16ac9a7e4eec9112269b0a0a36b59
+  data.tar.gz: 4a1cf91f0d0cf9d593658df108f80831f4fee7ff5d30af83a113f4b637dd779879b81add4869525cfed905822db94d666e4067bf56d95837fab5e9cb8d643a20

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

@@ -37,6 +37,10 @@ module Effective
         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
@@ -86,12 +90,14 @@ module Effective
         when Symbol
           effective_resource.klass.send(@_effective_resource_scope)
         when nil
-          effective_resource.klass.all
+          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
 
-        raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}.") unless relation.kind_of?(ActiveRecord::Relation)
+        unless relation.kind_of?(ActiveRecord::Relation) || effective_resource.active_model?
+          raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}.")
+        end
 
         relation
       )

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

@@ -19,6 +19,17 @@ module Effective
         params.require(effective_resource.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
+        if Rails.env.development?
+          Rails.logger.info "Effective::CrudController#resource_permitted_params:"
+          Rails.logger.info "params.require(:#{effective_resource.name}).permit!"
+        end
+
+        params.require(effective_resource.name).permit!
+      end
+
       private
 
       def permitted_params_for(resource, namespaces = [])

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

@@ -40,8 +40,16 @@ module Effective
         flash.delete(:success)
         flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
+        redirect_flash if specific_redirect_path?(:error)
+
         run_callbacks(:resource_render)
 
+        if specific_redirect_path?(:error)
+          format.html { redirect_to resource_redirect_path(:error) }
+          format.js { redirect_to resource_redirect_path(:error) }
+          return
+        end
+
         # HTML responder
         case action.to_sym
         when :create
@@ -50,8 +58,7 @@ module Effective
           format.html { render :edit }
         when :destroy
           format.html do
-            flash.now[:danger] = nil
-            flash[:danger] = resource_flash(:danger, resource, action)
+            redirect_flash
             redirect_to(resource_redirect_path(action))
           end
         else # member action
@@ -70,9 +77,7 @@ module Effective
               render :show
             else
               @page_title ||= resource.to_s
-              flash.now[:danger] = nil
-              flash[:danger] = resource_flash(:danger, resource, action)
-
+              redirect_flash
               redirect_to(referer_redirect_path || resource_redirect_path(action))
             end
           end
@@ -82,7 +87,16 @@ module Effective
           view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
           render(view, locals: { action: action }) # action.js.erb
         end
+      end
+
+      private
+
+      def redirect_flash
+        return unless flash.now[:danger].present?
 
+        danger = flash.now[:danger]
+        flash.now[:danger] = nil
+        flash[:danger] ||= danger
       end
 
     end

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

@@ -29,6 +29,10 @@ module Effective
         klass.ancestors.include?(ActiveRecord::Base)
       end
 
+      def active_model?
+        klass.ancestors.include?(ActiveModel::Model)
+      end
+
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.19'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect