effective_resources 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6df84b754524ec505a90063610dcff9af6e4e24e0cb2e0ada087d5420dbe4fe
-  data.tar.gz: fc0be89c03c109066c49f87778eb85ba2ac0a38309f72bb2f668e8e4bcc1201a
+  metadata.gz: eddc7cf600ae3743cb4a686c5ddbff6251f70660568de4f6754a2e13e52b3ea9
+  data.tar.gz: 1d571d8f411aa63166f677446ced8b5d5f3f40f96c3aa2b47d29f08c704655c5
 SHA512:
-  metadata.gz: 339825fdc0ed4abb28094c5fe83e4f2dd2fa426447f8f1ee3933e909f58b4600958e647dae712dbd47fb7aed155af7eae027f0dfb61ace74418535691de463f0
-  data.tar.gz: 7b4b5ad7565dd0ea09728af5d2769fa6ce51a0ed7c4e6c7c68d594a66861e975cb23af87b3334d5481cd984c0e62c8bd10ef47b6b49f4c56de1fd4bdc758f0fe
+  metadata.gz: 71aa4be47daebc507cf4136e0deadcf74ec0ed60399a5ec5200ea1ef31c215e2767e7a323ae060ce4d350bf1ca3d25bad64a66f2defa0b531e91e5ab9c009887
+  data.tar.gz: 1d5df0cc8e833a2a89dffb13ba65aaa8f84930ac203007912076545c4e431b43e4cd00fb081bcb20528137352bd6e2f0a83290932ba8c8d2f66d12ef341312e7

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

@@ -82,7 +82,7 @@ module Effective
     # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method
     def resource_scope # Thing
       @_effective_resource_relation ||= (
-        relation = case @_effective_resource_scope  # If this was initialized by the resource_scope before_filter
+        relation = case @_effective_resource_scope  # If this was initialized by the resource_scope before_action
         when ActiveRecord::Relation
           @_effective_resource_scope
         when Hash

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

@@ -80,7 +80,7 @@ module Effective
         raise 'expected a proc or block' unless (obj.respond_to?(:call) || block_given?)
 
         instance_exec do
-          before_action(opts) { @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj)) }
+          prepend_before_action(opts) { @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj)) }
         end
       end
 

data/app/models/concerns/acts_as_archived.rb

@@ -8,6 +8,7 @@
 # class Thing < ApplicationRecord
 #   has_many :comments
 #   acts_as_archivable cascade: :comments
+#   acts_as_archivable cascade: :comments, strategy: :archive|:archive_all|:active_job
 # end
 
 # Each controller needs its own archive and unarchive action.
@@ -28,15 +29,20 @@ module ActsAsArchived
   extend ActiveSupport::Concern
 
   module ActiveRecord
-    def acts_as_archived(cascade: [])
+    def acts_as_archived(cascade: [], strategy: :archive)
 
       cascade = Array(cascade).compact
+      strategy = strategy
 
       if cascade.any? { |obj| !obj.kind_of?(Symbol) }
         raise 'expected cascade to be an Array of has_many symbols'
       end
 
-      @acts_as_archived_options = { cascade: cascade }
+      unless [:archive, :archive_all, :active_job].include?(strategy)
+        raise 'expected strategy to be :archive, :archive_all, or :active_job'
+      end
+
+      @acts_as_archived_options = { cascade: cascade, strategy: strategy }
 
       include ::ActsAsArchived
     end
@@ -61,6 +67,8 @@ module ActsAsArchived
   end
 
   included do
+    define_callbacks :archive, :unarchive  # ActiveSupport::Callbacks
+
     scope :archived, -> { where(archived: true) }
     scope :unarchived, -> { where(archived: [false, nil]) }
 
@@ -74,26 +82,96 @@ module ActsAsArchived
 
   module ClassMethods
     def acts_as_archived?; true; end
+
+    # before_archive(if: -> { persisted? })
+    def before_archive(*filters, &blk)
+      set_callback(:archive, :before, *filters, &blk)
+    end
+
+    def after_archive(*filters, &blk)
+      set_callback(:archive, :after, *filters, &blk)
+    end
+
+    def before_unarchive(*filters, &blk)
+      set_callback(:unarchive, :before, *filters, &blk)
+    end
+
+    def after_unarchive(*filters, &blk)
+      set_callback(:unarchive, :after, *filters, &blk)
+    end
+
+    # after_commit(if: :just_archived?)
+    # after_commit(if: :just_unarchived?)
   end
 
   # Instance methods
   def archive!
+    return true if archived?
+
+    strategy = acts_as_archived_options[:strategy]
+    cascade = acts_as_archived_options[:cascade]
+
     transaction do
-      update!(archived: true) # Runs validations
-      acts_as_archived_options[:cascade].each { |obj| public_send(obj).update_all(archived: true) }
+      run_callbacks :archive do
+        update!(archived: true) # Runs validations
+
+        if strategy == :archive_all
+          cascade.each { |associated| public_send(associated).update_all(archived: true) }
+        end
+
+        if strategy == :archive
+          cascade.each { |associated| Array(public_send(associated)).each { |resource| resource.archive! } }
+        end
+      end
     end
+
+    if strategy == :active_job
+      ActsAsArchivedArchiveJob.perform_later(self)
+    end
+
+    true
   end
 
   def unarchive!
+    return true unless archived?
+
+    strategy = acts_as_archived_options[:strategy]
+    cascade = acts_as_archived_options[:cascade]
+
     transaction do
-      update!(archived: false)
-      acts_as_archived_options[:cascade].each { |obj| public_send(obj).update_all(archived: false) }
+      run_callbacks :unarchive do
+        update!(archived: false) # Runs validations
+
+        if strategy == :archive_all
+          cascade.each { |associated| public_send(associated).update_all(archived: false) }
+        end
+
+        if strategy == :archive
+          cascade.each { |associated| Array(public_send(associated)).each { |resource| resource.unarchive! } }
+        end
+      end
     end
+
+    if strategy == :active_job
+      ActsAsArchivedUnarchiveJob.perform_later(self)
+    end
+
+    true
   end
 
   def destroy
     archive!
   end
 
+  private
+
+  def just_archived?
+    previous_changes[:archived] && archived?
+  end
+
+  def just_unarchived?
+    previous_changes[:archived] && !archived?
+  end
+
 end
 

data/lib/effective_resources/engine.rb

@@ -2,7 +2,7 @@ module EffectiveResources
   class Engine < ::Rails::Engine
     engine_name 'effective_resources'
 
-    config.autoload_paths += Dir["#{config.root}/lib/", "#{config.root}/app/controllers/concerns/effective/"]
+    config.autoload_paths += Dir["#{config.root}/lib/", "#{config.root}/jobs/", "#{config.root}/app/controllers/concerns/effective/"]
 
     # Set up our default configuration options.
     initializer 'effective_resources.defaults', before: :load_config_initializers do |app|

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails