effective_resources 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e60422542e4fd0579203430168370a0469aca1a4
-  data.tar.gz: 2768849db26e1cdb04f66a06806acd2026973113
+  metadata.gz: 63c9976e91dbea32eaa92ee0213e89a5ec269cd3
+  data.tar.gz: b48931b04be6d3e2efd48a4fb180bade8b7287c9
 SHA512:
-  metadata.gz: 21c3d13331bc4eca088ee77b9ba1f0a6ff160f64f7373f190371d90eaadd7060048f1e8f1e471c93515862ac7b7bea0f1dd4be3f10ec38d9d88dbce95ad8f56a
-  data.tar.gz: eabc01995fafbb7d4a200336964f34c292341d3b6aaf8d50cddccb0d6fb6a17c2641df45c2fae00b8853a4a7b928daf9affea1389f56ca9e44bfa6cc380136f1
+  metadata.gz: 4c7dec755e65f89fada642b273f407d3c8c293e078fd705ac83e61efec021d0e3de154f9bd9b2318b980a711af0fee991c74ae39dc9e71461dbdf69dd535fd6d
+  data.tar.gz: eaeac90e0905b8cf25007007a77bb0a03e7d8f7f5d9cfd42bb9c0e675c74fc11adc715d45fd0341aa8aadb0995f84cc56d56b60d57ac1d935498842ebca4feec

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

@@ -13,16 +13,22 @@ module Effective
         end
       end
 
-      define_callbacks :resource_render
+      define_callbacks :resource_render, :resource_save, :resource_error
     end
 
     module ClassMethods
 
       # https://github.com/rails/rails/blob/v5.1.4/actionpack/lib/abstract_controller/callbacks.rb
       def before_render(*names, &blk)
-        _insert_callbacks(names, blk) do |name, options|
-          set_callback(:resource_render, :before, name, options)
-        end
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_render, :before, name, options) }
+      end
+
+      def after_save(*names, &blk)
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_save, :after, name, options) }
+      end
+
+      def after_error(*names, &blk)
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_error, :after, name, options) }
       end
 
       # Add the following to your controller for a simple member action
@@ -304,6 +310,7 @@ module Effective
       resource_klass.transaction do
         begin
           resource.public_send("#{action}!") || raise("failed to #{action} #{resource}")
+          run_callbacks(:resource_save)
           return true
         rescue => e
           flash.delete(:success)
@@ -312,6 +319,7 @@ module Effective
         end
       end
 
+      run_callbacks(:resource_error)
       false
     end
 

data/app/helpers/effective_resources_helper.rb

@@ -110,11 +110,7 @@ module EffectiveResourcesHelper
 
   def glyphicon_to(icon, path, options = {})
     content_tag(:a, options.merge(href: path)) do
-      if icon.to_s.start_with?('glyphicon-')
-        content_tag(:span, '', class: "glyphicon #{icon}")
-      else
-        content_tag(:span, '', class: "glyphicon glyphicon-#{icon}")
-      end
+      glyphicon_tag(icon)
     end
   end
   alias_method :bootstrap_icon_to, :glyphicon_to

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

@@ -56,7 +56,9 @@ module Effective
         if res.max_id > max_id
           { as: :string }
         else
-          if res.klass.unscoped.respond_to?(:datatables_filter)
+          if res.klass.unscoped.respond_to?(:datatables_scope)
+            { collection: res.klass.datatables_scope.map { |obj| [obj.to_s, obj.to_param] } }
+          elsif res.klass.unscoped.respond_to?(:datatables_filter)
             { collection: res.klass.datatables_filter.map { |obj| [obj.to_s, obj.to_param] } }
           elsif res.klass.unscoped.respond_to?(:sorted)
             { collection: res.klass.sorted.map { |obj| [obj.to_s, obj.to_param] } }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails