effective_resources 1.4.8 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82526f5e61a18e21ec193a6a73d0c635295f3b01535f32f63efe53adef5d1d85
-  data.tar.gz: 3836d32945873f3d2d9a768836d71ccf3d48096b02809492d7d3709f45a05e21
+  metadata.gz: 26fb7f4bb20f9558578037580acce364d1069fdb99210ef0e2b533874a9f9d6a
+  data.tar.gz: 98d7be06b5bae25e286eebf1e48607ccf4e235eade22ecbd2c622e24c5f09301
 SHA512:
-  metadata.gz: b32feec1c126e241f7beea418c70059b47d18c1a9eca77c335dd61773fcaba2e3633d94dc58e740f8dd2c70b10a8bf8d65aaed8e0822089c793df6dd568953ae
-  data.tar.gz: 17ff9637cb33fac11e7839d5a38c9444e7ea6534f47437ec2f270be5f5b3be1f033a9e49ff3bbc326af3500033031e5d70c3bdcd96e573dbce572bdc35542df3
+  metadata.gz: 1d0484e04a8f4159a40af9c25d4ecac702f5c37c6ddd6323817a2cedb2840604feb7276791382518ff7a79e87a1b3934e539a5a60956d336ec35039767f13993
+  data.tar.gz: 67c2b83cce754e80b998241cc463d1c7b8b93049a53169dd4ab92d7c6acdc99043d922f9912b0df206b063fcf727ef479f40c9fbedaf0c58ee5788a7f517cb4e

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

@@ -63,9 +63,11 @@ module Effective
         self.resource ||= resource_scope.new
         action = (commit_action[:action] == :save ? :create : commit_action[:action])
 
-        resource.assign_attributes(send(resource_params_method_name))
+        resource.current_user ||= current_user if resource.respond_to?(:current_user=)
         resource.created_by ||= current_user if resource.respond_to?(:created_by=)
 
+        resource.assign_attributes(send(resource_params_method_name))
+
         EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "New #{resource_name.titleize}"
 
@@ -119,6 +121,9 @@ module Effective
         EffectiveResources.authorize!(self, action, resource)
         @page_title ||= "Edit #{resource}"
 
+        resource.current_user ||= current_user if resource.respond_to?(:current_user=)
+        resource.updated_by ||= current_user if resource.respond_to?(:updated_by=)
+
         resource.assign_attributes(send(resource_params_method_name))
 
         if save_resource(resource, action)

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

@@ -79,54 +79,6 @@ module Effective
         end
       end
 
-      # def respond_with_error(resource, action)
-      #   return if response.body.present?
-
-      #   flash.delete(:success)
-      #   flash.now[:danger] ||= resource_flash(:danger, resource, action)
-
-      #   respond_to do |format|
-      #     case action.to_sym
-      #     when :create
-      #       format.html { render :new }
-      #     when :update
-      #       format.html { render :edit }
-      #     when :destroy
-      #       format.html do
-      #         redirect_flash
-      #         redirect_to(resource_redirect_path(action))
-      #       end
-      #     else # member action
-      #       from_path = referer_redirect_path.to_s
-
-      #       format.html do
-      #         if resource_edit_path && from_path.end_with?(resource_edit_path)
-      #           @page_title ||= "Edit #{resource}"
-      #           render :edit
-      #         elsif resource_new_path && from_path.end_with?(resource_new_path)
-      #           @page_title ||= "New #{resource_name.titleize}"
-      #           render :new
-      #         elsif resource_action_path(action) && from_path.end_with?(resource_action_path(action)) && template_present?(action)
-      #           @page_title ||= "#{action.to_s.titleize} #{resource}"
-      #           render(action, locals: { action: action })
-      #         elsif resource_show_path && from_path.end_with?(resource_show_path)
-      #           @page_title ||= resource_name.titleize
-      #           render :show
-      #         else
-      #           @page_title ||= resource.to_s
-      #           redirect_flash
-      #           redirect_to(from_path.presence || resource_redirect_path(action))
-      #         end
-      #       end
-      #     end
-
-      #     format.js do
-      #       view = template_present?(action) ? action : :member_action
-      #       render(view, locals: { action: action }) # action.js.erb
-      #     end
-      #   end
-      # end
-
       private
 
       def redirect_flash

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

@@ -4,7 +4,9 @@ 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)
+        #config = (['create', 'update'].include?(params[:action]) ? self.class.submits : self.class.buttons)
+
+        config = self.class.submits
         ons = self.class.ons
 
         commit = config[params[:commit].to_s]

data/app/helpers/effective_resources_helper.rb

@@ -146,6 +146,30 @@ module EffectiveResourcesHelper
     end
   end
 
+  # Similar to render_resource_form
+  def render_resource_partial(resource, atts = {})
+    unless resource.kind_of?(ActiveRecord::Base) || resource.class.ancestors.include?(ActiveModel::Model)
+      raise 'expected first argument to be an ActiveRecord or ActiveModel object'
+    end
+
+    raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
+
+    effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
+
+    action = atts.delete(:action)
+    atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
+
+    if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
+      render(effective_resource.name, atts)
+    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.plural_name], :partial)
+      render(effective_resource.plural_name + '/' + effective_resource.name, atts)
+    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.name], :partial)
+      render(effective_resource.name + '/' + effective_resource.name, atts)
+    else
+      render(resource, atts)  # Will raise the regular error
+    end
+  end
+
   # Tableize attributes
   # This is used by effective_orders, effective_logging, effective_trash and effective_mergery
   def tableize_hash(obj, table: 'table', th: true, sub_table: 'table', sub_th: true, flatten: true)

data/app/models/concerns/acts_as_archived.rb

@@ -28,7 +28,7 @@
 module ActsAsArchived
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_archived(cascade: [], strategy: :archive)
 
       cascade = Array(cascade).compact

data/app/models/concerns/acts_as_slugged.rb

@@ -7,7 +7,7 @@
 module ActsAsSlugged
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_slugged(options = nil)
       include ::ActsAsSlugged
     end

data/app/models/concerns/acts_as_statused.rb

@@ -8,8 +8,8 @@
 module ActsAsStatused
   extend ActiveSupport::Concern
 
-  module ActiveRecord
-    # acts_as_statuses :pending, :approved, :declined, option_key: :option_value
+  module Base
+    # acts_as_statused :pending, :approved, :declined, option_key: :option_value
     def acts_as_statused(*args)
       options = args.extract_options!
       statuses = Array(args).compact

data/app/models/concerns/acts_as_tokened.rb

@@ -6,7 +6,7 @@
 module ActsAsTokened
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_tokened(options = nil)
       include ::ActsAsTokened
     end

data/app/models/concerns/effective_resource.rb

@@ -5,7 +5,7 @@
 module EffectiveResource
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def effective_resource(options = nil, &block)
       return @_effective_resource unless block_given?
 

data/app/models/validators/email_cc_validator.rb

@@ -0,0 +1,15 @@
+# An ActiveRecord validator for any email field that you would use with effective_email or otherwise
+#
+# validates :cc, email_cc: true
+
+class EmailCcValidator < ActiveModel::EachValidator
+  PATTERN = /\A.+@.+\..+\Z/
+
+  def validate_each(record, attribute, value)
+    if value.present?
+      unless value.to_s.split(',').all? { |email| PATTERN =~ email }
+        record.errors.add(attribute, 'is invalid')
+      end
+    end
+  end
+end

data/app/views/application/show.html.haml

@@ -8,7 +8,7 @@
     .col-4.text-right
       = render_resource_buttons(@resource, show: false)
 
-  = render @resource
+  = render_resource_partial(@resource)
 
 .form-actions
   = link_to 'Continue', (resource.action_path(:index) || root_path), class: 'btn btn-primary'

data/app/views/application/show.js.erb

@@ -1,6 +1,6 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render(@resource) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_partial(@resource) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/lib/effective_resources/engine.rb

@@ -17,11 +17,11 @@ module EffectiveResources
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_resources.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(ActsAsArchived::ActiveRecord)
-        ActiveRecord::Base.extend(ActsAsTokened::ActiveRecord)
-        ActiveRecord::Base.extend(ActsAsSlugged::ActiveRecord)
-        ActiveRecord::Base.extend(ActsAsStatused::ActiveRecord)
-        ActiveRecord::Base.extend(EffectiveResource::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsArchived::Base)
+        ActiveRecord::Base.extend(ActsAsTokened::Base)
+        ActiveRecord::Base.extend(ActsAsSlugged::Base)
+        ActiveRecord::Base.extend(ActsAsStatused::Base)
+        ActiveRecord::Base.extend(EffectiveResource::Base)
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.4.8'.freeze
+  VERSION = '1.4.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.13
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,7 @@ files:
 - app/models/effective/resources/paths.rb
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
+- app/models/validators/email_cc_validator.rb
 - app/models/validators/email_validator.rb
 - app/models/validators/url_validator.rb
 - app/views/application/_flash.html.haml
@@ -97,7 +98,7 @@ homepage: https://github.com/code-and-effect/effective_resources
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.
 test_files: []