effective_resources 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1383850485a3ad9051e04e93dd836a381b9b1f0c
-  data.tar.gz: e745b62f182c4ea7e7610b0b752d8cc2c5fe525e
+  metadata.gz: 8f976ed56d3a007b2b1946b8620fc24b8c73dddc
+  data.tar.gz: 21034761b686916da76ccb02fda5d02f3ba5ca89
 SHA512:
-  metadata.gz: 63d8afb4eb59ee8275ab211f58bc4a5fdbf67b2cfcc7fc7ff2edc068456ee7ce558f10d61f0009fd94565dc8022ee34b4d7d231d033144cf8025c9f2f1ba25e2
-  data.tar.gz: 059dd7b7c19f4680c9e58dc4a60ffd412697a498cf28a5104fb1b0be04a174cdb9d2a76d6121c84ae6cd9933d7a8436ee58e3ec800d0e5da0f89d3646f03203b
+  metadata.gz: a1c6926084cfa8ed8b9e963f99b1b73601c26995b3ecf0f52f8887516902394c06bd362ce14f7bffa4ed3acad4d7fb899f737b289c4fb44404edf401405d4c99
+  data.tar.gz: 166df66e1f56b62ce979f53eeec17a81b9c736ab964019f4c2c832808806f47ddd91edba1f981bdbc795ebb33f24894acca310dc5dfa645a44110fb271fa8375

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

@@ -166,9 +166,22 @@ module Effective
       self.resource ||= resource_scope.new
 
       self.resource.assign_attributes(
-        params.to_unsafe_h.except(:controller, :action).select { |k, v| resource.respond_to?("#{k}=") }
+        params.to_unsafe_h.except(:controller, :action, :id).select { |k, v| resource.respond_to?("#{k}=") }
       )
 
+      if params[:duplicate_id]
+        duplicate = resource_scope.find(params[:duplicate_id])
+        EffectiveResources.authorize!(self, :show, duplicate)
+
+        self.resource = duplicate_resource(duplicate)
+        raise "expected duplicate_resource to return an unsaved new #{resource_klass} resource" unless resource.kind_of?(resource_klass) && resource.new_record?
+
+        if (message = flash[:success].to_s).present?
+          flash.delete(:success)
+          flash.now[:success] = "#{message.chomp('.')}. Adding another #{resource_name.titleize} based on previous."
+        end
+      end
+
       @page_title ||= "New #{resource_name.titleize}"
       EffectiveResources.authorize!(self, :new, resource)
 
@@ -188,11 +201,6 @@ module Effective
       resource.created_by ||= current_user if resource.respond_to?(:created_by=)
 
       if save_resource(resource, action)
-        if add_new_resource_action?
-          render_add_new_resource! and return
-        end
-
-        # Normal redirect
         flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
       else
@@ -231,11 +239,6 @@ module Effective
       resource.assign_attributes(send(resource_params_method_name))
 
       if save_resource(resource, action)
-        if add_new_resource_action?
-          render_add_new_resource! and return
-        end
-
-        # Normal save
         flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
       else
@@ -308,7 +311,6 @@ module Effective
       render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
     end
 
-
     protected
 
     # This calls the appropriate member action, probably save!, on the resource.
@@ -324,6 +326,8 @@ module Effective
           run_callbacks(:resource_save)
           return true
         rescue => e
+          resource.restore_attributes(['status', 'state'])
+
           flash.delete(:success)
           flash.now[:danger] = flash_danger(resource, action, e: e)
           raise ActiveRecord::Rollback
@@ -334,54 +338,51 @@ module Effective
       false
     end
 
+    # Should return a new resource based on the passed one
+    def duplicate_resource(resource)
+      resource.dup
+    end
+
     def resource_redirect_path
-      return instance_exec(&commit_action[:redirect]) if commit_action[:redirect].respond_to?(:call)
-
-      commit_action_redirect = case commit_action[:redirect]
-        when :index ; resource_index_path
-        when :edit  ; resource_edit_path
-        when :show  ; resource_show_path
-        when :new   ; resource_new_path
-        when :back  ; referer_redirect_path
-        when nil    ; nil
-        else        ; resource_member_action_path(commit_action[:action])
+      redirect = commit_action[:redirect].respond_to?(:call) ? instance_exec(&commit_action[:redirect]) : commit_action[:redirect]
+
+      commit_action_redirect = case redirect
+        when :index     ; resource_index_path
+        when :edit      ; resource_edit_path
+        when :show      ; resource_show_path
+        when :new       ; resource_new_path
+        when :duplicate ; resource_duplicate_path
+        when :back      ; referer_redirect_path
+        when :save      ; [resource_edit_path, resource_show_path].compact.first
+        when Symbol     ; resource_action_path(commit_action[:action])
+        when String     ; redirect
+        else            ; nil
       end
 
       return commit_action_redirect if commit_action_redirect.present?
 
       case params[:commit].to_s
       when 'Save'
-        [resource_edit_path, resource_show_path, resource_index_path].compact.first
+        [resource_edit_path, resource_show_path, resource_index_path]
       when 'Save and Add New', 'Add New'
-        [resource_new_path, resource_index_path].compact.first
+        [resource_new_path, resource_index_path]
+      when 'Duplicate'
+        [resource_duplicate_path, resource_index_path]
       when 'Continue', 'Save and Continue'
-        resource_index_path
+        [resource_index_path]
       else
-        [referer_redirect_path, resource_index_path].compact.first
-      end.presence || root_path
-    end
-
-    def add_new_resource_action?
-      (add_new_resource_params_method_name.present? && resource_redirect_path == resource_new_path)
-    end
-
-    def render_add_new_resource!
-      attributes = send(add_new_resource_params_method_name).except(:id, :created_at, :updated_at)
-      self.resource = resource_scope.new(attributes)
-
-      @page_title = "New #{resource_name.titleize}"
-      flash.now[:success] ||= flash_success(resource) + ". Adding another #{resource_name.titleize} based on previous."
-
-      render(:new)
-      true
+        [referer_redirect_path, resource_edit_path, resource_show_path, resource_index_path]
+      end.compact.first.presence || root_path
     end
 
     def referer_redirect_path
-      return if (resource && resource.destroyed? && request.referer.to_s.include?("/#{resource.to_param}"))
+      url = request.referer.to_s
 
-      if request.referer.present? && (Rails.application.routes.recognize_path(URI(request.referer.to_s).path) rescue false)
-        request.referer.to_s
-      end
+      return if (resource && resource.destroyed? && url.include?("/#{resource.to_param}"))
+      return if url.include?('duplicate_id=')
+      return unless (Rails.application.routes.recognize_path(URI(url).path) rescue false)
+
+      url
     end
 
     def resource_index_path
@@ -392,6 +393,10 @@ module Effective
       effective_resource.action_path(:new)
     end
 
+    def resource_duplicate_path
+      effective_resource.action_path(:new, duplicate_id: resource.id)
+    end
+
     def resource_edit_path
       effective_resource.action_path(:edit, resource)
     end
@@ -404,7 +409,7 @@ module Effective
       effective_resource.action_path(:destroy, resource)
     end
 
-    def resource_member_action_path(action)
+    def resource_action_path(action)
       effective_resource.action_path(action.to_sym, resource)
     end
 
@@ -490,10 +495,5 @@ module Effective
       ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params'].find { |name| respond_to?(name, true) } || 'params'
     end
 
-    def add_new_resource_params_method_name
-      method_name = resource_params_method_name
-      "add_new_#{method_name}" if respond_to?("add_new_#{method_name}", true)
-    end
-
   end
 end

data/app/helpers/effective_resources_helper.rb

@@ -3,11 +3,7 @@ module EffectiveResourcesHelper
   def effective_submit(form, options = {}, &block) # effective_bootstrap
     resource = (controller.class.respond_to?(:effective_resource) ? controller.class.effective_resource : Effective::Resource.new(controller_path))
     actions = resource.submits_for(form.object, controller: controller)
-
-    # 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
+    buttons = actions.map { |name, opts| form.save(name, opts) }.join.html_safe
 
     form.submit('', options) do
       (block_given? ? capture(&block) : ''.html_safe) + buttons
@@ -19,23 +15,17 @@ module EffectiveResourcesHelper
     resource = (controller.class.respond_to?(:effective_resource) ? controller.class.effective_resource : Effective::Resource.new(controller_path))
     actions = resource.submits_for(form.object, controller: controller)
 
-    wrapper_options = { class: 'form-actions' }.merge(options.delete(:wrapper_html) || {})
-
-    content_tag(:div, wrapper_options) do
-      buttons = actions.group_by { |_, args| args[:class] }.flat_map do |_, action|
-        action.map { |action| form.button(:submit, *action) } + ['']
-      end
+    buttons = actions.map { |action| form.button(:submit, *action) }
 
-      # I think this is a bug. I can't override default button class when passing my own class: variable. it merges them.
-      if defined?(SimpleForm) && (btn_class = SimpleForm.button_class).present?
-        buttons = buttons.map { |button| button.sub(btn_class, '') }
-      end
+    # I think this is a bug. I can't override default button class when passing my own class: variable. it merges them.
+    if defined?(SimpleForm) && (btn_class = SimpleForm.button_class).present?
+      buttons = buttons.map { |button| button.sub(btn_class, '') }
+    end
 
-      if block_given?
-        buttons = [capture(&block), ''] + buttons
-      end
+    wrapper_options = { class: 'form-actions' }.merge(options.delete(:wrapper_html) || {})
 
-      buttons.join(' ').html_safe
+    content_tag(:div, wrapper_options) do
+      (block_given? ? capture(&block) : ''.html_safe) + buttons.join(' ').html_safe
     end
   end
 

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

@@ -38,6 +38,10 @@ module Effective
       def action_path(action, resource = nil, opts = {})
         return unless routes[action]
 
+        if resource.kind_of?(Hash)
+          opts = resource; resource = nil
+        end
+
         # edge case: Effective::Resource.new('admin/comments').action_path(:new, @post)
         if resource.present? && !resource.kind_of?(klass)
           if (bt = belongs_to(resource)).present? && instance.respond_to?("#{bt.name}=")
@@ -45,7 +49,15 @@ module Effective
           end
         end
 
-        routes[action].format(resource || instance).presence
+        path = routes[action].format(resource || instance).presence
+
+        if path.present? && opts.present?
+          uri = URI.parse(path)
+          uri.query = URI.encode_www_form(opts)
+          path = uri.to_s
+        end
+
+        path
       end
 
       def actions

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

@@ -9,7 +9,7 @@ module Effective
       def submits
         @submits ||= {}.tap do |submits|
           if (actions.find { |a| a == :create } || actions.find { |a| a == :update })
-            submits['Save'] = { action: :save, class: 'btn btn-primary' }
+            submits['Save'] = { action: :save, default: true, class: 'btn btn-primary' }
           end
 
           member_post_actions.each do |action| # default true means it will be overwritten by dsl methods
@@ -17,11 +17,11 @@ module Effective
           end
 
           if actions.find { |a| a == :index }
-            submits['Continue'] = { action: :save, redirect: :index }
+            submits['Continue'] = { action: :save, default: true, redirect: :index }
           end
 
           if actions.find { |a| a == :new }
-            submits['Add New'] = { action: :save, redirect: :new }
+            submits['Add New'] = { action: :save, default: true, redirect: :new }
           end
         end
       end
@@ -38,21 +38,10 @@ module Effective
           (args.key?(:if) ? obj.instance_exec(&args[:if]) : true) &&
           (args.key?(:unless) ? !obj.instance_exec(&args[:unless]) : true) &&
           EffectiveResources.authorized?(controller, action, obj)
-        end.sort do |(commit_x, x), (commit_y, y)|
-          # Sort to front
-          primary = (y[:class].include?('primary') ? 1 : 0) - (x[:class].include?('primary') ? 1 : 0)
-          primary = nil if primary == 0
-
-          # Sort to back
-          danger = (x[:class].include?('danger') ? 1 : 0) - (y[:class].include?('danger') ? 1 : 0)
-          danger = nil if danger == 0
-
-          primary || danger || submits.keys.index(commit_x) <=> submits.keys.index(commit_y)
-        end.inject({}) do |h, (commit, args)|
-          h[commit] = args.except(:action, :default, :if, :unless, :redirect); h
         end.transform_values.with_index do |opts, index|
           opts[:class] = "btn #{index == 0 ? 'btn-primary' : 'btn-secondary'}" if opts[:class].blank?
-          opts
+
+          opts.except(:action, :default, :if, :unless, :redirect)
         end
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

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