acts_as_sweepable 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,2 +1,4 @@
+= Version 0.1.2
+* Switched to convenient method declaration 
 = Version 0.1.0
 * Gem existence started

data/README.md

@@ -15,23 +15,23 @@ Adds a class method called sweep to ActiveRecord - used to remove old elements.
 ## Example
 
     # Will remove elements older than 10 days
-    MyClass.sweep('10d')
+    MyClass.sweep(:time => '10d')
 
     # Will remove elements older than 10 hours
-    MyClass.sweep('10h')
+    MyClass.sweep(:time => '10h')
 
     # Will remove elements older than 10 minutes
-    MyClass.sweep('10m')
+    MyClass.sweep(:time => '10m')
 
 Params accepted by this method:
 
-* `time_ago` - d(days),h(hours), m(minutes)
+* `time` - d(days),h(hours), m(minutes)
 * `conditions` - additional SQL conditions (like WHERE)
-* `created_or_updated` - (default true) - should it use updated_at and created_at to determine if object is old enough or should it use just created_at.
+* `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.
 
 You can also yield a block of code - it will be performed on every object that should be deleted:
 
-    MyClass.sweep('10d') do |el|
+    MyClass.sweep(:time => '10d') do |el|
         el.do_smhtng
     end
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('acts_as_sweepable', '0.1.1') do |p|
+Echoe.new('acts_as_sweepable', '0.1.2') 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,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_sweepable}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]
   s.cert_chain = ["/home/mencio/.cert_keys/gem-public_cert.pem"]
-  s.date = %q{2011-04-17}
+  s.date = %q{2011-04-23}
   s.description = %q{Adds a class method called sweep to ActiveRecord - used to remove old elements}
   s.email = %q{maciej@mensfeld.pl}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md", "lib/acts_as_sweepable.rb"]

data/lib/acts_as_sweepable.rb

@@ -7,7 +7,15 @@ module Acts
     end
 
     module ClassMethods
-      def sweep(time_ago = nil, conditions = nil, created_or_updated = true)
+      def sweep(*sources)
+        # time_ago = nil, conditions = nil, created_or_updated = true
+        options = sources.extract_options!.stringify_keys
+
+        time_ago = options.delete("time")
+        conditions = options.delete("conditions")
+        created_or_updated = options.delete("active")
+        created_or_updated = true if created_or_updated.nil?
+        
         time = case time_ago
           when /^(\d+)m$/ then Time.now - $1.to_i.minute
           when /^(\d+)h$/ then Time.now - $1.to_i.hour
@@ -29,10 +37,10 @@ module Acts
         # Run on each block of code
         els.each {|el| yield el } if block_given?
 
-        self.delete_all "#{statement} #{conditions}"
+        self.destroy_all "#{statement} #{conditions}"
       end
     end
-    
+
   end
 end
 

data/spec/acts_as_sweepable_spec.rb

@@ -13,19 +13,19 @@ describe CoolElement do
   context "when object is old enough" do
     it "should be sweeped" do
       el = subject.create(:created_at => 10.days.ago)
-      subject.sweep('9d')
+      subject.sweep(:time => '9d')
       subject.all.count.should eql(0)
       el = subject.create(:created_at => 10.hours.ago)
-      subject.sweep('9h')
+      subject.sweep(:time => '9h')
       subject.all.count.should eql(0)
       el = subject.create(:created_at => 10.minutes.ago)
-      subject.sweep('9m')
+      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('9m')
+      subject.sweep(:time => '9m')
       subject.all.count.should eql(0)
       el = subject.create(:created_at => 1.minutes.ago, :updated_at => 10.minutes.ago)
-      subject.sweep('9m')
+      subject.sweep(:time => '9m')
       subject.all.count.should eql(0)
     end 
   end
@@ -33,13 +33,13 @@ describe CoolElement do
   context "when object is not old enough" do
     it "should not be sweeped" do
       el = subject.create(:created_at => 10.days.ago)
-      subject.sweep('11d')
+      subject.sweep(:time => '11d')
       subject.all.count.should eql(1)
       el = subject.create(:created_at => 10.minutes.ago)
-      subject.sweep('11m')
+      subject.sweep(:time => '11m')
       subject.all.count.should eql(1)
       el = subject.create(:created_at => 10.hours.ago)
-      subject.sweep('11h')
+      subject.sweep(:time => '11h')
       subject.all.count.should eql(2)
     end
   end
@@ -48,7 +48,7 @@ describe CoolElement 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')
-      subject.sweep('9d', 'name LIKE "Second"')
+      subject.sweep(:time => '9d', :conditions => 'name LIKE "Second"')
       subject.all.count.should eql(1)
       subject.all.first.name.should eql "First"
     end
@@ -57,13 +57,13 @@ describe CoolElement do
   context "when we use only updated_at" do
     it "should sweep old objects" do
       el = subject.create(:updated_at => 10.days.ago)
-      subject.sweep('9d', nil, false)
+      subject.sweep(:time => '9d', :active => false)
       subject.all.count.should eql(0)
     end
 
     it "should not sweep recently updated objects" do
       el = subject.create(:updated_at => 1.days.ago, :created_at => 10.days.ago)
-      subject.sweep('9d', nil, false)
+      subject.sweep(:time => '9d', :active => false)
       subject.all.count.should eql(1)  
     end
   end
@@ -72,7 +72,7 @@ describe CoolElement do
     it "should be able to perform on each" do
       2.times { |i| subject.create(:created_at => 10.days.ago, :name => i.to_s) }
       saved = []
-      subject.sweep('1d') do |el|
+      subject.sweep(:time => '1d') do |el|
         saved << el.name      
       end
       saved.first.to_i.should eql(0)

data.tar.gz.sig

@@ -1,2 +1 @@
-$"/1���::/V���K]��}�w���li$]Wnƅv���`-�uaI�NN���GrN��a��zW�h
-.jt���e������=��Zz/,2��x�'����]S�C
+��>�y~}�F�l��x(�����Qߴ	,�[nY��I$����L+�ù�e��7`����ENU�D@��G���u�J��

metadata

@@ -2,7 +2,7 @@
 name: acts_as_sweepable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Maciej Mensfeld
@@ -31,7 +31,7 @@ cert_chain:
   BH3YFsdk
   -----END CERTIFICATE-----
 
-date: 2011-04-17 00:00:00 +02:00
+date: 2011-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1,2 +1,2 @@
-Pc�D!i��0>Ϟ
-X`X@�y�Y�E�'�H@�<�nQB�L|�f�5맞��Ƶ>�
d��ۣ���F,.�:�Xwg��/Ns�M�3#Z-uj�
+;�I����~�\��!F�K�	R`��f���Ή-��+����6�?�"I��9g<��†ֳ�!?Yh�VO�[G�,�]��`
+�!�}��76�F�W&�6W4��iR��0����.";S�7DƳ�<5Ds��:��.������^F� ��Y�0���SJ���_�F�d�7�4L^��F=Em�K&=Ǻ����� ]�