acts_as_sweepable 0.2.1 → 0.2.2

data/README.md

@@ -28,7 +28,8 @@ Params accepted by this method:
 * `time` - d(days),h(hours), m(minutes)
 * `conditions` - additional SQL conditions (like WHERE)
 * `columns` - (default :updated_at) - which columns should it consider when removing
-* `method` - (default: destroy_all) - which method should it use to destroy objects
+* `method` - (default: :destroy_all) - which method should it use to destroy objects
+* `format` - (default: :db) - should it use to_s(:db) or to_i
 
 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.2.1') do |p|
+Echoe.new('acts_as_sweepable', '0.2.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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_sweepable"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]

data/lib/acts_as_sweepable.rb

@@ -2,7 +2,8 @@
 module Acts
   module AsSweepable
 
-    class InvalidTime < StandardError; end
+    class InvalidTime   < StandardError; end
+    class InvalidFormat < StandardError; end
 
     def self.included(base)
       base.extend ClassMethods
@@ -18,18 +19,28 @@ module Acts
         conditions = options.delete(:conditions)
         columns = [options.delete(:columns) || :updated_at].flatten
         remove_method = options.delete(:method) || :destroy_all
-
+        time_format = options.delete(:format) || :db
 
         time = case time_ago
+          when /^(\d+)s$/ then Time.now - $1.to_i.second
           when /^(\d+)m$/ then Time.now - $1.to_i.minute
           when /^(\d+)h$/ then Time.now - $1.to_i.hour
           when /^(\d+)d$/ then Time.now - $1.to_i.day
           else raise(InvalidTime, time_ago)
         end
 
+        case time_format
+          when :db then
+            time = time.to_s(:db)
+          when :integer then
+            time = time.to_i
+          else
+            raise(InvalidFormat, time_format)
+        end
+
         statement = []
         columns.each do |column|
-          statement << "#{column}  < '#{time.to_s(:db)}'"
+          statement << "#{column}  < '#{time}'"
         end
 
         statement = "(#{statement.join(' OR ')})"

data/spec/acts_as_sweepable_spec.rb

@@ -2,9 +2,6 @@ require 'spec_helper'
 
 ROOT = File.expand_path(File.dirname(__FILE__))
 
-class CoolElement < ActiveRecord::Base
-end
-
 describe CoolElement do
   subject { CoolElement }
 
@@ -117,3 +114,23 @@ describe CoolElement do
   end
 
 end
+
+describe IntElement do
+  subject { IntElement }
+
+  before(:each){ IntElement.destroy_all}
+
+  context 'when we have a integer timestamp' do
+    it 'should work in a normal way' do
+      el = subject.create(
+        :timestamp => 10.days.ago.to_i
+      )
+      subject.sweep(:time => '9d', :format => :integer, :columns => :timestamp)
+      subject.all.count.should eql(0)
+
+      el = subject.create(:timestamp => 10.days.ago.to_i)
+      subject.sweep(:time => '11d', :format => :integer, :columns => :timestamp)
+      subject.all.count.should eql(1)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,3 +23,12 @@ ActiveRecord::Schema.define do
     end
 end
 
+ActiveRecord::Schema.define do
+    create_table :int_elements do |table|
+      table.text :name
+      table.integer :timestamp
+    end
+end
+
+class CoolElement < ActiveRecord::Base; end
+class IntElement  < ActiveRecord::Base; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_sweepable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20441820 !ruby/object:Gem::Requirement
+  requirement: &16651720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *20441820
+  version_requirements: *16651720
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &20438860 !ruby/object:Gem::Requirement
+  requirement: &16650940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20438860
+  version_requirements: *16650940
 - !ruby/object:Gem::Dependency
   name: active_record
-  requirement: &20437780 !ruby/object:Gem::Requirement
+  requirement: &16647120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20437780
+  version_requirements: *16647120
 description: Adds a class method called sweep to ActiveRecord - used to remove old
   elements
 email: maciej@mensfeld.pl