resque-ensure-connected 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,42 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ree-1.8.7-2011.03@resque-ensure-connected --create

data/CONTRIBUTORS.txt

@@ -0,0 +1,6 @@
+Ryan Sonnek - Original Author
+
+
+Complete list of contributors:
+https://github.com/socialcast/resque-ensure-connected/contributors
+

data/Gemfile

@@ -1,17 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'resque', '~> 1.10.0'
-gem 'activerecord', '>= 2.3.5'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "mocha", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-  gem "resque_unit", ">= 0"
-end
+# Specify your gem's dependencies in resque-ensure-connected.gemspec
+gemspec

data/Gemfile.lock

@@ -1,47 +1,52 @@
+PATH
+  remote: .
+  specs:
+    resque-ensure-connected (0.2.0)
+      activerecord (>= 2.3.5)
+      resque (>= 1.10.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    i18n (0.6.0)
     json (1.4.6)
     mocha (0.9.8)
       rake
-    rack (1.2.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    redis (2.1.1)
-    redis-namespace (0.8.0)
+    multi_json (1.0.3)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    rake (0.9.2.2)
+    redis (2.2.2)
+    redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.10.0)
-      json (~> 1.4.6)
-      redis-namespace (~> 0.8.0)
+    resque (1.19.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque_unit (0.3.1)
-      json (~> 1.4.6)
+    resque_unit (0.4.1)
+      json (>= 1.4.6)
     shoulda (2.11.3)
-    sinatra (1.1.0)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    tilt (1.1)
-    tzinfo (0.3.23)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    tzinfo (0.3.31)
     vegas (0.1.8)
       rack (>= 1.0.0)
 
@@ -49,11 +54,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.3.5)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
   mocha
-  rcov
-  resque (~> 1.10.0)
-  resque_unit
+  rake (= 0.9.2.2)
+  resque-ensure-connected!
+  resque_unit (= 0.4.1)
   shoulda

data/LICENSE.txt

@@ -1,20 +1,22 @@
-Copyright (c) 2010 Ryan Sonnek
+The MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2011 Socialcast, Inc
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# resque-ensure-connected
+
+Ensure that all resque jobs have a valid activerecord connection before execution.
+
+## Configuration
+
+NONE!  The gem automatically configures Resque to connect with each forked process.
+
+## Installation
+
+``` ruby
+# Bundler Gemfile
+gem 'resque-ensure-connected'
+```
+
+## Contributing
+ 
+* Fork the project
+* Fix the issue
+* Add tests
+* Create pull request on github
+
+see CONTRIBUTORS.txt for complete list of contributors.
+
+## Copyright
+
+Copyright (c) 2011 Socialcast Inc. 
+See LICENSE.txt for further details.
+

data/Rakefile

@@ -1,53 +1,8 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "resque-ensure-connected"
-  gem.homepage = "http://github.com/wireframe/resque-ensure-connected"
-  gem.license = "MIT"
-  gem.summary = %Q{ensure active record connections are valid before performing work}
-  gem.description = %Q{ensure active record connections are valid before performing work}
-  gem.email = "ryan@codecrate.com"
-  gem.authors = ["Ryan Sonnek"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
+require "bundler/gem_tasks"
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "resque-ensure-connected #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/resque-ensure-connected.rb

@@ -1,5 +1,14 @@
 require 'active_record'
+require 'resque'
+require "resque-ensure-connected/version"
 
+module Resque
+  module EnsureConnected
+    def self.verify_active_connections
+      ActiveRecord::Base.connection_handler.verify_active_connections!
+    end
+  end
+end
 Resque.after_fork do |job|
-  ActiveRecord::Base.connection_handler.verify_active_connections!
+  Resque::EnsureConnected.verify_active_connections
 end

data/lib/resque-ensure-connected/version.rb

@@ -0,0 +1,5 @@
+module Resque
+  module EnsureConnected
+    VERSION = "0.2.0"
+  end
+end

data/resque-ensure-connected.gemspec

@@ -1,76 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "resque-ensure-connected/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{resque-ensure-connected}
-  s.version = "0.1.0"
+  s.name        = "resque-ensure-connected"
+  s.version     = Resque::EnsureConnected::VERSION
+  s.authors     = ["Ryan Sonnek"]
+  s.email       = ["ryan@socialcast.com"]
+  s.homepage    = ""
+  s.summary     = %q{ensure active record connections are valid before performing work}
+  s.description = %q{ensure active record connections are valid before performing resque background jobs}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-12-06}
-  s.description = %q{ensure active record connections are valid before performing work}
-  s.email = %q{ryan@codecrate.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/resque-ensure-connected.rb",
-    "resque-ensure-connected.gemspec",
-    "test/helper.rb",
-    "test/test_resque-ensure-connected.rb"
-  ]
-  s.homepage = %q{http://github.com/wireframe/resque-ensure-connected}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{ensure active record connections are valid before performing work}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_resque-ensure-connected.rb"
-  ]
+  s.rubyforge_project = "resque-ensure-connected"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resque>, ["~> 1.10.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<resque_unit>, [">= 0"])
-    else
-      s.add_dependency(%q<resque>, ["~> 1.10.0"])
-      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<resque_unit>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<resque>, ["~> 1.10.0"])
-    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<resque_unit>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<resque>, [">= 1.10.0"])
+  s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<mocha>, [">= 0"])
+  s.add_development_dependency(%q<resque_unit>, ["0.4.1"])
+  s.add_development_dependency(%q<rake>, ["0.9.2.2"])
 end
-

data/test/helper.rb

@@ -13,6 +13,7 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'resque_unit'
+Resque.enable_hooks!
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_resque-ensure-connected.rb

@@ -3,36 +3,30 @@ require 'helper'
 class TestResqueEnsureConnected < Test::Unit::TestCase
   class FakeJob
     @queue = 'test'
-    def self.perform
+    def self.perform(foo, bar)
     end
   end
 
   class FakeHandler
     @invoked = false
     def verify_active_connections!
-      @@invoked = true
-      puts 'invoked'
-      puts @@invoked
+      @invoked = true
     end
-    def self.invoked?
+    def invoked?
       @invoked
     end
   end
 
   should "ensure verify connections after forking process" do
-    Resque.redis.flushall
+    Resque.reset!
     worker = Resque::Worker.new(:jobs)
     Resque::Job.create(:jobs, FakeJob, 20, '/tmp')
 
     handler = FakeHandler.new
     ActiveRecord::Base.connection_handler = handler
-    puts FakeHandler.invoked?
-    worker.work(0)
 
-    puts 'assert'
-    puts FakeHandler.invoked?
-    puts handler.inspect
-    assert FakeHandler.invoked?
-    #WTF? why is this assertion failing?
+    Resque.after_fork.call
+
+    assert handler.invoked?
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-ensure-connected
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,17 +15,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
-default_executable: 
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: resque
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -34,10 +32,10 @@ dependencies:
         - 0
         version: 1.10.0
   requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,10 +48,10 @@ dependencies:
         - 5
         version: 2.3.5
   requirement: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: shoulda
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +62,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,91 +76,67 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: resque_unit
   prerelease: false
-  type: :development
-  name: bundler
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 13
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 4
+        - 1
+        version: 0.4.1
   requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  type: :development
-  name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
+  requirement: *id006
   type: :development
-  name: resque_unit
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-description: ensure active record connections are valid before performing work
-email: ryan@codecrate.com
+description: ensure active record connections are valid before performing resque background jobs
+email: 
+- ryan@socialcast.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
+- .rvmrc
+- CONTRIBUTORS.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - lib/resque-ensure-connected.rb
+- lib/resque-ensure-connected/version.rb
 - resque-ensure-connected.gemspec
 - test/helper.rb
 - test/test_resque-ensure-connected.rb
-has_rdoc: true
-homepage: http://github.com/wireframe/resque-ensure-connected
-licenses: 
-- MIT
+homepage: ""
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -188,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: resque-ensure-connected
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: ensure active record connections are valid before performing work

data/README.rdoc

@@ -1,27 +0,0 @@
-= resque-ensure-connected
-
-Ensure that all resque jobs have a valid activerecord connection before execution.
-
-== Configuration
-
-NONE!  The gem automatically configures Resque to connect with each forked process.
-
-== Installation
-
-  gem resque-ensure-connected
-
-== Contributing to resque-ensure-connected
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2010 Ryan Sonnek. See LICENSE.txt for
-further details.
-

data/VERSION

@@ -1 +0,0 @@
-0.1.0