effective_resources 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b64a2a72a925cc6d0932a5a5f60d490fbf6ae54
-  data.tar.gz: 65206626420879daa72dce237a217bc0193c8500
+  metadata.gz: 297715acf66f40c204bce59ebb58873f0499afaa
+  data.tar.gz: b9a0766cc92594a8f6f0cae06bfecd6aefdb24b5
 SHA512:
-  metadata.gz: e7283195596e3b271a42c37708d6ffc916ca38e565e9e716fcef1bb5d67bb0311ff90b40a73c7c53c6e54d587b8344be7f224435d5d6166992e81d148fa4e9c5
-  data.tar.gz: b28fdcca5a4eca2aeb83bff6d0100e31867a71a18eb7cd128081fc8b22a143a16a1f53c1d2a7020da4db9ceb835fc34fc970cf2d1ff39fab23fb91b0cd1f42cc
+  metadata.gz: baa1604c9325e9b8f0259ad4657dd209bc89e9a1dc9dfccdf106a1030f066d77a043896da6c430b19971c15d005bfba401d591c48b4f3057b552c9b83c7ae3d5
+  data.tar.gz: 68077fb078d34ad68d0a5122bcdc56fcddf567969d7a0bb432e8ac95cca6fde7aa56bd70f882c99456ddbe5e70106c9837e417fd0f1797f10ac5504efccce4b4

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

@@ -56,12 +56,12 @@ module Effective
       send(:instance_variable_set, "@#{resource_plural_name}", instance)
     end
 
-    private
-
     def effective_resource
       @_effective_resource ||= self.class.effective_resource
     end
 
+    private
+
     def resource_name # 'thing'
       effective_resource.name
     end

data/app/helpers/effective_resources_helper.rb

@@ -17,13 +17,15 @@ module EffectiveResourcesHelper
     actions = (controller.respond_to?(:effective_resource) ? controller.class : find_effective_resource).submits
     actions = permitted_resource_actions(form.object, actions)
 
-    submits = actions.map { |name, opts| form.button(:submit, name, opts.except(:action, :title, 'data-method', 'data-confirm')) }.join(' ').html_safe
+    submits = actions.map { |name, opts| form.button(:submit, name, opts.except(:action, :title, 'data-method', 'data-confirm')) }
 
     # 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?
       submits = submits.map { |submit| submit.sub(btn_class, '') }
     end
 
+    submits = submits.join(' ').html_safe
+
     wrapper_options = { class: 'form-actions' }.merge(options.delete(:wrapper_html) || {})
 
     content_tag(:div, wrapper_options) do

data/app/helpers/effective_resources_private_helper.rb

@@ -18,7 +18,9 @@ module EffectiveResourcesPrivateHelper
       action = opts[:action]
 
       # Transform data: { ... } hash into 'data-' keys
-      data.each { |k, v| opts["data-#{k}"] ||= v } if (data = opts.delete(:data))
+      if (data = opts.delete(:data))
+        data.each { |k, v| opts["data-#{k}"] ||= v }
+      end
 
       # Assign data method and confirm
       if effective_resource.member_post_actions.include?(action)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

metadata

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