effective_resources 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6b2c73dd66b692135a690dc812d2dba68b4597
-  data.tar.gz: 16f8e2a01244f8b050a803199aec7133babfa717
+  metadata.gz: 287350db2bd99d6ee44fb82d7a31ff7a138b13d6
+  data.tar.gz: b624b6db3fdb2ae627fc201a36c53ec615f10bf3
 SHA512:
-  metadata.gz: bb8cf1b6bf38f2e8bb5648ff8e7853236925f362631bfcea009839d5e2a8f32e849b1040a514fac477c08190791edbfb1db1aed53e317045927836905b4b1de1
-  data.tar.gz: f12eb117c2ed212cae9a7335c57d92100c1828dcee1f736e3fe0eb8a5151645b028d7240c84721588a0a061bdd9adc90cb1a25458d2304f4a6c81bc394f737a6
+  metadata.gz: 8083ed649eee3b427b455487e21485ec01c8e46f242404eb6e551b470a165ed9d2793ec9f07ad1fa4b6eefbabf15d26583ea8559adcf60e2512ad78c08c0032c
+  data.tar.gz: fe26139eb7170c782064ab0c82d0dd0ad56114657f40972ef2e0bb33816a8b0111196983a1050483b01fb0da7638179d4345b6719c91ec08449aee712dc61f78

data/README.md

@@ -158,6 +158,23 @@ Call `simple_form_save(f)` like follows:
 
 to render just the `Save` button, with appropriate data-disable, title, etc.
 
+### Effective Form with
+
+```ruby
+
+= effective_form_with(model: user, url: user_settings_path) do |f|
+  = effective_submit(f)
+  = effective_save(f)
+
+  = effective_save(f) do
+    = f.save 'Save'
+    = f.save 'Another'
+
+  = effective_save(f, 'Save It')
+
+  = effective_submit(f) do
+    = f.save 'Will be appended'
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/helpers/effective_resources_helper.rb

@@ -23,18 +23,28 @@ module EffectiveResourcesHelper
       end
     end
 
+    # Group by class and render
+    buttons = actions.group_by { |_, opts| opts[:class] }.flat_map do |_, btns|
+      btns.map { |name, opts| form.save(name, opts) }
+    end.join.html_safe
+
+    effective_save(form) do
+      (block_given? ? capture(&block) : ''.html_safe) + buttons
+    end
+
+  end
+
+  def effective_save(form, label = 'Save', &block) # effective_bootstrap
     wrapper = (form.layout == :horizontal) ? { class: 'form-group form-actions row' } : { class: 'form-group form-actions' }
 
     content_tag(:div, wrapper) do
-      buttons = actions.group_by { |_, opts| opts[:class] }.flat_map do |_, grouped|
-        grouped.map { |name, opts| form.save(name, opts) } + ['']
-      end
-
-      if block_given?
-        buttons = [capture(&block), ''] + buttons
-      end
+      icon('spinner') + (block_given? ? capture(&block) : form.save(label, class: 'btn btn-primary'))
+    end
+  end
 
-      ([icon('spinner'), '', ''] + buttons).join(' ').html_safe
+  def effective_save_button(form, label = 'Save', &block)
+    content_tag(:div, class: 'form-actions') do
+      icon('spinner') + (block_given? ? capture(&block) : form.save(label, class: 'btn btn-primary'))
     end
   end
 

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

@@ -8,7 +8,7 @@ module Effective
         @_routes ||= (
           matches = [[namespace, plural_name].compact.join('/'), [namespace, name].compact.join('/')]
 
-          Rails.application.routes.routes.select do |route|
+          routes_engine.routes.routes.select do |route|
             matches.any? { |match| match == route.defaults[:controller] }
           end.inject({}) do |h, route|
             h[route.defaults[:action].to_sym] = route; h
@@ -16,6 +16,16 @@ module Effective
         )
       end
 
+      # Effective::Resource.new('effective/order', namespace: :admin)
+      def routes_engine
+        case class_name
+        when 'Effective::Order'
+          EffectiveOrders::Engine
+        else
+          Rails.application
+        end
+      end
+
       # Effective::Resource.new('admin/posts').action_path_helper(:edit) => 'edit_admin_posts_path'
       # This will return empty for create, update and destroy
       def action_path_helper(action)

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

@@ -41,7 +41,7 @@ module Effective
           klass = class_name.safe_constantize
 
           if klass.present?
-            @namespaces = names[0...index]
+            @namespaces ||= names[0...index]
             @model_klass = klass
             return klass
           end

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

@@ -24,7 +24,7 @@ module Effective
       end
 
       def namespaced_class_name # 'Admin::Effective::Post'
-        (Array(namespaces).map { |name| name.classify } + [class_name]) * '::'
+        (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
       end
 
       def namespace # 'admin/things'

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.12'.freeze
+  VERSION = '0.7.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 description: Make any controller an effective resource controller.
 email:
 - info@codeandeffect.com