effective_resources 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b99e4e97fc17bdd6d06ef1ab5c726b23a8697906123537da8d2b72c5ea83a7
-  data.tar.gz: 040d8d9d90165d0582f4ac50390214ad942f5faf9a287782b103dd30048988c8
+  metadata.gz: 96ca5cf766ce1834be39c1cc4698eed91291824f5cc242fcd4daa5f287bcbe95
+  data.tar.gz: 3297962f09ef0490a3c53ccd3eb7d82858ed0a553a935e8ce264a7947c70fcdb
 SHA512:
-  metadata.gz: dc405eda869d37fb5669365c7acfbbaab2af111802b57b3753372b2eb684e905de07e6ace209ec412016fd8a713f4ce125761b55985408b5085fcf24c8e679eb
-  data.tar.gz: a289eb14cc256be32c392fdd6f9497cb03367bce59bc17c611a8dc6e8b5f2d72694e301826e3186abf82dd216773dd2a61d663db5b19f80d4c1d645ace341af7
+  metadata.gz: a88337e14e4d6df602ec530a07e57a48ac345fc25ade3c5ebaf34b9038c67decb76e17f58f7c431c0bd58e64cb589dfd0b4f4f3055b6082fb4f1b2e68f9f0ad2
+  data.tar.gz: cb339dd8e0a39d7e0c78e483a0d122c4b7de0d682f031ec91cf1d9a2184fe527e96278edbd92176d18564d5bb6c9f7edacd4f0336b4eb222682bed52153f991d

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/effective/attribute.rb

@@ -75,11 +75,11 @@ module Effective
       when :date, :datetime
         if (digits = value.to_s.scan(/(\d+)/).flatten).present?
           date = if digits.first.length == 4  # 2017-01-10
-            Time.zone.local(*digits)
+            (Time.zone.local(*digits) rescue nil)
           else # 01/10/2016
             year = digits.find { |d| d.length == 4}
             digits = [year] + (digits - [year])
-            Time.zone.local(*digits)
+            (Time.zone.local(*digits) rescue nil)
           end
 
           name.to_s.start_with?('end_') ? date.end_of_day : date
@@ -87,7 +87,7 @@ module Effective
       when :time
         if (digits = value.to_s.scan(/(\d+)/).flatten).present?
           now = Time.zone.now
-          Time.zone.local(now.year, now.month, now.day, *digits)
+          (Time.zone.local(now.year, now.month, now.day, *digits) rescue nil)
         end
       when :decimal, :currency
         (value.kind_of?(String) ? value.gsub(/[^0-9|\-|\.]/, '') : value).to_f

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.rb

@@ -1,5 +1,4 @@
 require 'effective_resources/engine'
-require 'effective_resources/version'
 
 module EffectiveResources
 

data/lib/effective_resources/engine.rb

@@ -3,9 +3,14 @@ module EffectiveResources
     engine_name 'effective_resources'
 
     config.autoload_paths += Dir[
-      "#{config.root}/lib/",
       "#{config.root}/jobs/",
-      "#{config.root}/app/models/validators/",
+      "#{config.root}/lib/validators/",
+      "#{config.root}/app/controllers/concerns/"
+    ]
+
+    config.eager_load_paths += Dir[
+      "#{config.root}/jobs/",
+      "#{config.root}/lib/validators/",
       "#{config.root}/app/controllers/concerns/"
     ]
 
@@ -17,11 +22,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.9'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,9 +71,6 @@ 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
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb
@@ -94,11 +91,14 @@ files:
 - lib/effective_resources/engine.rb
 - lib/effective_resources/version.rb
 - lib/generators/effective_resources/install_generator.rb
+- lib/validators/email_cc_validator.rb
+- lib/validators/email_validator.rb
+- lib/validators/url_validator.rb
 homepage: https://github.com/code-and-effect/effective_resources
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,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: []