restalk 0.0.0.14 → 0.1.1

data/.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage = 'http://github.com/undecisive/restalk'
 
   #gem.add_development_dependency('rake')
-  gem.add_dependency('beanstalk-client', ["1.0.2"])
+  gem.add_dependency('beaneater')
   gem.add_dependency('resque', ['1.21.0'])
 
   # ensure the gem is built out of versioned files

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    restalk (0.0.0.10)
-      beanstalk-client (= 1.0.2)
+    restalk (0.1.0)
+      beaneater
       resque (= 1.21.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    beanstalk-client (1.0.2)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    beaneater (0.3.0)
+    multi_json (1.7.1)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    redis (3.0.1)
-    redis-namespace (1.2.0)
+    redis (3.0.3)
+    redis-namespace (1.2.1)
       redis (~> 3.0.0)
     resque (1.21.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
+    sinatra (1.4.1)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.3.6)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

data/README.md

@@ -9,27 +9,53 @@ It has a very simple interface:
 
 ```ruby
 Restalk.init(:resque) # Create a connection to the backend (in this case, resque)
-Restalk.push(object)  # Push something onto the queue
-Restalk.pop           # Pop something off the queue
+Restalk.push("Hello") # Push something onto the queue
+datum = Restalk.pop   # Pop something off the queue. Returns instantly. Could be nil.
+
+datum.body if datum   # Get the actual value
 
 Restalk.connected?    # Test whether init has been called
 Restalk.stats         # Statistics (whatever the backend gives us - could be gibberish)
 ```
 
+
+If you need both services, or different channels, or object orientation, we have you covered:
+
+```ruby
+beanie = Restalk.new(:beanstalk, nil, 'jack')       # nil for the server, uses the default
+rezzer = Restalk.new(:resque, nil, 'funky_chicken')
+
+item = beanie.pop
+rezzer.push(item.body) if item
+
+beanie.connected?
+rezzer.stats
+```
+
+
 Configuration
 -------------
 
 Servers: Restalk defaults to '127.0.0.1:11300' for beanstalk and 'localhost:6379' for resque.
 
-Queue: Restalk names the queue, highly imaginatively, 'restalk_queue'
+Queue: Restalk, by default, names the queue, highly imaginatively, 'restalk_queue'.
+Beanstalk does not seem to support named queues, so an exception will be raised if you try to set one.
 
-These can be configured easily via environment variables - ENV['BEANSTALK'], ENV['REDIS'] and ENV['RESQUE_QUEUE'].
+These can be configured easily via environment variables:
+  ENV['BEANSTALK'] - Beanstalk server address
+  ENV['BEANSTALK_QUEUE'] - Beanstalk tube name
+
+  ENV['REDIS'] - Redis server address
+  ENV['RESQUE_QUEUE'] - Resque queue name
+
+All of these can be overridden on a per-instance basis.
 
 
 Author
 ------
 
 Matthew Bennett @undecisive [wearepandr.com](http://wearepandr.com)
+
 Got a question? Message me on [Github](http://github.com/undecisive) or add an issue.
 
 
@@ -38,19 +64,19 @@ License
 
 ```
 The MIT License (MIT)
-Copyright (c) 2012 We are PANDR
+Copyright (c) 2012-2013 We are PANDR
 
-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, 
+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 
+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 
+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/lib/restalk.rb

@@ -1,48 +1,61 @@
 
+
 class Restalk
-  VERSION = '0.0.0.14'
-  def self.init(adapter)
+  class RestalkBeanstalkException < StandardError; end
+
+  VERSION = '0.1.1'
+  def initialize(adapter, server=nil, queue=nil)
     extend BeanstalkAdapter if adapter == :beanstalk
     extend ResqueAdapter if [:resque, :redis].include? adapter
-    super()
+    init server, queue
   end
 
-  def self.connected?
+  def connected?
     self.respond_to? :push
   end
-  
+
+  def self.init(*args)
+    @current_adapter = self.new *args
+  end
+
+  def self.method_missing(sym, *args, &block)
+    @current_adapter.send sym, *args, &block
+  end
+
   module BeanstalkAdapter
-    def init
-      require 'beanstalk-client'
-      @@beanstalk = Beanstalk::Pool.new([ENV['BEANSTALK'] || '127.0.0.1:11300'])
+    def init(server = nil, queue = nil)
+      require 'beaneater'
+      @beanstalk = Beaneater::Pool.new([server || ENV['BEANSTALK'] || '127.0.0.1:11300'])
+      tube = queue || ENV['BEANSTALK_QUEUE'] || 'default'
+      @beanstalk = @beanstalk.tubes[tube]
     end
 
     def push(data)
-      @@beanstalk.put(data)
+      @beanstalk.put(data)
     end
 
     def pop
-      @@beanstalk.reserve
+      @beanstalk.reserve if @beanstalk.peek(:ready)
     end
 
     def stats
-      @@beanstalk.stats
+      @beanstalk.stats
     end
   end
 
   module ResqueAdapter
-    QUEUE = ENV['RESQUE_QUEUE'] || 'restalk_queue'
-    def init
+    def init(server = nil, queue = nil)
+      @queue = queue || ENV['RESQUE_QUEUE'] || 'restalk_queue'
       require 'resque'
-      Resque.redis = ENV['REDIS'] || 'localhost:6379'
+      Resque.redis = server ||  ENV['REDIS'] || 'localhost:6379'
     end
 
     def push(data)
-      Resque.enqueue_to(QUEUE, RestalkResqueJob, data)
+      Resque.enqueue_to(@queue, RestalkResqueJob, data)
     end
 
     def pop
-      data = Resque.pop QUEUE
+      data = Resque.pop @queue
       return RestalkResqueJob.new data['args'].first if data
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restalk
 version: !ruby/object:Gem::Version
-  version: 0.0.0.14
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: beaneater
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -80,3 +80,4 @@ signing_key:
 specification_version: 3
 summary: Abstraction layer between Beanstalk / Resque
 test_files: []
+has_rdoc: