girl_friday 0.9.3 → 0.9.4

data/History.md

@@ -1,6 +1,11 @@
 Changes
 ================
 
+0.9.4
+---------
+
+* You can now pass in an existing Redis instance - :store\_config => [{ :redis => $redis }]
+
 0.9.3
 ---------
 

data/README.md

@@ -36,6 +36,14 @@ In your Rails app, create a `config/initializers/girl_friday.rb` which defines y
       ImageCrawler.process(msg)
     end
 
+    SCRAPE_QUEUE = GirlFriday::WorkQueue.new(:scrape_sites, :size => 4, :store => GirlFriday::Store::Redis, :store_config => [{ :host => 'host' }] do |msg|
+      Page.scrape(msg)
+    end
+
+    TRANSCODE_QUEUE = GirlFriday::WorkQueue.new(:scrape_sites, :size => 4, :store => GirlFriday::Store::Redis, :store_config => [{ :redis => $redis }] do |msg|
+      VideoProcessor.transcode(msg)
+    end
+
 :size is the number of workers to spin up and defaults to 5.  Keep in mind, ActiveRecord defaults to a connection pool size of 5 so if your workers are accessing the database you'll want to ensure that the connection pool is large enough by modifying `config/database.yml`.
 
 In your controller action or model, you can call `#push(msg)`
@@ -48,7 +56,6 @@ Your message processing block should **not** access any instance data or variabl
 
 You can call `GirlFriday::WorkQueue.immediate!` to process jobs immediately, which is helpful when testing. `GirlFriday::WorkQueue.queue!` will revert this & jobs will be processed by actors.
 
-
 More Detail
 --------------------
 

data/lib/girl_friday.rb

@@ -59,7 +59,12 @@ module GirlFriday
 
 end
 
-at_exit do
-  GirlFriday.shutdown!
+begin
+  ObjectSpace.each_object(GirlFriday).to_a
+  at_exit do
+    GirlFriday.shutdown!
+  end
+rescue RuntimeError
+  $stderr.puts "[warn] girl_friday will not shut down cleanly, pass -X+O to JRuby to enable ObjectSpace"
 end
 

data/lib/girl_friday/persistence.rb

@@ -48,7 +48,7 @@ module GirlFriday
       end
 
       def redis
-        @redis ||= ::Redis.new(*@opts)
+        @redis ||= (@opts.delete(:redis) || ::Redis.new(*@opts))
       end
     end
   end

data/lib/girl_friday/version.rb

@@ -1,3 +1,3 @@
 module GirlFriday
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/test/test_girl_friday.rb

@@ -109,6 +109,37 @@ class TestGirlFriday < MiniTest::Unit::TestCase
     end
   end
 
+  def test_should_persist_with_redis_instance
+    begin
+      require 'redis'
+      redis = Redis.new
+      redis.flushdb
+    rescue LoadError
+      return puts "Skipping redis test, 'redis' gem not found: #{$!.message}"
+    rescue Errno::ECONNREFUSED
+      return puts 'Skipping redis test, not running locally accepting connections over UNIX socket'
+    end
+
+    mutex = Mutex.new
+    total = 100
+    count = 0
+    incr = Proc.new do
+      mutex.synchronize do
+        count += 1
+      end
+    end
+
+    async_test do |cb|
+      queue = GirlFriday::WorkQueue.new('test', :size => 2, :store => GirlFriday::Store::Redis, :store_config => [{ :redis => redis }]) do |msg|
+        incr.call
+        cb.call if count == total
+      end
+      total.times do
+        queue.push(:text => 'foo')
+      end
+    end
+  end
+
   def test_should_allow_graceful_shutdown
     mutex = Mutex.new
     total = 100

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl_friday
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2164886320 !ruby/object:Gem::Requirement
+  requirement: &13466240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2164886320
+  version_requirements: *13466240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164885900 !ruby/object:Gem::Requirement
+  requirement: &13465820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164885900
+  version_requirements: *13465820
 description: Background processing, simplified
 email:
 - mperham@gmail.com
@@ -72,7 +71,6 @@ files:
 - test/test_girl_friday.rb
 - test/test_girl_friday_immediately.rb
 - test/timed_queue.rb
-has_rdoc: true
 homepage: http://github.com/mperham/girl_friday
 licenses: []
 post_install_message: 
@@ -93,13 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: girl_friday
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Background processing, simplified
-test_files:
-- test/helper.rb
-- test/test_batch.rb
-- test/test_girl_friday.rb
-- test/test_girl_friday_immediately.rb
-- test/timed_queue.rb
+test_files: []