effective_resources 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a59a4d537c8d4f363e2a5bb86758f2d0ad2b01
-  data.tar.gz: 9ce2460bcb27b1afe0d204f9d3528c6e92cbc6a5
+  metadata.gz: d09ead4e73ed9c1e6f9064c616de93aafe3b3cf8
+  data.tar.gz: 1ba9303908b33ef1ab90b1653063a42f95afbaaa
 SHA512:
-  metadata.gz: 33394fcfcde825f6383a5d74a19ae2349ab2d94e7bcff15e9f9ac80fdaa4ae583636b5424982695d3384283eddb538f9ce02df93f06b94a72105ee532badfa59
-  data.tar.gz: 1efe1addab462d093e0e25f52a5d08a90299ff8a48c5402a192fa9acb5317aa5bcd49d8d360365992bc081af3037286a66bea9694b0c5ba0b2cf80a2ae15b015
+  metadata.gz: c61d0ad9c674066d6ba6cabe188f82b24c213bda9a59cdb4e0252aa96acc65a8dd46ab24109f7af00149099debea5bf4b42217f9956da86a3fe84979c0429e55
+  data.tar.gz: 31ebc6075403542fb13f578ae8f2af58a3db4c2cd90d341f74f71d6c3a87cc2399c310ebeafe1489cde4107339630e539ed943152c06d00bdc4214b65ab5b3df

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

@@ -8,7 +8,7 @@ module Effective
         EffectiveResources.authorize!(self, :index, resource_klass)
         @page_title ||= resource_plural_name.titleize
 
-        self.resources ||= resource_scope.all
+        self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
         @datatable = resource_datatable(:index)
 
         run_callbacks(:resource_render)

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

@@ -45,8 +45,7 @@ module Effective
               resource.restore_attributes(['status', 'state'])
             end
 
-            flash.delete(:success)
-            flash.now[:danger] = flash_danger(resource, action, e: e)
+            flash.now[:danger] = resource_flash(:danger, resource, action, e: e)
             raise ActiveRecord::Rollback
           end
         end
@@ -55,14 +54,14 @@ module Effective
         false
       end
 
-      def resource_flash(status, resource, action)
+      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 if message.present?
+        return message.gsub('@resource', resource.to_s) if message.present?
 
         case status
         when :success then flash_success(resource, action)
-        when :danger then flash_danger(resource, action)
+        when :danger then flash_danger(resource, action, e: e)
         else
           raise "unknown resource flash status: #{status}"
         end

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

@@ -6,9 +6,7 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      name ||= resource.class.model_name.human.downcase
-
-      "Successfully #{action_verb(action)} #{name}"
+      "Successfully #{action_verb(action)} #{name || resource}".html_safe
     end
 
     # flash.now[:danger] = flash_danger(@post)
@@ -18,10 +16,11 @@ module Effective
       action ||= resource.respond_to?(:new_record?) ? (resource.new_record? ? :create : :update) : :save
       action = action.to_s.gsub('_', ' ')
 
-      name ||= resource.class.model_name.human.downcase
       messages = flash_errors(resource, e: e)
 
-      ["Unable to #{action} #{name}", (": #{messages}." if messages)].compact.join.html_safe
+      name ||= resource.to_s.presence
+
+      ["Unable to #{action}", (" #{name}" if name), (": #{messages}." if messages)].compact.join.html_safe
     end
 
     # flash.now[:danger] = "Unable to accept: #{flash_errors(@post)}"
@@ -32,7 +31,7 @@ module Effective
         if message[0] == message[0].upcase # If the error begins with a capital letter
           message
         elsif attribute == :base
-          "#{resource.class.model_name.human.downcase} #{message}"
+          message
         elsif attribute.to_s.end_with?('_ids')
           "#{resource.class.human_attribute_name(attribute.to_s[0..-5].pluralize).downcase} #{message}"
         else

data/app/helpers/effective_resources_helper.rb

@@ -100,7 +100,10 @@ module EffectiveResourcesHelper
 
   # When called from /admin/things/new.html.haml this will render 'admin/things/form', or 'things/form', or 'thing/form'
   def render_resource_form(resource, atts = {})
-    raise 'expected first argument to be an ActiveRecord::Base object' unless resource.kind_of?(ActiveRecord::Base)
+    unless resource.kind_of?(ActiveRecord::Base) || resource.class.ancestors.include?(ActiveModel::Model)
+      raise 'expected first argument to be an ActiveRecord or ActiveModel object'
+    end
+
     raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
 
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails