acts_as_sweepable 0.1.4 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= Version 0.2.0
+* Changes to API (no backword compatibility)
+* Using only updated_at by default
 = Version 0.1.4
 * use_delete - use delete_all instead of destroy_all
 = Version 0.1.3

data/README.md

@@ -14,20 +14,21 @@ Adds a class method called sweep to ActiveRecord - used to remove old elements.
 
 ## Example
 
-    # Will remove elements older than 10 days
+    # Will remove elements that weren't updated from at least 10 days
     MyClass.sweep(:time => '10d')
 
-    # Will remove elements older than 10 hours
+    # Will remove elements that weren't updated from at least 10 hours
     MyClass.sweep(:time => '10h')
 
-    # Will remove elements older than 10 minutes
+    # Will remove elements that weren't updated from at least 10 minutes
     MyClass.sweep(:time => '10m')
 
 Params accepted by this method:
 
 * `time` - d(days),h(hours), m(minutes)
 * `conditions` - additional SQL conditions (like WHERE)
-* `active` - (default true) - should it use updated_at and created_at to determine if object is old enough or should it use just created_at.
+* `columns` - (default :updated_at) - which columns should it consider when removing
+* `method` - (default: destroy_all) - which method should it use to destroy objects
 
 You can also yield a block of code - it will be performed on every object that should be deleted:
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('acts_as_sweepable', '0.1.4') do |p|
+Echoe.new('acts_as_sweepable', '0.2.0') do |p|
   p.description    = "Adds a class method called sweep to ActiveRecord - used to remove old elements"
   p.url            = "https://github.com/mensfeld/Acts-as-Sweepable"
   p.author         = "Maciej Mensfeld"

data/acts_as_sweepable.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_sweepable"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]
-  s.date = "2012-06-16"
+  s.date = "2012-06-17"
   s.description = "Adds a class method called sweep to ActiveRecord - used to remove old elements"
   s.email = "maciej@mensfeld.pl"
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md", "lib/acts_as_sweepable.rb"]

data/lib/acts_as_sweepable.rb

@@ -16,10 +16,10 @@ module Acts
 
         time_ago = options.delete(:time)
         conditions = options.delete(:conditions)
-        created_or_updated = options.delete(:created_or_updated)
-        delete = options.delete(:use_delete) || false
-        created_or_updated = true if created_or_updated.nil?
-        
+        columns = [options.delete(:columns) || :updated_at].flatten
+        remove_method = options.delete(:method) || :destroy_all
+
+
         time = case time_ago
           when /^(\d+)m$/ then Time.now - $1.to_i.minute
           when /^(\d+)h$/ then Time.now - $1.to_i.hour
@@ -27,26 +27,22 @@ module Acts
           else raise(InvalidTime, time_ago)
         end
 
-        statement = "updated_at < '#{time.to_s(:db)}'"
-
-        if created_or_updated
-          statement += " OR created_at < '#{time.to_s(:db)}')"
-          statement = '('+statement
+        statement = []
+        columns.each do |column|
+          statement << "#{column}  < '#{time.to_s(:db)}'"
         end
 
-        conditions = "AND #{conditions} " if conditions
+        statement = "(#{statement.join(' OR ')})"
 
-        els = self.where("#{statement} #{conditions}")
+        conditions = "AND #{conditions} " if conditions
 
         # Run on each block of code
-        els.each {|el| yield el } if block_given?
-
-        if delete
-          self.delete_all "#{statement} #{conditions}"
-        else
-          self.destroy_all "#{statement} #{conditions}"
+        if block_given?
+          els = self.where("#{statement} #{conditions}")
+          els.each {|el| yield el }
         end
 
+        self.send(remove_method, "#{statement} #{conditions}")
       end
     end
 
@@ -54,4 +50,3 @@ module Acts
 end
 
 ActiveRecord::Base.send(:include, Acts::AsSweepable)
-

data/spec/acts_as_sweepable_spec.rb

@@ -12,19 +12,34 @@ describe CoolElement do
 
   context "when object is old enough" do
     it "should be sweeped" do
-      el = subject.create(:created_at => 10.days.ago)
+      el = subject.create(
+        :created_at => 10.days.ago,
+        :updated_at => 10.days.ago
+      )
       subject.sweep(:time => '9d')
       subject.all.count.should eql(0)
-      el = subject.create(:created_at => 10.hours.ago)
+      el = subject.create(
+        :created_at => 10.hours.ago,
+        :updated_at => 10.hours.ago
+      )
       subject.sweep(:time => '9h')
       subject.all.count.should eql(0)
-      el = subject.create(:created_at => 10.minutes.ago)
+      el = subject.create(
+        :created_at => 10.minutes.ago,
+        :updated_at => 10.minutes.ago
+      )
       subject.sweep(:time => '9m')
       subject.all.count.should eql(0)
-      el = subject.create(:created_at => 10.minutes.ago, :updated_at => 1.minutes.ago)
-      subject.sweep(:time => '9m')
+      el = subject.create(
+        :created_at => 10.minutes.ago,
+        :updated_at => 1.minutes.ago
+      )
+      subject.sweep(:time => '9m', :columns => [:created_at])
       subject.all.count.should eql(0)
-      el = subject.create(:created_at => 1.minutes.ago, :updated_at => 10.minutes.ago)
+      el = subject.create(
+        :created_at => 1.minutes.ago,
+        :updated_at => 10.minutes.ago
+      )
       subject.sweep(:time => '9m')
       subject.all.count.should eql(0)
     end 
@@ -36,7 +51,7 @@ describe CoolElement do
       subject.sweep(:time => '11d')
       subject.all.count.should eql(1)
       el = subject.create(:created_at => 10.minutes.ago)
-      subject.sweep(:time => '11m')
+      subject.sweep(:time => '11m', :columns => :created_at)
       subject.all.count.should eql(1)
       el = subject.create(:created_at => 10.hours.ago)
       subject.sweep(:time => '11h')
@@ -46,8 +61,13 @@ describe CoolElement do
   
   context "when we add additional parameter" do
     it "should be used" do
-      el1 = subject.create(:created_at => 10.days.ago, :name => 'First')
-      el2 = subject.create(:created_at => 10.days.ago, :name => 'Second')
+      el1 = subject.create(
+        :created_at => 10.days.ago, :name => 'First')
+      el2 = subject.create(
+        :created_at => 10.days.ago,
+        :updated_at => 10.days.ago,
+        :name => 'Second'
+      )
       subject.sweep(:time => '9d', :conditions => 'name LIKE "Second"')
       subject.all.count.should eql(1)
       subject.all.first.name.should eql "First"
@@ -64,7 +84,7 @@ describe CoolElement do
     it "should not sweep recently updated objects" do
       el = subject.create(:updated_at => 1.days.ago, :created_at => 11.days.ago)
       subject.all.count.should eql(1)  
-      subject.sweep(:time => '9d', :created_or_updated => false)
+      subject.sweep(:time => '9d')
       subject.all.count.should eql(1) 
     end
   end
@@ -72,7 +92,13 @@ describe CoolElement do
   context "When we sweep smthg" do
     it "should be able to perform on each" do
       subject.expects(:destroy_all)
-      2.times { |i| subject.create(:created_at => 10.days.ago, :name => i.to_s) }
+      2.times do |i|
+        subject.create(
+          :created_at => 10.days.ago,
+          :updated_at => 10.days.ago,
+          :name => i.to_s
+        )
+      end
       saved = []
       subject.sweep(:time => '1d') do |el|
         saved << el.name      
@@ -86,7 +112,7 @@ describe CoolElement do
     it 'should use it instead of destroy' do
       2.times { |i| subject.create(:created_at => 10.days.ago, :name => i.to_s) }
       subject.expects(:delete_all)
-      subject.sweep(:time => '1d', :use_delete => true)
+      subject.sweep(:time => '1d', :method => :delete_all)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_sweepable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-06-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16911420 !ruby/object:Gem::Requirement
+  requirement: &7499640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *16911420
+  version_requirements: *7499640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &16910580 !ruby/object:Gem::Requirement
+  requirement: &7498720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16910580
+  version_requirements: *7498720
 - !ruby/object:Gem::Dependency
   name: active_record
-  requirement: &16906940 !ruby/object:Gem::Requirement
+  requirement: &7495540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16906940
+  version_requirements: *7495540
 description: Adds a class method called sweep to ActiveRecord - used to remove old
   elements
 email: maciej@mensfeld.pl