girl_friday 0.10.0 → 0.11.0

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in girl_friday.gemspec
 gemspec
+gem 'rubinius-actor', :platforms => [:rbx, :jruby]
 
 # Needed for testing only!
 gem 'minitest'

data/History.md

@@ -1,6 +1,14 @@
 Changes
 ================
 
+HEAD
+---------
+
+* Remove old Rubinius 1.2.3 monkeypatches
+* Remove default `at_exit` handle which was causing issues [#67]
+* Support the rubinius-actor gem for jruby/rbx (jc00ke)
+  Avoids a nameclash for projects that define their own Actor class.
+
 0.10.0
 ---------
 

data/lib/girl_friday.rb

@@ -1,13 +1,5 @@
 require 'weakref'
 require 'thread'
-begin
-  # Rubinius
-  require 'actor'
-  require 'girl_friday/monkey_patches'
-rescue LoadError
-  # Others
-  require 'girl_friday/actor'
-end
 
 require 'girl_friday/version'
 require 'girl_friday/work_queue'
@@ -15,6 +7,16 @@ require 'girl_friday/error_handler'
 require 'girl_friday/persistence'
 require 'girl_friday/batch'
 
+begin
+  # Rubinius or JRuby
+  require 'rubinius/actor'
+  require 'girl_friday/monkey_patches'
+  GirlFriday::WorkQueue::Actor = Rubinius::Actor
+rescue LoadError
+  # Others
+  require 'girl_friday/actor'
+end
+
 module GirlFriday
 
   @lock = Mutex.new
@@ -88,10 +90,3 @@ module GirlFriday
   end
 
 end
-
-
-unless defined?($testing)
-  at_exit do
-    GirlFriday.shutdown!
-  end
-end

data/lib/girl_friday/error_handler.rb

@@ -3,7 +3,7 @@ module GirlFriday
 
     def self.default
       handlers = [Stderr]
-      handlers << Hoptoad if defined?(HoptoadNotifier)
+      handlers << Airbrake if defined?(::Airbrake)
       handlers
     end
 
@@ -14,12 +14,10 @@ module GirlFriday
       end
     end
 
-    class Hoptoad
+    class Airbrake
       def handle(ex)
-        HoptoadNotifier.notify_or_ignore(ex)
+        ::Airbrake.notify_or_ignore(ex)
       end
     end
-    Airbrake = Hoptoad
-
   end
 end

data/lib/girl_friday/version.rb

@@ -1,3 +1,3 @@
 module GirlFriday
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/test/helper.rb

@@ -1,4 +1,3 @@
-$testing = true
 puts RUBY_DESCRIPTION
 
 at_exit do
@@ -40,3 +39,18 @@ class MiniTest::Unit::TestCase
   end
 
 end
+
+module Faker
+  def initialize
+    @number_of_calls = 0
+  end
+
+  def number_of_calls
+    @number_of_calls
+  end
+
+
+  def count(*args,&blk)
+    @number_of_calls += 1
+  end
+end

data/test/test_batch.rb

@@ -34,10 +34,6 @@ class TestBatch < MiniTest::Unit::TestCase
     assert_equal 'x', results[1]
     assert_nil results[2]
     assert_equal 'x', results[3]
-
-    # Necessary to work around a Ruby 1.9.2 bug
-    # http://redmine.ruby-lang.org/issues/5342
-    sleep 0.1
   end
 
   def test_empty_batch

data/test/test_error_handler.rb

@@ -0,0 +1,60 @@
+require 'helper'
+
+
+class TestErrorHandler < MiniTest::Unit::TestCase
+  Stderr = GirlFriday::ErrorHandler::Stderr
+  Airbrake = GirlFriday::ErrorHandler::Airbrake
+
+  class FakeStderr
+    include Faker
+    def flush
+      "WOOSH!"
+    end
+    alias_method :puts, :count
+    alias_method :write, :count
+  end
+
+  class FakeAirbrake
+    include Faker
+    alias_method :notify_or_ignore, :count
+  end
+
+  class FakeError
+    def backtrace
+     %w(
+      We're no strangers to love
+      You know the rules and so do I
+      A full commitment's what I'm thinking of
+      You wouldn't get this from any other guy
+      I just wanna tell you how I'm feeling
+      Gotta make you understand
+     )
+    end
+  end
+
+  def handler
+    GirlFriday::ErrorHandler
+  end
+
+  def test_default
+    assert_equal [Stderr], handler.default
+
+    Object.const_set("Airbrake","super cool error catcher")
+    assert_equal [Stderr,Airbrake], handler.default
+    Object.send(:remove_const,:Airbrake)
+  end
+
+  def test_stderr
+    $stderr = FakeStderr.new
+    Stderr.new.handle(FakeError.new)
+    assert_equal 2, $stderr.number_of_calls
+  end
+
+  def test_airbrake
+    airbrake = FakeAirbrake.new
+    Object.const_set("Airbrake", airbrake)
+    Airbrake.new.handle(FakeError.new)
+    assert_equal 1, airbrake.number_of_calls
+    Object.send(:remove_const,:Airbrake)
+  end
+end

data/test/test_girl_friday_queue.rb

@@ -182,6 +182,8 @@ class TestGirlFridayQueue < MiniTest::Unit::TestCase
         queue.push(:text => 'foo')
       end
 
+      sleep 0.1
+
       assert_equal 1, GirlFriday.queues.size
       count = GirlFriday.shutdown!
       assert_equal 0, count

metadata

@@ -2,46 +2,63 @@
 name: girl_friday
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
     none: false
-  requirement: *2056
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: &2074 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
     none: false
-  requirement: *2074
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2092 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
-  requirement: *2092
   prerelease: false
   type: :development
 description: Background processing, simplified
@@ -69,7 +86,6 @@ files:
 - lib/girl_friday/actor.rb
 - lib/girl_friday/batch.rb
 - lib/girl_friday/error_handler.rb
-- lib/girl_friday/monkey_patches.rb
 - lib/girl_friday/persistence.rb
 - lib/girl_friday/server.rb
 - lib/girl_friday/version.rb
@@ -80,6 +96,7 @@ files:
 - server/views/index.erb
 - test/helper.rb
 - test/test_batch.rb
+- test/test_error_handler.rb
 - test/test_girl_friday.rb
 - test/test_girl_friday_immediately.rb
 - test/test_girl_friday_queue.rb
@@ -93,24 +110,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project: girl_friday
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Background processing, simplified
 test_files:
 - test/helper.rb
 - test/test_batch.rb
+- test/test_error_handler.rb
 - test/test_girl_friday.rb
 - test/test_girl_friday_immediately.rb
 - test/test_girl_friday_queue.rb
-...

data/lib/girl_friday/monkey_patches.rb

@@ -1,31 +0,0 @@
-if RUBY_ENGINE == 'rbx' && (Rubinius::VERSION < '1.2.4' || Rubinius::VERSION == '1.2.4dev')
-  puts "Loading rubinius actor monkeypatches" if $testing
-  class Actor
-
-    # Monkeypatch so this works with Rubinius 1.2.3 (latest).
-    # 1.2.4 should have the necessary fix included.
-    def notify_exited(actor, reason)
-      exit_message = nil
-      @lock.receive
-      begin
-        return self unless @alive
-        @links.delete(actor)
-        if @trap_exit
-          exit_message = DeadActorError.new(actor, reason)
-        elsif reason
-          @interrupts << DeadActorError.new(actor, reason)
-          if @filter
-            @filter = nil
-            @ready << nil
-          end
-        end
-      ensure
-        @lock << nil
-      end
-      send exit_message if exit_message
-      self
-    end
-  
-  end
-
-end