effective_resources 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dce484ce7125d0bf8cb2c928f983a34d37fcd10
-  data.tar.gz: e30f9a165335f8426d4f27e426599b498eb819f4
+  metadata.gz: 93a12b8c4e3ed0c19944e519a9744e2147df4dfd
+  data.tar.gz: ab6a80d74be88e195c5b456ec60d02637de9ddad
 SHA512:
-  metadata.gz: 2f2e2d4d18cdecc0587222de2a94cd5176cea93bf087ad19cf52eccd1db400d4bce66df706770b77a32f3b9f9e8070f5a166fa703f42a6456e751b2a7f155414
-  data.tar.gz: 39127cb6986dcf152ab0de1642ca81afb7c58beead37e77cf3888064083376844193851e812fd42876cd9d1cd07b2675a7d9035f6d08801b36be5944e83f81e8
+  metadata.gz: 95a9c3623d279ac5901cab849f8c67f8e980f70eba46f48d0259eb3fa7e8a80120f5c37b293ed64b75662f95601e70a30c341118b7746577444b7d3a98260d8a
+  data.tar.gz: 9b9a58a7686fab92936570e9add5116fcb45357ebfe829cbe0b306c5209aa64cff2c9e8e1f435a89dd8eccbdae1f2ec03da7412eeb2ede69aaa931f03051bd69

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

@@ -5,7 +5,11 @@ module Effective
     included do
       class << self
         def member_actions
-          @_effective_member_actions ||= {
+          @_effective_member_actions ||= {}
+        end
+
+        def _default_member_actions
+          {
             'Save' => { action: :save, data: { disable_with: 'Saving...' }},
             'Continue' => { action: :save, data: { disable_with: 'Saving...' }},
             'Add New' => { action: :save, data: { disable_with: 'Saving...' }}
@@ -95,6 +99,11 @@ module Effective
         end
       end
 
+      # Applies the default actions
+      def default_actions(args = {})
+        default_member_actions.each { |k, v| member_actions[k] = (args || {}).merge(v) }
+      end
+
       # page_title 'My Title', only: [:new]
       def page_title(label = nil, opts = {}, &block)
         raise 'expected a label or block' unless (label || block_given?)
@@ -279,21 +288,32 @@ module Effective
       render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
     end
 
+
+
+ # The block must implement a comparison between a and b and return an integer
+ # less than 0 when b follows a, 0 when a and b are equivalent, or an integer greater than 0 when a follows b.
+
     # Here we look at all available (class level) member actions, see which ones apply to the current resource
     # This feeds into the helper simple_form_submit(f)
     # Returns a Hash of {'Save': {data-disable-with: 'Saving...'}, 'Approve': {data-disable-with: 'Approve'}}
     def member_actions_for(obj)
-      self.class.member_actions.select do |commit, args|
+      actions = (self.class.member_actions.presence || self.class._default_member_actions)
+
+      actions.select do |commit, args|
+        args[:class] = args[:class].to_s
+
         (args.key?(:if) ? obj.instance_exec(&args[:if]) : true) &&
         (args.key?(:unless) ? !obj.instance_exec(&args[:unless]) : true)
       end.sort do |(commit_x, x), (commit_y, y)|
-        danger = (x[:class].to_s.index('danger') || -1) <=> (y[:class].to_s.index('danger') || -1)
-        danger = nil if danger == 0
+        # Sort to front
+        primary = (y[:class].include?('primary') ? 1 : 0) - (x[:class].include?('primary') ? 1 : 0)
+        primary = nil if primary == 0
 
-        save_action = (x[:action] == :save ? 0 : -1) <=> (y[:action] == :save ? 0 : -1)
-        save_action = nil if save_action == 0
+        # Sort to back
+        danger = (x[:class].include?('danger') ? 1 : 0) - (y[:class].include?('danger') ? 1 : 0)
+        danger = nil if danger == 0
 
-        danger || save_action || 0
+        primary || danger || actions.keys.index(commit_x) <=> actions.keys.index(commit_y)
       end.inject({}) do |h, (commit, args)|
         h[commit] = args.except(:action, :if, :unless, :redirect); h
       end
@@ -422,7 +442,7 @@ module Effective
     end
 
     def commit_action
-      self.class.member_actions[params[:commit].to_s] || self.class.member_actions['Save'] || raise("expected member_actions['Save'] to be present")
+      self.class.member_actions[params[:commit].to_s] || { action: :save }
     end
 
     # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method

data/app/helpers/effective_bootstrap3_helper.rb

@@ -52,7 +52,7 @@ module EffectiveBootstrap3Helper
   end
 
   def tab(label, &block)
-    controls = label.to_s.downcase.to_param
+    controls = label.to_s.parameterize.gsub('_', '-')
     active = (@_tab_active == :first || @_tab_active == label)
 
     @_tab_active = nil if @_tab_active == :first

data/app/helpers/effective_resources_helper.rb

@@ -58,6 +58,21 @@ module EffectiveResourcesHelper
     end
   end
 
+  # 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 = {:namespace => (resource.namespace.to_sym if resource.namespace.present?), resource.name.to_sym => instance_variable_get('@' + resource.name)}.compact
+
+    if lookup_context.template_exists?('form', controller._prefixes, :partial)
+      render 'form', atts
+    elsif lookup_context.template_exists?('form', resource.plural_name, :partial)
+      render "#{resource.plural_name}/form", atts
+    elsif lookup_context.template_exists?('form', resource.name, :partial)
+      render "#{resource.name}/form", atts
+    else
+      render 'form', atts  # Will raise the regular error
+    end
+  end
+
   def number_to_duration(duration)
     duration = duration.to_i
     value = duration.abs

data/app/views/application/edit.html.haml

@@ -13,4 +13,4 @@
       - if EffectiveResources.authorized?(controller, :destroy, @resource) && (path = resource.action_path(:destroy, @resource)).present?
         = link_to 'Delete', path, class: 'btn btn-sm btn-danger', data: { confirm: "Really delete #{@resource}?", method: :delete }
 
-  = render 'form', resource.name.to_sym => @resource
+  = render_resource_form(resource)

data/app/views/application/new.html.haml

@@ -1,6 +1,9 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name) if resource.name
 
-%h1= @page_title
+- if @resource
+  .row
+    .col-xs-8
+      %h1= @page_title
 
-- if resource.name.present? && instance_variable_get('@' + resource.name)
-  = render 'form', resource.name.to_sym => instance_variable_get('@' + resource.name)
+  = render_resource_form(resource)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.7.4'.freeze
 end

metadata

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