effective_resources 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35fdc868ed7c8871810c8d041776f9d9c264e63b
-  data.tar.gz: 4c097429d190542812d01b2dcc2bd4d7cffc6653
+  metadata.gz: 326b467ef37eca6b23e074d9e63d538ebf5f53b8
+  data.tar.gz: 8ab92828dc5506e8fa805adf33473dbaaa01ccff
 SHA512:
-  metadata.gz: 2e85f37e03a17f55b9db2dbe65882ce42ed37503e7c75efe5e4f14aafd4402337eeae6ddca2711ea58126370699180c9f64a42ac1cfec6f7464e8fa14e2b9bc2
-  data.tar.gz: 5bf2bdf611049d0d1a32e52aebefb6620f79321913b30fbcf1a65c763c452e784e7d9b5300fac09628a51e7bd782c9dc26078df6b1db33523ca3b3214ae96a7f
+  metadata.gz: 8dbd78d7467af34c9938cb99e43e0bfc5f947397e3c40fb66e9d4ffc02d634039e47451b7961f0b9571510d1610eb44e4b7429e658a495e0822a9a555fa9a300
+  data.tar.gz: 96e77365add2fb7a2af01cca14ac84648c0e2a70f369ee3bd1a485227813319faeafc2b631f5e36bc9f526282bc2fcf10e0dda586537d6fed172b3f1288e6314

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

@@ -27,7 +27,7 @@ module Effective
           end
 
           if effective_resource.scope?(action)
-            self.resources ||= resource_scope.send(action)
+            self.resources ||= resource_scope.public_send(action)
           end
 
           self.resources ||= resource_scope.all
@@ -44,8 +44,8 @@ module Effective
       def page_title(label = nil, opts = {}, &block)
         raise 'expected a label or block' unless (label || block_given?)
 
-        instance_eval do
-          before_action(opts) { @page_title ||= (block_given? ? instance_eval(&block) : label) }
+        instance_exec do
+          before_action(opts) { @page_title ||= (block_given? ? instance_exec(&block) : label) }
         end
       end
 
@@ -61,17 +61,9 @@ module Effective
       def resource_scope(obj = nil, opts = {}, &block)
         raise 'expected a proc or block' unless (obj.respond_to?(:call) || block_given?)
 
-        instance_eval do
+        instance_exec do
           before_action(opts) do
-            @_effective_resource_scope ||= (
-              if block_given?
-                instance_exec(&block)
-              elsif obj.respond_to?(:call)
-                instance_exec(&obj)
-              else
-               obj
-              end
-            )
+            @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj))
           end
         end
       end
@@ -158,10 +150,10 @@ module Effective
         flash[:danger] = "Unable to delete #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
       end
 
-      if request.referer.present? && !request.referer.include?(send(effective_resource.show_path))
+      if request.referer.present? && !request.referer.include?(effective_resource.show_path)
         redirect_to(request.referer)
       else
-        redirect_to(send(resource_index_path))
+        redirect_to(resource_index_path)
       end
     end
 
@@ -179,17 +171,13 @@ module Effective
 
         referer = request.referer.to_s
 
-        edit_path = send(effective_resource.edit_path, resource) if respond_to?(effective_resource.edit_path)
-        new_path = effective_resource.new_path if respond_to?(effective_resource.new_path)
-        show_path = effective_resource.show_path if respond_to?(effective_resource.show_path)
-
-        if edit_path && referer.end_with?(edit_path)
+        if resource_edit_path && referer.end_with?(resource_edit_path)
           @page_title ||= "Edit #{resource}"
           render :edit
-        elsif new_path && referer.end_with?(new_path)
+        elsif resource_new_path && referer.end_with?(resource_new_path)
           @page_title ||= "New #{resource_name.titleize}"
           render :new
-        elsif show_path && referer.end_with?(show_path)
+        elsif resource_show_path && referer.end_with?(resource_show_path)
           @page_title ||= resource_name.titleize
           render :show
         else
@@ -197,7 +185,7 @@ module Effective
           flash[:danger] = flash.now[:danger]
 
           if referer.present? && (Rails.application.routes.recognize_path(URI(referer).path) rescue false)
-            redirect_back fallback_location: resource_redirect_path
+            redirect_back(fallback_location: resource_redirect_path)
           else
             redirect_to(resource_redirect_path)
           end
@@ -230,18 +218,37 @@ module Effective
 
     def resource_redirect_path
       case params[:commit].to_s
-      when 'Save'               ; send(effective_resource.edit_path, resource)
-      when 'Save and Add New'   ; send(effective_resource.new_path)
-      when 'Save and Continue'  ; send(resource_index_path)
+      when 'Save'
+        [resource_edit_path, resource_show_path, resource_index_path].compact.first
+      when 'Save and Add New'
+        [resource_new_path, resource_index_path].compact.first
+      when 'Save and Continue'
+        resource_index_path
       when 'Save and Return'
-        request.referer.present? ? request.referer : send(resource_index_path)
+        request.referer.present? ? request.referer : resource_index_path
       else
-        send((effective_resource.show_path(check: true) || effective_resource.edit_path), resource)
+        [resource_edit_path, resource_show_path, resource_index_path].compact.first
       end
     end
 
     def resource_index_path
-      effective_resource.index_path
+      send(effective_resource.index_path) if effective_resource.index_path(check: true)
+    end
+
+    def resource_new_path
+      send(effective_resource.new_path) if effective_resource.new_path(check: true)
+    end
+
+    def resource_edit_path
+      send(effective_resource.edit_path, resource) if effective_resource.edit_path(check: true)
+    end
+
+    def resource_show_path
+      send(effective_resource.show_path, resource) if effective_resource.show_path(check: true)
+    end
+
+    def resource_destroy_path
+      send(effective_resource.destroy_path, resource) if effective_resource.destroy_path(check: true)
     end
 
     def resource # @thing
@@ -303,7 +310,7 @@ module Effective
         end
 
         unless relation.kind_of?(ActiveRecord::Relation)
-          raise("unable to build resource relation for #{effective_resource.klass || 'unknown klass'}.")
+          raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}.")
         end
 
         relation
@@ -322,6 +329,5 @@ module Effective
       ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params'].find { |name| respond_to?(name, true) } || 'params'
     end
 
-
   end
 end

data/app/helpers/effective_resources_helper.rb

@@ -1,18 +1,20 @@
 module EffectiveResourcesHelper
 
-  def simple_form_submit(form, options = {class: 'text-right'}, &block)
-    content_tag(:p, class: options[:class]) do
+  def simple_form_submit(form, options = {class: 'form-actions'}, &block)
+    resource = (@_effective_resource || Effective::Resource.new(controller_path))
+
+    content_tag(:div, class: options[:class]) do
       [
         form.button(:submit, 'Save', data: { disable_with: 'Saving...' }),
-        form.button(:submit, 'Save and Continue', data: { disable_with: 'Saving...' }),
-        form.button(:submit, 'Save and Add New', data: { disable_with: 'Saving...' }),
+        (form.button(:submit, 'Save and Continue', data: { disable_with: 'Saving...' }) if resource.index_path(check: true)),
+        (form.button(:submit, 'Save and Add New', data: { disable_with: 'Saving...' }) if resource.new_path(check: true)),
         (capture(&block) if block_given?)
       ].compact.join(' ').html_safe
     end
   end
 
-  def simple_form_save(form, options = {class: 'text-right'}, &block)
-    content_tag(:p, class: options[:class]) do
+  def simple_form_save(form, options = {class: 'form-actions'}, &block)
+    content_tag(:div, class: options[:class]) do
       form.button(:submit, 'Save', data: { disable_with: 'Saving...' }) + (capture(&:block) if block_given?)
     end
   end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.4.7'.freeze
+  VERSION = '0.4.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails