beanstalker 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/init.rb

@@ -1 +1 @@
-require 'async_observer/extend'
+require 'beanstalker/extend'

data/lib/async_observer/daemonizer_handler.rb

@@ -1,9 +1,9 @@
-module AsyncObserver
+module Beanstalker
   class DaemonizerHandler < Daemonizer::Handler
     def prepare(block)
       logger.info "Loading Rails"
       require File.join(Daemonizer.root, '/config/environment')
-      require 'async_observer/worker'
+      require 'beanstalker/worker'
       logger.info "Rails loaded"
       super
     end

data/lib/async_observer/extend.rb

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'async_observer/queue'
+require 'beanstalker/queue'
 
 CLASSES_TO_EXTEND = [
   ActiveRecord::Base,
@@ -28,7 +28,7 @@ CLASSES_TO_EXTEND = [
   Symbol,
 ]
 
-module AsyncObserver::Extensions
+module Beanstalker::Extensions
   def self.included(receiver)
     @@methods_async_options = {}
     receiver.extend(ClassMethods)
@@ -61,12 +61,12 @@ module AsyncObserver::Extensions
 
   def async_send_opts(selector, opts, *args)
     interpolated_options = interpolate_async_options(opts, self)
-    AsyncObserver::Queue.put_call!(self, selector, interpolated_options, args)
+    Beanstalker::Queue.put_call!(self, selector, interpolated_options, args)
   end
 end
 
 CLASSES_TO_EXTEND.each do |c|
-  c.send :include, AsyncObserver::Extensions
+  c.send :include, Beanstalker::Extensions
 end
 
 class Range

data/lib/async_observer/queue.rb

@@ -18,11 +18,11 @@
 
 require 'beanstalk-client'
 
-module AsyncObserver; end
+module Beanstalker; end
 
-class AsyncObserver::Queue; end
+class Beanstalker::Queue; end
 
-class << AsyncObserver::Queue
+class << Beanstalker::Queue
   DEFAULT_PRI = 512
   DEFAULT_FUZZ = 0
   DEFAULT_DELAY = 0
@@ -33,14 +33,14 @@ class << AsyncObserver::Queue
 
   # This is a fake worker instance for running jobs synchronously.
   def sync_worker()
-    require 'async_observer/worker'
-    @sync_worker ||= AsyncObserver::Worker.new(binding)
+    require 'beanstalker/worker'
+    @sync_worker ||= Beanstalker::Worker.new(binding)
   end
 
   # This runs jobs synchronously; it's used when no queue is configured.
   def sync_run(obj)
     body = YAML.dump(obj)
-    job = Beanstalk::Job.new(AsyncObserver::FakeConn.new(), 0, body)
+    job = Beanstalk::Job.new(Beanstalker::FakeConn.new(), 0, body)
     sync_worker.dispatch(job)
     sync_worker.do_all_work()
     return 0, '0.0.0.0'
@@ -52,7 +52,7 @@ class << AsyncObserver::Queue
     queue.connect()
     queue.use(tube)
     info = [queue.yput(obj, pri, delay, ttr), queue.last_server]
-    f = AsyncObserver::Queue.after_put
+    f = Beanstalker::Queue.after_put
     f.call(*info) if f
     return info
   end
@@ -95,7 +95,7 @@ class << AsyncObserver::Queue
   end
 end
 
-class AsyncObserver::FakeConn
+class Beanstalker::FakeConn
   def delete(x)
   end
 
@@ -181,7 +181,7 @@ class Date
   def rrepr() "Date.parse('#{self.inspect}')" end
 end
 
-module AsyncObserver::Extensions
+module Beanstalker::Extensions
   def rrepr()
     method = (respond_to? :get_cache) ? 'get_cache' : 'find'
     "#{self.class.rrepr}.#{method}(#{id.rrepr})"

data/lib/async_observer/worker.rb

@@ -15,11 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'async_observer/queue'
+require 'beanstalker/queue'
 
-module AsyncObserver; end
+module Beanstalker; end
 
-class AsyncObserver::Worker
+class Beanstalker::Worker
 
   SLEEP_TIME = 60 if !defined?(SLEEP_TIME) # rails loads this file twice
 
@@ -59,7 +59,7 @@ class AsyncObserver::Worker
     @stop = false
     @options = options
     if @options && @options[:servers]
-      AsyncObserver::Queue.queue = Beanstalk::Pool.new(@options[:servers])
+      Beanstalker::Queue.queue = Beanstalk::Pool.new(@options[:servers])
     end
   end
 
@@ -74,7 +74,7 @@ class AsyncObserver::Worker
   def startup
     tube = @options[:tube] || "default"
     logger.info "Using tube #{tube}"
-    AsyncObserver::Queue.queue.watch(tube)
+    Beanstalker::Queue.queue.watch(tube)
     flush_logger
   end
 
@@ -90,7 +90,7 @@ class AsyncObserver::Worker
   end
 
   def q_hint
-    @q_hint || AsyncObserver::Queue.queue
+    @q_hint || Beanstalker::Queue.queue
   end
 
   # This heuristic is to help prevent one queue from starving. The idea is that
@@ -112,7 +112,7 @@ class AsyncObserver::Worker
   def get_job
     loop do
       begin
-        AsyncObserver::Queue.queue.connect
+        Beanstalker::Queue.queue.connect
         self.class.run_before_reserve
         return reserve_and_set_hint
       rescue Interrupt => ex
@@ -136,7 +136,7 @@ class AsyncObserver::Worker
 
   def dispatch(job)
     ActiveRecord::Base.verify_active_connections!
-    return run_ao_job(job) if async_observer_job?(job)
+    return run_ao_job(job) if beanstalker_job?(job)
     return run_other(job)
   end
 
@@ -205,7 +205,7 @@ class AsyncObserver::Worker
     eval(job.ybody[:code], @top_binding, "(beanstalk job #{job.id})", 1)
   end
 
-  def async_observer_job?(job)
+  def beanstalker_job?(job)
     begin job.ybody[:type] == :rails rescue false end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beanstalker
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -78,7 +78,6 @@ files:
 - README
 - Rakefile
 - VERSION
-- glebpom-async_observer.gemspec
 - init.rb
 - lib/async_observer/daemonizer_handler.rb
 - lib/async_observer/extend.rb

data/glebpom-async_observer.gemspec

@@ -1,56 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{glebpom-async_observer}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-14}
-  s.description = %q{async_observer provides deep integration with Beanstalk. Fork from http://github.com/kristjan/async_observer}
-  s.email = %q{glebpom@gmail.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "COPYING",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "glebpom-async_observer.gemspec",
-     "init.rb",
-     "lib/async_observer/daemonizer_handler.rb",
-     "lib/async_observer/extend.rb",
-     "lib/async_observer/queue.rb",
-     "lib/async_observer/worker.rb"
-  ]
-  s.homepage = %q{http://github.com/glebpom/async_observer}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{async_observer provides deep integration with Beanstalk. Fork from http://github.com/kristjan/async_observer}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<daemonizer>, ["~> 0.2.0"])
-      s.add_runtime_dependency(%q<beanstalk-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 2.2.0"])
-    else
-      s.add_dependency(%q<daemonizer>, ["~> 0.2.0"])
-      s.add_dependency(%q<beanstalk-client>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 2.2.0"])
-    end
-  else
-    s.add_dependency(%q<daemonizer>, ["~> 0.2.0"])
-    s.add_dependency(%q<beanstalk-client>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 2.2.0"])
-  end
-end
-