effective_resources 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d6e7dcb8c5527a92e5e8b131432dfb4e2bcbb6
-  data.tar.gz: be478e58a93c9f09e5ff4f2e55acde4484432bb9
+  metadata.gz: b51f70289754b04e3b24e87cee9ee5b91348235b
+  data.tar.gz: ce089db26990688cdf69c8e0beb2a5438f32eccd
 SHA512:
-  metadata.gz: ad432b0b6fc28abcf3161e070ccb73f3bb92eb6664c2944b085445a8100dca94a3955e984a7c606a7ba1ece92023e5706738f9ed62b327755c900daf646e62ed
-  data.tar.gz: 507cf9801a43e9b3c78a580f540841777fb9c74ff9ba70d345fb7f884678f6e5dfa6da0020a9a13878971dd3964aca7f52f9873a72d8765e2f5409bc9308d447
+  metadata.gz: 80bf7540fa6699c463c1ffdc37d2b58be79e22ae5ee1fbcb1aa9fa28ed4f67002e3927e5995f988970fa7e624eb14d236c69721eb01f59df66f602ecc8f9296e
+  data.tar.gz: 386f9b28398d7d1b312c8bb5158678cdfea6c1850c3c20309c63402d7b7f0ccd49411278b44ef5f85cdf00e38623e06f3a4d31d7aa1d6ad74098763c544311a2

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

@@ -12,7 +12,7 @@ module Effective
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path(action))
           end
-        elsif lookup_context.template_exists?(action, _prefixes)
+        elsif template_present?(action)
           format.html do
             flash.now[:success] ||= resource_flash(:success, resource, action)
             render(action) # action.html.haml
@@ -63,16 +63,16 @@ module Effective
           end
         else # member action
           format.html do
-            if lookup_context.template_exists?(action, _prefixes)
-              @page_title ||= "#{action.to_s.titleize} #{resource}"
-              render(action, locals: { action: action })
-            elsif resource_edit_path && (referer_redirect_path || '').end_with?(resource_edit_path)
+            if resource_edit_path && referer_redirect_path.to_s.end_with?(resource_edit_path)
               @page_title ||= "Edit #{resource}"
               render :edit
-            elsif resource_new_path && (referer_redirect_path || '').end_with?(resource_new_path)
+            elsif resource_new_path && referer_redirect_path.to_s.end_with?(resource_new_path)
               @page_title ||= "New #{resource_name.titleize}"
               render :new
-            elsif resource_show_path && (referer_redirect_path || '').end_with?(resource_show_path)
+            elsif resource_action_path(action) && referer_redirect_path.to_s.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 && referer_redirect_path.to_s.end_with?(resource_show_path)
               @page_title ||= resource_name.titleize
               render :show
             else
@@ -84,7 +84,7 @@ module Effective
         end
 
         format.js do
-          view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
+          view = template_present?(action) ? action : :member_action
           render(view, locals: { action: action }) # action.js.erb
         end
       end
@@ -99,6 +99,10 @@ module Effective
         flash[:danger] ||= danger
       end
 
+      def template_present?(action)
+        lookup_context.template_exists?("#{action}.#{request.format.symbol || 'html'}", _prefixes)
+      end
+
     end
   end
 end

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

@@ -39,7 +39,10 @@ module Effective
 
             return true
           rescue => e
-            Rails.logger.info "Failed to #{action}: #{e.message}" if Rails.env.development?
+            if Rails.env.development?
+              Rails.logger.info "Failed to #{action}: #{e.message}"
+              e.backtrace.first(4).each { |line| Rails.logger.info(line) }
+            end
 
             if resource.respond_to?(:restore_attributes) && resource.persisted?
               resource.restore_attributes(['status', 'state'])

data/app/models/concerns/acts_as_statused.rb

@@ -0,0 +1,103 @@
+# ActsAsStatused
+# This is kind of like a state machine, but the statuses only go forward.
+#
+# Initialize with a set of statuses like [:submitted, :approved, :declined]. Creates the following:
+# scope :approved
+# approved?, was_approved?, approved_at, approved_by, approved!, unapproved!
+
+module ActsAsStatused
+  extend ActiveSupport::Concern
+
+  module ActiveRecord
+    # acts_as_statuses :pending, :approved, :declined, option_key: :option_value
+    def acts_as_statused(*args)
+      options = args.extract_options!
+      statuses = Array(args).compact
+
+      if statuses.blank? || statuses.any? { |status| !status.kind_of?(Symbol) }
+        raise 'acts_as_statused expected one or more statuses'
+      end
+
+      @acts_as_statused_options = options.merge(statuses: statuses)
+
+      include ::ActsAsStatused
+    end
+  end
+
+  included do
+    acts_as_statused_options = @acts_as_statused_options
+
+    attr_accessor :current_user
+
+    effective_resource do
+      status                 :string, permitted: false
+      status_steps           :text, permitted: false
+    end
+
+    serialize :status_steps, Hash
+
+    const_set(:STATUSES, acts_as_statused_options[:statuses])
+
+    before_validation do
+      self.status ||= self.class.const_get(:STATUSES).first
+
+      # Set an existing belongs_to automatically
+      if respond_to?("#{status}_by=") && respond_to?("#{status}_by") && send("#{status}_by").blank?
+        self.send("#{status}_by=", current_user)
+      end
+
+      # Set an existing timestamp automatically
+      if respond_to?("#{status}_at=") && respond_to?("#{status}_at") && send("#{status}_at").blank?
+        self.send("#{status}_at=", Time.zone.now)
+      end
+
+      self.status_steps["#{status}_at".to_sym] ||= Time.zone.now
+      self.status_steps["#{status}_by".to_sym] ||= current_user&.id
+    end
+
+    validates :status, presence: true, inclusion: { in: const_get(:STATUSES).map(&:to_s) }
+
+    # Create an received scope and approved? method for each status
+    acts_as_statused_options[:statuses].each do |sym|
+      define_method("#{sym}?") { status == sym.to_s }
+      define_method("#{sym}_at") { status_steps["#{sym}_at".to_sym] }
+      define_method("#{sym}_by") { acts_as_statused_by_user(sym) }
+      define_method("#{sym}_by_id") { status_steps["#{sym}_by".to_sym] }
+      define_method("was_#{sym}?") { send("#{sym}_at").present? }
+
+      # approved!
+      define_method("#{sym}!") do |atts = {}|
+        raise 'expected a Hash of passed attributes' unless atts.kind_of?(Hash)
+        update!(atts.merge(status: sym))
+      end
+
+      # unapproved!
+      define_method("un#{sym}!") do
+        self.status = nil if (status == sym.to_s)
+
+        status_steps.delete("#{sym}_at".to_sym)
+        status_steps.delete("#{sym}_by".to_sym)
+      end
+
+      scope(sym, -> { where(status: sym.to_s) })
+    end
+  end
+
+  module ClassMethods
+    def acts_as_statused?; true; end
+  end
+
+  private
+
+  def acts_as_statused_by_user(status)
+    return nil if status_steps["#{status}_by".to_sym].blank?
+
+    @acts_as_statused_by_users ||= begin
+      User.where(id: status_steps.map { |k, v| v.presence if k.to_s.end_with?('_by') }.compact).all.inject({}) { |h, user| h[user.id] = user; h }
+    end
+
+    @acts_as_statused_by_users[status_steps["#{status}_by".to_sym]]
+  end
+
+end
+

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

@@ -5,6 +5,6 @@ EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
-  EffectiveForm.remote_form_refresh_datatables = <%= raw @resource.refresh_datatables.uniq.compact.map(&:to_s) %>;
+  EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>
 

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

@@ -5,7 +5,7 @@ EffectiveForm.remote_form_payload = '';
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
-  EffectiveForm.remote_form_refresh_datatables = <%= raw @resource.refresh_datatables.uniq.compact.map(&:to_s) %>;
+  EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>
 
 EffectiveForm.finishDelete();

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

@@ -5,5 +5,5 @@ EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, actio
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
-  EffectiveForm.remote_form_refresh_datatables = <%= raw @resource.refresh_datatables.uniq.compact.map(&:to_s) %>;
+  EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>

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

@@ -5,5 +5,5 @@ EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
-  EffectiveForm.remote_form_refresh_datatables = <%= raw @resource.refresh_datatables.uniq.compact.map(&:to_s) %>;
+  EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>

data/lib/effective_resources/engine.rb

@@ -28,6 +28,7 @@ module EffectiveResources
         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)
       end
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,6 +48,7 @@ files:
 - app/helpers/effective_resources_private_helper.rb
 - app/models/concerns/acts_as_archived.rb
 - app/models/concerns/acts_as_slugged.rb
+- app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb
 - app/models/concerns/effective_resource.rb
 - app/models/effective/access_denied.rb