effective_resources 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51f70289754b04e3b24e87cee9ee5b91348235b
-  data.tar.gz: ce089db26990688cdf69c8e0beb2a5438f32eccd
+  metadata.gz: 435122fff68bc60412b461cd4eadf1b2a1c9543c
+  data.tar.gz: 4a5a64cc84f32cf948dfe3b69e799cfcd74b52bd
 SHA512:
-  metadata.gz: 80bf7540fa6699c463c1ffdc37d2b58be79e22ae5ee1fbcb1aa9fa28ed4f67002e3927e5995f988970fa7e624eb14d236c69721eb01f59df66f602ecc8f9296e
-  data.tar.gz: 386f9b28398d7d1b312c8bb5158678cdfea6c1850c3c20309c63402d7b7f0ccd49411278b44ef5f85cdf00e38623e06f3a4d31d7aa1d6ad74098763c544311a2
+  metadata.gz: 6675a98f388897cf2b97cd93177f8fc15927b7d85eae40ed1be4b9ac5a45e4ea767c8232994609f469daaec3b84853e0a8dd153693a71a3d78fc9c8ebbdd2b9c
+  data.tar.gz: efc25566f103fd524994ccf0c7f1bd11578ff748311e75ea034e5ca49a15de60cfcbe0fb6080bb77f26615a368855831291076e12261bda73adb8251be788b5d

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

@@ -1,7 +1,7 @@
 module Effective
   module CrudController
     module PermittedParams
-      BLACKLIST = [:created_at, :updated_at]
+      BLACKLIST = [:created_at, :updated_at, :logged_change_ids]
 
       # This is only available to models that use the effective_resource do ... end attributes block
       # It will be called last, and only for those resources

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

@@ -30,7 +30,7 @@ module Effective
             run_callbacks(:resource_before_save)
 
             if resource.public_send("#{save_action}!") == false
-              raise("failed to #{action} #{resource}")
+              raise Effective::ActionFailed.new("failed to #{action}")
             end
 
             yield if block_given?
@@ -40,8 +40,9 @@ module Effective
             return true
           rescue => e
             if Rails.env.development?
-              Rails.logger.info "Failed to #{action}: #{e.message}"
-              e.backtrace.first(4).each { |line| Rails.logger.info(line) }
+              Rails.logger.info "  \e[31m\e[1mFAILED\e[0m\e[22m" # bold red
+              Rails.logger.info "  Unable to #{action} #{resource} - #{e.class} #{e}"
+              e.backtrace.first(5).each { |line| Rails.logger.info('  ' + line) }
             end
 
             if resource.respond_to?(:restore_attributes) && resource.persisted?
@@ -49,7 +50,14 @@ module Effective
             end
 
             flash.now[:danger] = resource_flash(:danger, resource, action, e: e)
-            raise ActiveRecord::Rollback
+
+            case e
+            when Effective::ActionFailed, ActiveRecord::RecordInvalid, RuntimeError
+              raise(ActiveRecord::Rollback) # This is a soft error, we want to display the flash message to user
+            else
+              raise(e) # This is a real error that should be sent to 500. Client should not see the message.
+            end
+
           end
         end
 

data/app/helpers/effective_resources_helper.rb

@@ -50,8 +50,7 @@ module EffectiveResourcesHelper
   end
 
   # Renders the effective/resource view partial for this resource
-  # resource is an Effective::Resource
-  # instance is an ActiveRecord thing, an Array of ActiveRecord things, or nil
+  # resource is an ActiveRecord thing, an Array of ActiveRecord things, or nil
   # Atts are everything else. Interesting ones include:
 
   # partial: :dropleft|:glyphicons|string

data/app/models/concerns/acts_as_archived.rb

@@ -42,6 +42,15 @@ module ActsAsArchived
     end
   end
 
+  module CanCan
+    def acts_as_archived(klass)
+      raise "klass does not implement acts_as_archived" unless klass.acts_as_archived?
+
+      can(:archive, klass) { |obj| !obj.archived? }
+      can(:unarchive, klass) { |obj| obj.archived? }
+    end
+  end
+
   module RoutesConcern
     def acts_as_archived
       concern :acts_as_archived do

data/app/models/concerns/acts_as_statused.rb

@@ -24,6 +24,67 @@ module ActsAsStatused
     end
   end
 
+  module CanCan
+    # The idea here is you can go forward but you can't go back.
+    def acts_as_statused(klass, only: nil, except: nil)
+      raise "klass does not implement acts_as_statused" unless klass.acts_as_statused?
+
+      statuses = klass.const_get(:STATUSES)
+      instance = klass.new
+
+      only = Array(only).compact
+      except = Array(except).compact
+
+      statuses.each_with_index do |status, index|
+        action = status_active_verb(status, instance)
+
+        next if action.blank?
+        next if only.present? && !only.include?(action)
+        next if except.present? && except.include?(action)
+
+        if index == 0
+          can(action, klass) and next
+        end
+
+        if status == :approved && statuses.include?(:declined)
+          if (position = statuses.index { |status| (status == :approved || status == :declined) }) > 0
+            can(action, klass) { |obj| obj.public_send("#{statuses[position-1]}?") || obj.declined? }
+            next
+          end
+        end
+
+        if status == :declined && statuses.include?(:approved)
+          if (position = statuses.index { |status| (status == :approved || status == :declined) }) > 0
+            can(action, klass) { |obj| obj.public_send("#{statuses[position-1]}?") }
+            next
+          end
+        end
+
+        can(action, klass) { |obj| obj.public_send("#{statuses[index-1]}?") }
+      end
+    end
+
+    private
+
+    # requested -> request, approved -> approve, declined -> decline, pending -> pending
+    def status_active_verb(status, instance)
+      status = status.to_s.strip
+
+      if status.end_with?('ied')
+        action = status[0...-3] + 'y'
+        return action.to_sym if instance.respond_to?(action + '!')
+      end
+
+      # ed, e, ing
+      [-1, -2, -3].each do |index|
+        action = status[0...index]
+        return action.to_sym if instance.respond_to?(action + '!')
+      end
+
+      nil
+    end
+  end
+
   included do
     acts_as_statused_options = @acts_as_statused_options
 
@@ -77,6 +138,8 @@ module ActsAsStatused
 
         status_steps.delete("#{sym}_at".to_sym)
         status_steps.delete("#{sym}_by".to_sym)
+
+        true
       end
 
       scope(sym, -> { where(status: sym.to_s) })

data/app/models/effective/action_failed.rb

@@ -0,0 +1,15 @@
+module Effective
+  class ActionFailed < StandardError
+    attr_reader :action, :subject
+
+    def initialize(message = nil, action = nil, subject = nil)
+      @message = message
+      @action = action
+      @subject = subject
+    end
+
+    def to_s
+      @message || I18n.t(:'unauthorized.default', :default => 'Action Failed')
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module Effective
       attr_accessor :instance
 
       # This is written for use by effective_logging and effective_trash
+      BLACKLIST = [:logged_changes, :trash]
 
       def instance
         @instance || klass.new
@@ -18,12 +19,15 @@ module Effective
         # Collect to_s representations of all belongs_to associations
         if include_associated
           belong_tos.each do |association|
+            next if BLACKLIST.include?(association.name)
             attributes[association.name] = instance.send(association.name).to_s
           end
         end
 
         if include_associated || include_nested
           nested_resources.each do |association|
+            next if BLACKLIST.include?(association.name)
+
             attributes[association.name] ||= {}
 
             next if association.options[:through]
@@ -39,14 +43,17 @@ module Effective
 
         if include_associated
           has_ones.each do |association|
+            next if BLACKLIST.include?(association.name)
             attributes[association.name] = instance.send(association.name).to_s
           end
 
           has_manys.each do |association|
+            next if BLACKLIST.include?(association.name)
             attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
           end
 
           has_and_belongs_to_manys.each do |association|
+            next if BLACKLIST.include?(association.name)
             attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
           end
         end

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

@@ -96,7 +96,9 @@ module Effective
         @_search_columns = names
       end
 
-      private
+      def ilike
+        @ilike ||= (postgres? ? 'ILIKE' : 'LIKE')  # Only Postgres supports ILIKE, Mysql and Sqlite3 use LIKE
+      end
 
       def postgres?
         return @postgres unless @postgres.nil?
@@ -108,10 +110,6 @@ module Effective
         @mysql ||= (klass.connection.kind_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) rescue false)
       end
 
-      def ilike
-        @ilike ||= (postgres? ? 'ILIKE' : 'LIKE')  # Only Postgres supports ILIKE, Mysql and Sqlite3 use LIKE
-      end
-
       def is_null(sql_column)
         mysql? == true ? "ISNULL(#{sql_column})" : "#{sql_column} IS NULL"
       end

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

@@ -1,7 +1,10 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action) %>";
+<% unless params[:_datatable_action] %>
+  EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action) %>";
+<% end %>
+
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>

data/lib/effective_resources/engine.rb

@@ -33,5 +33,20 @@ module EffectiveResources
       end
     end
 
+    initializer 'effective_resources.cancancan' do |app|
+      if defined?(CanCan::Ability)
+        CanCan::Ability.module_eval do
+          CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
+
+          def crud
+            CRUD_ACTIONS
+          end
+        end
+
+        CanCan::Ability.include(ActsAsArchived::CanCan)
+        CanCan::Ability.include(ActsAsStatused::CanCan)
+      end
+    end
+
   end
 end

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,7 @@ files:
 - app/models/concerns/acts_as_tokened.rb
 - app/models/concerns/effective_resource.rb
 - app/models/effective/access_denied.rb
+- app/models/effective/action_failed.rb
 - app/models/effective/attribute.rb
 - app/models/effective/code_reader.rb
 - app/models/effective/model_reader.rb