activerecord-prunable 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af74d6c4f68c35edcfa4b30e7ed7cb42e78758a3
-  data.tar.gz: 27c2523ead3838ed6ce8afc8fb88019ab269e100
+  metadata.gz: 98eed29b171fce5713dbc74ab812c8d6ccd4531a
+  data.tar.gz: 41bf6db4104667a2eff427332acdb4f6ee1423c1
 SHA512:
-  metadata.gz: 5b3e7b41eb481553f107e9b355ee95c1b8bb006e4cb57c87f44e60529f925f2cbcf5855270c9e0627a39c45e8cf0bfaa3a21aa0face394a8b7940fecb45a3df7
-  data.tar.gz: c26196c6117ffb4cd35d04fab611ec2ea25f68cfb8fd9442562cb04bddb2d4a163a650d87ce157411335468e7b3e07868805d6299ac10a100cad85193bfd3298
+  metadata.gz: 531bf56a1a4e857af793da15fb681f90d93f549671872cdfbbef07805aa30fff9a45be76d8773d9b8cf0d0a9c2a834dedaf297cc05fee59d6928c85209e04510
+  data.tar.gz: 6aeceb2f4cc5cde6fe6634b6b1efeaec7bfa2c7eaed4da293a3f35190a431fce02ee5093f11d9fac02a0f2b3a2f8384c9d10714cd39cb23eb6f4d70d05cf3b65

data/README.md

@@ -1,4 +1,4 @@
-# Activerecord-prunable [![Gem Version](https://badge.fury.io/rb/activerecord-prunable.svg)](https://badge.fury.io/rb/activerecord-prunable) [![Build Status](https://travis-ci.org/dr2m/activerecord-prunable.svg?branch=master)](https://travis-ci.org/dr2m/activerecord-prunable) [![Code Climate](https://codeclimate.com/github/dr2m/activerecord-prunable/badges/gpa.svg)](https://codeclimate.com/github/dr2m/activerecord-prunable)  
+# Activerecord-prunable [![Gem Version](https://badge.fury.io/rb/activerecord-prunable.svg)](https://badge.fury.io/rb/activerecord-prunable) [![Build Status](https://travis-ci.org/dr2m/activerecord-prunable.svg?branch=master)](https://travis-ci.org/dr2m/activerecord-prunable) [![Code Climate](https://codeclimate.com/github/dr2m/activerecord-prunable/badges/gpa.svg)](https://codeclimate.com/github/dr2m/activerecord-prunable)
 
 Convenient removal of obsolete ActiveRecord models.
 
@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-__1. Include the `Prunable` module in the ActiveRecord model which needs to be pruned.__  
+__1. Include the `Prunable` module in the ActiveRecord model which needs to be pruned.__
 
 __2. Define the `:prunable` scope which returns models to prune.__
 
@@ -37,7 +37,7 @@ __2. Define the `:prunable` scope which returns models to prune.__
    end
    ```
 
-   or use one of the `prune_after`, `prune_created_after`, `prune_updated_after` methods  
+   or use one of the `prune_after`, `prune_created_after`, `prune_updated_after` methods
 
    ```ruby
    class Notification < ApplicationRecord
@@ -47,9 +47,9 @@ __2. Define the `:prunable` scope which returns models to prune.__
    end
    ```
 
-   `prune_after` is an alias for `prune_created_after`  
-   `prune_created_after(TTL)` defines `where('created_at < ?', current_time - TTL)` prunable scope  
-   `prune_updated_after(TTL)` defines `where('updated_at < ?', current_time - TTL)` prunable scope  
+   `prune_after` is an alias for `prune_created_after`
+   `prune_created_after(TTL)` defines `where('created_at < ?', current_time - TTL)` prunable scope
+   `prune_updated_after(TTL)` defines `where('updated_at < ?', current_time - TTL)` prunable scope
 
 __3. Add a `Prunable.prune!` call to a periodic task.__
 
@@ -71,32 +71,34 @@ __Pruning a single model:__
 SomeModel.prune!
 ```
 
-__Pruning multiple models:__  
-Note that the `Prunable.prune!` calls `Rails.application.eager_load!`. It can decrease free memory size.  
+__Pruning multiple models:__
+Note that the `Prunable.prune!` calls `Rails.application.eager_load!`. It can decrease free memory size.
 
 ```ruby
 Prunable.prune!(SomeModel, AnotherModel)
 ```
 
-__Set default method of pruning (:destroy or :delete):__  
+__Set default method of pruning (:destroy or :delete):__
 
 ```ruby
 Prunable.prune!(prune_method: :delete)
 ```
 
-__Call `:prunable` scope with params:__  
+__Call `:prunable` scope with params:__
 
 ```ruby
 Prunable.prune!(params: [:foo, :bar])
 ```
 
-__Getting an array of all the models which include `ActiveRecord::Prunable`:__  
+__Getting an array of all the models which include `ActiveRecord::Prunable`:__
 ```ruby
 Prunable.models
 ```
 
-__Pruning all models which include `ActiveRecord::Prunable`:__  
+__Pruning all models which include `ActiveRecord::Prunable`:__
 
 ```ruby
 Prunable.prune!
 ```
+
+You are also able to call `prune` method instead of `prune!` if you don't want to receive exceptions.

data/activerecord-prunable.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-prunable"
-  spec.version       = "0.3.2"
+  spec.version       = "0.3.3"
   spec.authors       = ["dr2m"]
   spec.email         = ["maletin@maletin.work"]
 

data/lib/activerecord-prunable.rb

@@ -14,9 +14,26 @@ module Prunable
     def prune!(*models, prune_method: nil, current_time: nil, params: [])
       models = self.models if models.empty?
 
+      models.each_with_object({}) do |model, pruned|
+        pruned[model.table_name] = model.prune!(*params, prune_method: prune_method, current_time: current_time)
+      end
+    end
+
+    def prune(*models, prune_method: nil, current_time: nil, params: [])
+      models = self.models if models.empty?
+
+      pruned = {}
+      errors = []
+
       models.each do |model|
-        model.prune!(*params, prune_method: prune_method, current_time: current_time)
+        begin
+          pruned[model.table_name] = model.prune!(*params, prune_method: prune_method, current_time: current_time)
+        rescue => e
+          errors << e
+        end
       end
+
+      [pruned, errors]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-prunable
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - dr2m
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec