activerecord-prunable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53737b5692d22d48a79f1b754a7541683e5e1226
-  data.tar.gz: 96d239d3b0809674c2af1095ed5674cfd7889df1
+  metadata.gz: a969a628d477ceb71a467f4464b14b53632718aa
+  data.tar.gz: e6f7fde7c349973bdb80ca2f580dfb4f8871fd4f
 SHA512:
-  metadata.gz: b1c9ad1d3c656a02e318910140a35765fb3b638340085f85cd3dcd0fd4005ea9327591d17d71d0cbdab4c8b95e6a2fe54825d651e373d7014bbd2b5866cad7bf
-  data.tar.gz: 1e49941cf2e63081ef6c2dff32d4207bf22666a084cf3918baac7fd4b983f0957d8beeda8b53cf028017a1336faa3758d87c7d0f2b23256ccf84d10e450b0f17
+  metadata.gz: 0044529be2922d5c1765889d14a7e85d2af8bd5c54abd3d3f8ab74b53e0e3dea86a8b1d686949b5a2dc9a357e3a9961227e99a929339892d6b2a481dc0a76c52
+  data.tar.gz: 0751d43fe59f9c76f0f95a7f6b92aea445025f1b300121f6d3e3c103453db55d7481682da51bdc7c3e2e50fa0c699d44afb8289a194dfa6420bf21c30a6b461c

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    activerecord-prunable (0.2.0)
+    activerecord-prunable (0.2.1)
       activerecord
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -23,6 +23,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
+    byebug (9.0.5)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
@@ -49,6 +50,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-prunable!
+  byebug
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -61,6 +61,12 @@ Set default method of pruning (:destroy or :delete):
 Prunable.prune!(prune_method: :delete)
 ```
 
+Call `:prunable` scope with params:
+
+```ruby
+Prunable.prune!(params: [:foo, :bar])
+```
+
 Getting an array of all models that include `ActiveRecord::Prunable`:
 
 ```ruby

data/activerecord-prunable.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-prunable"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["dr2m"]
   spec.email         = ["maletin@maletin.work"]
 
@@ -13,4 +13,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord"
   spec.add_dependency "activesupport"
+
+  spec.add_development_dependency "byebug"
 end

data/lib/active_record/prunable.rb

@@ -19,20 +19,18 @@ module ActiveRecord
 
     module ClassMethods
       def prune_method(method)
-        unless [:destroy, :delete].include?(method)
-          logger.info "Incorrect prune method #{method} will be ignored"
-          return false
-        end
+        return false unless check_prune_method(method)
 
-        logger.info "Prune method #{method} was successfully setted"
+        logger.info "Prune method #{method} was successfully setted for #{self}"
         class_variable_set(:@@prune_method, method)
       end
 
-      def prune!
+      def prune!(*params, prune_method: nil)
         logger.info "Pruning old records of #{self}"
-        return false unless check_scope
+        return false unless check_scope(*params)
 
-        destroyed = prune_by_method
+        scope = prunable(*params)
+        destroyed = prune_by_method(scope, prune_method)
 
         if destroyed > 0
           logger.info "#{destroyed} records have been pruned."
@@ -45,13 +43,13 @@ module ActiveRecord
 
       private
 
-      def check_scope
+      def check_scope(*params)
         unless respond_to?(:prunable)
           logger.info "This model has no :prunable scope, nothing to prune."
           return false
         end
 
-        unless prunable.is_a?(::ActiveRecord::Relation)
+        unless prunable(*params).is_a?(::ActiveRecord::Relation)
           logger.info ":prunable is not a relation, nothing to prune."
           return false
         end
@@ -59,19 +57,29 @@ module ActiveRecord
         true
       end
 
-      def prune_by_method
+      def check_prune_method(method)
+        unless [:destroy, :delete].include?(method)
+          logger.info "Incorrect prune method #{method} will be ignored for #{self}"
+          return false
+        end
+        true
+      end
+
+      def prune_by_method(scope, prune_method)
         unless class_variable_defined?(:@@prune_method)
-          prune_method = :destroy
+          prune_method = prune_method || :destroy
         else
           prune_method = class_variable_get(:@@prune_method)
         end
 
+        return false unless check_prune_method(prune_method)
+
         logger.info "Prune method is #{prune_method}"
 
         if prune_method == :delete
-          prunable.delete_all
+          scope.delete_all
         else
-          prunable.destroy_all.size
+          scope.destroy_all.size
         end
       end
     end

data/lib/activerecord-prunable.rb

@@ -9,14 +9,10 @@ module Prunable
       ActiveRecord::Prunable.includes
     end
 
-    def prune!(*models, prune_method: nil)
+    def prune!(*models, prune_method: nil, params: [])
       models = self.models if models.empty?
       models.each do |model|
-        if prune_method && !model.class_variable_defined?(:@@prune_method)
-          model.prune_method(prune_method)
-        end
-
-        model.prune!
+        model.prune!(*params, prune_method: prune_method)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-prunable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - dr2m
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - maletin@maletin.work