effective_resources 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060fa4ec7b7a834895eb20614d580d1bdd7ed0da
-  data.tar.gz: 23a2c6b34612eab663d670af3704e4fae6c56f8a
+  metadata.gz: 242ed65ef4c998474921ac8dfac92d10e378278f
+  data.tar.gz: 47a06cd06ed40ec273e0b39a6c891b7ee7ffdbea
 SHA512:
-  metadata.gz: 052ba0b9bb23756a8562b2218174b769223076f9a5e78d3b59a1cf202f4e616cce988bb2924aa8a32b22ec1ab8b78dc05374bef019aa682c26c662cbeb5c24f8
-  data.tar.gz: e46b35c8bb32e8c5d47a52d7f1239e7d127c58a6c29457c99c203c5e0186cd973caec3df4f7ee8135b9550bcddb34ea490eed2c4afb3c30d4994416b89362a2d
+  metadata.gz: 1976ae2d176a347561a8e46be0d0d807bc76d0b28051cbc366e1df787597e84d3c86fe4dab9bc9a50e4401a164cfe36189f4754919ae0a6c75da355ea7572907
+  data.tar.gz: d60fb69be39ab249983e1f0c0de0be33d08c8bdeecc7349492f702285b938500638b6de3a6362b62e28e31323ace75d57fad8b5c7636e0f0551b09c3640540de

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

@@ -7,8 +7,8 @@ module Effective
         def member_actions
           @_effective_member_actions ||= {
             'Save' => { action: :save, data: { disable_with: 'Saving...' }},
-            'Save and Continue' => { action: :save, data: { disable_with: 'Saving...' }},
-            'Save and Add New' => { action: :save, data: { disable_with: 'Saving...' }}
+            'Continue' => { action: :save, data: { disable_with: 'Saving...' }},
+            'Add New' => { action: :save, data: { disable_with: 'Saving...' }}
           }
         end
       end
@@ -262,7 +262,18 @@ module Effective
       self.class.member_actions.select do |commit, args|
         (args.key?(:if) ? obj.instance_exec(&args[:if]) : true) &&
         (args.key?(:unless) ? !obj.instance_exec(&args[:unless]) : true)
-      end.inject({}) { |h, (commit, args)| h[commit] = args.except(:action, :if, :unless, :redirect); h }
+      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
+
+        save_action = (x[:action] == :save ? 0 : -1) <=> (y[:action] == :save ? 0 : -1)
+        save_action = nil if save_action == 0
+
+        danger || save_action || 0
+      end.inject({}) do |h, (commit, args)|
+        Rails.logger.info commit
+        h[commit] = args.except(:action, :if, :unless, :redirect); h
+      end
     end
 
     protected

data/app/helpers/effective_resources_helper.rb

@@ -3,18 +3,41 @@ module EffectiveResourcesHelper
   def simple_form_submit(form, options = {class: 'form-actions'}, &block)
     resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
+    # Apply btn-primary to the first item, only if the class isn't already present
     actions = if controller.respond_to?(:member_actions_for)
-      controller.member_actions_for(form.object)
+      controller.member_actions_for(form.object).transform_values.with_index do |opts, index|
+        if opts[:class].present?
+          opts
+        else
+          opts[:class] = "btn #{index == 0 ? 'btn-primary' : 'btn-default'}"
+        end
+
+        opts
+      end
+
     else
       {}.tap do |actions|
-        actions['Save'] = { data: { disable_with: 'Saving...' }}
-        actions['Save and Continue'] = { data: { disable_with: 'Saving...' }} if resource.index_path(check: true)
-        actions['Save and Add New'] = { data: { disable_with: 'Saving...' }} if resource.new_path(check: true)
+        actions['Save'] = { class: 'btn btn-primary', data: { disable_with: 'Saving...' }}
+        actions['Continue'] = { class: 'btn btn-default', data: { disable_with: 'Saving...' }} if resource.index_path(check: true)
+        actions['Add New'] = { class: 'btn btn-default', data: { disable_with: 'Saving...' }} if resource.new_path(check: true)
       end
     end
 
     content_tag(:div, class: options[:class]) do
-      (actions.map { |action| form.button(:submit, *action.to_a) } + [(capture(&block) if block_given?)]).compact.join(' ').html_safe
+      buttons = actions.group_by { |(_, args)| args[:class] }.flat_map do |_, action|
+        action.map { |action| form.button(:submit, *action) } + ['']
+      end
+
+      # I think this is a bug. I can't override default button class when passing my own class: variable. it merges them.
+      if (btn_class = SimpleForm.button_class).present?
+        buttons = buttons.map { |button| button.sub(btn_class, '') }
+      end
+
+      if block_given?
+        buttons = [capture(&block), ''] + buttons
+      end
+
+      result = buttons.join(' ').html_safe
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.6.4'.freeze
 end

metadata

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