ar-resque-counter-cache 1.0.2 → 2.0.0

data/ar-resque-counter-cache.gemspec

@@ -19,14 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 2.3.5"
-  s.add_dependency "resque", "~> 1.10"
-  s.add_dependency "resque-lock-timeout", "~> 0.3.1"
-  s.add_dependency "after_commit", "~> 1.0.6"
+  s.add_dependency "activerecord", "~> 3.0.0"
+  s.add_dependency "resque", "~> 1.10.0"
+  s.add_dependency "resque-lock-timeout", "~> 0.2.1"
 
-  s.add_development_dependency "rspec", "~> 1.3.0"
+  s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "sqlite3-ruby", "~> 1.3.3"
-  s.add_development_dependency "SystemTimer", "~> 1.2.2"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "yajl-ruby"
 end

data/lib/ar-resque-counter-cache/active_record.rb

@@ -1,5 +1,3 @@
-require 'after_commit'
-
 module ArAsyncCounterCache
 
   module ActiveRecord
@@ -51,7 +49,7 @@ module ArAsyncCounterCache
             ArAsyncCounterCache::IncrementCountersWorker.cache_and_enqueue(parent_class, parent_id, column, :increment)
           end
         end
-        after_commit_on_create(method_name)
+        after_commit(method_name, :on => :create)
         # Define after_destroy callback method.
         method_name = "#{base_method_name}_after_destroy".to_sym
         define_method(method_name) do
@@ -59,7 +57,7 @@ module ArAsyncCounterCache
             ArAsyncCounterCache::IncrementCountersWorker.cache_and_enqueue(parent_class, parent_id, column, :decrement)
           end
         end
-        after_commit_on_destroy(method_name)
+        after_commit(method_name, :on => :destroy)
       end
 
       def async_counter_cache_column(opt)

data/lib/ar-resque-counter-cache/version.rb

@@ -1,3 +1,3 @@
 module ArAsyncCounterCache
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/spec/integration_spec.rb

@@ -37,16 +37,16 @@ describe "integration" do
     @post1.reload.count_of_comments.should == 0
     @post2.reload.count_of_comments.should == 0
 
-    # [ArAsyncCounterCache::IncrementCountersWorker, "User", 2, "comments_count"]
+    # [ArAsyncCounterCache::IncrementCountersWorker, "Post", 1, "count_of_comments"]
     perform_next_job
     @user1.reload.posts_count.should == 2
     @user1.reload.comments_count.should == 0
     @user2.reload.posts_count.should == 0
-    @user2.reload.comments_count.should == 2
-    @post1.reload.count_of_comments.should == 0
+    @user2.reload.comments_count.should == 0
+    @post1.reload.count_of_comments.should == 2
     @post2.reload.count_of_comments.should == 0
 
-    # [ArAsyncCounterCache::IncrementCountersWorker, "Post", 1, "count_of_comments"]
+    # [ArAsyncCounterCache::IncrementCountersWorker, "User", 2, "comments_count"]
     perform_next_job
     @user1.reload.posts_count.should == 2
     @user1.reload.comments_count.should == 0

data/spec/redis-test.conf

@@ -2,12 +2,6 @@ daemonize yes
 pidfile ./redis-test.pid
 port 9736
 timeout 300
-save 900 1
-save 300 10
-save 60 10000
-dbfilename ./dump.rdb
 dir .
 loglevel debug
 logfile stdout
-databases 16
-glueoutputbuf yes

data/spec/spec_helper.rb

@@ -2,35 +2,35 @@ spec_dir = File.expand_path(File.dirname(__FILE__))
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
 require 'rubygems'
-# Ensure resque for tests.
 require 'resque'
 require 'ar-resque-counter-cache'
-require 'spec'
+require 'rspec'
 require 'models'
 
-cwd = Dir.getwd
-Dir.chdir(spec_dir)
-
 if !system("which redis-server")
   puts '', "** can't find `redis-server` in your path"
   abort ''
 end
 
 at_exit do
-  if (pid = `cat redis-test.pid`.strip) =~ /^\d+$/
-    puts "Killing test redis server with pid #{pid}..."
-    `rm -f dump.rdb`
-    `rm -f redis-test.pid`
-    Process.kill("KILL", pid.to_i)
-    Dir.chdir(cwd)
+  Dir.chdir(spec_dir) do
+    if (pid = `cat redis-test.pid`.strip) =~ /^\d+$/
+      puts "Killing test redis server with pid #{pid}..."
+      `rm -f dump.rdb`
+      `rm -f redis-test.pid`
+      Process.kill("KILL", pid.to_i)
+    end
   end
 end
 
 puts "Starting redis for testing at localhost:9736..."
-`redis-server #{spec_dir}/redis-test.conf`
+Dir.chdir(spec_dir) do
+  `redis-server #{spec_dir}/redis-test.conf`
+end
+
 Resque.redis = '127.0.0.1:9736'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
     ArAsyncCounterCache.resque_job_queue = :testing
   end

metadata

@@ -1,123 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ar-resque-counter-cache
-version: !ruby/object:Gem::Version
-  version: 1.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 2.0.0
 platform: ruby
-authors:
+authors: 
 - Aaron Gibralter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-02-02 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2153626680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
   prerelease: false
-  version_requirements: *2153626680
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: &2153626180 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.10'
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: resque
   prerelease: false
-  version_requirements: *2153626180
-- !ruby/object:Gem::Dependency
-  name: resque-lock-timeout
-  requirement: &2153625720 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+      - !ruby/object:Gem::Version 
+        version: 1.10.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: resque-lock-timeout
   prerelease: false
-  version_requirements: *2153625720
-- !ruby/object:Gem::Dependency
-  name: after_commit
-  requirement: &2153625260 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
+      - !ruby/object:Gem::Version 
+        version: 0.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2153625260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2153624800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
   prerelease: false
-  version_requirements: *2153624800
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2153624340 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   prerelease: false
-  version_requirements: *2153624340
-- !ruby/object:Gem::Dependency
-  name: SystemTimer
-  requirement: &2153623880 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :development
-  prerelease: false
-  version_requirements: *2153623880
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2153623500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153623500
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &2153623040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
   type: :development
-  prerelease: false
-  version_requirements: *2153623040
-description: Increment ActiveRecord's counter cache column asynchronously using Resque
-  (and resque-lock-timeout).
-email:
+  version_requirements: *id005
+description: Increment ActiveRecord's counter cache column asynchronously using Resque (and resque-lock-timeout).
+email: 
 - aaron.gibralter@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -134,32 +94,35 @@ files:
 - spec/models.rb
 - spec/redis-test.conf
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/agibralter/ar-resque-counter-cache
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: ar-resque-counter-cache
-rubygems_version: 1.8.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Increment ActiveRecord's counter cache column asynchronously using Resque
-  (and resque-lock-timeout).
-test_files:
+summary: Increment ActiveRecord's counter cache column asynchronously using Resque (and resque-lock-timeout).
+test_files: 
 - spec/ar_resque_counter_cache/active_record_spec.rb
 - spec/integration_spec.rb
 - spec/models.rb