effective_resources 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ccd958aa2d034e20655b10bfe8a830bf162dad
-  data.tar.gz: d56e278ea8440a596378c2e5f943c32cc5a4c1dc
+  metadata.gz: 12e0851418c01ba4290cee861341751689d05963
+  data.tar.gz: a9ee4c64ac47d1abac493d72eece30383d77fad4
 SHA512:
-  metadata.gz: c2bd71876feb1b9437d2d2026f44e69f3aa93ff3a17a1b2c9e22b3c9c794a7128531321787e4fc6b5f3061bacb89e1186de8f2852dea56a47628da31dde44499
-  data.tar.gz: 74dc40f978cb4af876f258a5c1acd32c2865c65b030a8516b40d620a4981ce6544016bb75e40833059ba82f9c6212c7ba8baf12f8bbce6268ccb465ef0d3d6a3
+  metadata.gz: d27c675dc474aaf51403453d98ce32b83264cfe7437d4178f58fc45dafbeb20b454d6450235e775fd9bee049eb94db8444ab8979e88752e26f68a9ef7a1e224b
+  data.tar.gz: 0a749056b57fdd205fba43497bff68bbfd61d0ed61617efea637902453b9974886064345a01e50cb388d375bd82abf2bf69769e48bad0cbdd37e5c684048b58b

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

@@ -65,30 +65,30 @@ module Effective
         Rails.logger.info 'Processed by Effective::CrudController#create'
 
         self.resource ||= resource_scope.new
-        action = commit_action[:action]
+        action = (commit_action[:action] == :save ? :create : commit_action[:action])
 
         resource.assign_attributes(send(resource_params_method_name))
         resource.created_by = current_user if resource.respond_to?(:created_by=)
 
-        EffectiveResources.authorize!(self, (action == :save ? :create : action), resource)
+        EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "New #{resource_name.titleize}"
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?
+            request.format = :html if specific_redirect_path?(action)
 
             format.html do
-              flash[:success] ||= resource_flash(:success, resource, (action == :save ? :create : action))
-              redirect_to(resource_redirect_path)
+              flash[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path(action))
             end
 
             format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, (action == :save ? :create : action))
+              flash.now[:success] ||= resource_flash(:success, resource, action)
               reload_resource # create.js.erb
             end
           else
             flash.delete(:success)
-            flash.now[:danger] ||= resource_flash(:danger, resource, (action == :save ? :create : action))
+            flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
             run_callbacks(:resource_render)
 
@@ -130,21 +130,20 @@ module Effective
         Rails.logger.info 'Processed by Effective::CrudController#update'
 
         self.resource ||= resource_scope.find(params[:id])
-        action = commit_action[:action]
+        action = (commit_action[:action] == :save ? :update : commit_action[:action])
 
-        EffectiveResources.authorize!(self, (action == :save ? :update : action), resource)
+        EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "Edit #{resource}"
 
         resource.assign_attributes(send(resource_params_method_name))
-        resource.current_user = current_user if resource.respond_to?(:current_user=)
 
         respond_to do |format|
           if save_resource(resource, action)
-            request.format = :html if specific_redirect_path?
+            request.format = :html if specific_redirect_path?(action)
 
             format.html do
               flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path)
+              redirect_to(resource_redirect_path(action))
             end
 
             format.js do
@@ -216,8 +215,6 @@ module Effective
         to_assign = (send(resource_params_method_name) rescue {})
         resource.assign_attributes(to_assign) if to_assign.present? && to_assign.permitted?
 
-        resource.current_user = current_user if resource.respond_to?(:current_user=)
-
         respond_to do |format|
           if save_resource(resource, action)
             request.format = :html if specific_redirect_path?(action)

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

@@ -7,8 +7,12 @@ module Effective
         _insert_callbacks(names, blk) { |name, options| set_callback(:resource_render, :before, name, options) }
       end
 
+      def before_save(*names, &blk)
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_before_save, :after, name, options) }
+      end
+
       def after_save(*names, &blk)
-        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_save, :after, name, options) }
+        _insert_callbacks(names, blk) { |name, options| set_callback(:resource_after_save, :after, name, options) }
       end
 
       def after_error(*names, &blk)

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

@@ -35,6 +35,10 @@ module Effective
         permitted_params = effective_resource.permitted_attributes.select do |name, (_, atts)|
           if BLACKLIST.include?(name)
             false
+          elsif name == :token # has_secure_token
+            resource.respond_to?("regenerate_#{name}") == false
+          elsif name == :site_id # acts_as_site_specific
+            resource.class.respond_to?(:site_specific?) == false
           elsif atts.blank? || !atts.key?(:permitted)
             true # Default is true
           else
@@ -57,6 +61,8 @@ module Effective
             { k => [] }
           elsif datatype == :effective_address
             { k => EffectiveAddresses.permitted_params }
+          elsif datatype == :effective_assets
+            EffectiveAssets.permitted_params
           else
             k
           end

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

@@ -5,33 +5,40 @@ module Effective
       # Based on the incoming params[:commit] or passed action. Merges all options.
       def commit_action(action = nil)
         config = (['create', 'update'].include?(params[:action]) ? self.class.submits : self.class.buttons)
+        ons = self.class.ons
 
-        commit = if action.present?
-          config[action.to_s] || config.find { |_, v| v[:action] == action }.try(:last) || { action: action }
-        else
-          config[params[:commit].to_s] || config.find { |_, v| v[:action] == :save }.try(:last) || { action: :save }
-        end
+        commit = config[params[:commit].to_s]
+        commit ||= config.find { |_, v| v[:action] == action }.try(:last)
+        commit ||= config.find { |_, v| v[:action] == :save }.try(:last) if [nil, :create, :update].include?(action)
+        commit ||= { action: (action || :save) }
+
+        on = ons[params[:commit].to_s] || ons[action] || ons[commit[:action]]
 
-        commit.reverse_merge!(self.class.ons[commit[:action]]) if self.class.ons[commit[:action]]
+        commit.reverse_merge!(on) if on.present?
 
         commit
       end
 
       # This calls the appropriate member action, probably save!, on the resource.
       def save_resource(resource, action = :save, &block)
-        raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
+        save_action = ([:create, :update].include?(action) ? :save : action)
+
+        raise "expected @#{resource_name} to respond to #{save_action}!" unless resource.respond_to?("#{save_action}!")
 
         resource.current_user ||= current_user if resource.respond_to?(:current_user=)
 
         ActiveRecord::Base.transaction do
           begin
-            if resource.public_send("#{action}!") == false
+            run_callbacks(:resource_before_save)
+
+            if resource.public_send("#{save_action}!") == false
               raise("failed to #{action} #{resource}")
             end
 
             yield if block_given?
 
-            run_callbacks(:resource_save)
+            run_callbacks(:resource_after_save)
+
             return true
           rescue => e
             Rails.logger.info "Failed to #{action}: #{e.message}" if Rails.env.development?

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

@@ -11,7 +11,7 @@ module Effective
     included do
       define_actions_from_routes
       define_permitted_params_from_model
-      define_callbacks :resource_render, :resource_save, :resource_error
+      define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_error
     end
 
     module ClassMethods

data/app/helpers/effective_resources_helper.rb

@@ -71,7 +71,7 @@ module EffectiveResourcesHelper
     actions ||= (resource.kind_of?(Class) ? effective_resource.resource_klass_actions : effective_resource.resource_actions)
 
     # Filter Actions
-    action_keys = effective_resource.actions #actions.map { |_, v| v[:action] }
+    action_keys = effective_resource.actions
     raise "unknown action for #{effective_resource.name}: #{(atts.keys - action_keys).join(' ')}." if (atts.keys - action_keys).present?
     actions = actions.select { |_, v| atts[v[:action]].respond_to?(:call) ? instance_exec(&atts[v[:action]]) : (atts[v[:action]] != false) }
 

data/app/helpers/effective_resources_private_helper.rb

@@ -1,9 +1,9 @@
+# frozen_sting_literals: true
+
 module EffectiveResourcesPrivateHelper
   REPLACE_PAGE_ACTIONS = {'update' => :edit, 'create' => :new}
 
-  def permitted_resource_actions(resource, actions, effective_resource = nil)
-    effective_resource ||= find_effective_resource
-
+  def permitted_resource_actions(resource, actions)
     page_action = REPLACE_PAGE_ACTIONS[params[:action]] || params[:action]&.to_sym || :save
 
     actions.select do |commit, args|
@@ -14,19 +14,24 @@ module EffectiveResourcesPrivateHelper
       (args.key?(:if) ? controller.instance_exec(&args[:if]) : true) &&
       (args.key?(:unless) ? !controller.instance_exec(&args[:unless]) : true) &&
       EffectiveResources.authorized?(controller, action, resource)
-    end.transform_values.with_index do |opts, index|
-      action = opts[:action]
+    end.inject({}) do |h, (commit, args)|
+      opts = args.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger)
 
       # Transform data: { ... } hash into 'data-' keys
-      if (data = opts.delete(:data))
-        data.each { |k, v| opts["data-#{k}"] ||= v }
+      if opts.key?(:data)
+        opts.delete(:data).each { |k, v| opts["data-#{k}"] ||= v }
+      end
+
+      # Replace resource name in any token strings
+      if opts.key?('data-confirm')
+        opts['data-confirm'].gsub!('@resource', (resource.to_s.presence || resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ')).to_s)
       end
 
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'].to_s == 'delete'
+        if opts['data-method'] == 'delete'
           'btn btn-danger'
-        elsif index == 0
+        elsif h.length == 0
           'btn btn-primary'
         elsif defined?(EffectiveBootstrap)
           'btn btn-secondary'
@@ -36,22 +41,16 @@ module EffectiveResourcesPrivateHelper
       )
 
       # Assign title
-      unless action == :save
-        opts[:title] ||= case action
-          when :edit then "Edit #{resource}"
-          when :show then "#{resource}"
-          when :destroy then "Delete #{resource}"
-          when :index then "All #{effective_resource.human_plural_name.titleize}"
-          else "#{action.to_s.titleize} #{resource}"
-        end
-      end
-
-      # Replace resource name in any token strings
-      if opts['data-confirm']
-        opts['data-confirm'].gsub!('@resource', (resource.to_s.presence || effective_resource.human_name).to_s)
+      opts[:title] ||= case opts[:action]
+        when :save then commit
+        when :edit then "Edit #{resource}"
+        when :show then "#{resource}"
+        when :destroy then "Delete #{resource}"
+        when :index then "All #{resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ').titleize.pluralize}"
+        else "#{opts[:action].to_s.titleize} #{resource}"
       end
 
-      opts.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger)
+      h[commit] = opts; h
     end
   end
 

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

@@ -20,7 +20,7 @@ module Effective
             h[ass.foreign_key.to_sym] = [:integer, :index => true]
 
             if ass.options[:polymorphic]
-              h[ass.foreign_type.to_sym] = [:integer, :index => true]
+              h[ass.foreign_type.to_sym] = [:string, :index => true]
             end
 
           end; h
@@ -36,10 +36,15 @@ module Effective
       end
 
       def effective_addresses_attributes
-        return {} unless instance.respond_to?(:effective_address_names)
+        return {} unless defined?(EffectiveAddresses) && instance.respond_to?(:effective_address_names)
         instance.effective_address_names.inject({}) { |h, name| h[name] = [:effective_address]; h }
       end
 
+      def effective_assets_attributes
+        return {} unless defined?(EffectiveAssets) && instance.respond_to?(:asset_boxes)
+        { effective_assets: [:effective_assets] }
+      end
+
       # All will include primary_key, created_at, updated_at and belongs_tos
       # This is the attributes as defined by the effective_resources do .. end block
       # { :name => [:string, { permitted: false }], ... }
@@ -52,6 +57,7 @@ module Effective
             .merge(has_manys_attributes)
             .merge(has_ones_attributes)
             .merge(effective_addresses_attributes)
+            .merge(effective_assets_attributes)
             .merge(atts)
         else  # This is the migrator. This should match table_attributes
           belong_tos_attributes.merge(atts.reject { |_, v| v[0] == :permitted_param })

data/app/views/effective/resource/_actions.html.haml

@@ -1,4 +1,4 @@
-- permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+- permitted_resource_actions(resource, actions).each do |label, opts|
   = link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action))
 
 = instance_exec(resource, &format_block) if local_assigns[:format_block]

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,5 +1,5 @@
 = dropdown(variation: :dropleft) do
-  - permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+  - permitted_resource_actions(resource, actions).each do |label, opts|
     = dropdown_link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
 
   = instance_exec(resource, &format_block) if local_assigns[:format_block]

data/app/views/effective/resource/_actions_glyphicons.html.haml

@@ -1,4 +1,4 @@
-- permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+- permitted_resource_actions(resource, actions).each do |label, opts|
   = glyphicon_to(opts[:action], (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
 
 = instance_exec(resource, &format_block) if local_assigns[:format_block]

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails