beanqueue 0.0.1 → 0.1.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.0 2011-10-20
+
+* 2 minor enhancements:
+  * Some typos in README
+  * Changes in configuration API for compliance with Beanworker
+
 === 0.0.1 2011-10-19
 
 * 1 major enhancement:

data/README.rdoc

@@ -50,7 +50,7 @@ or for multiple servers:
 
 you can load YAML from non-Rails app with:
 
-    Beanqueue.load './config/beanstalk.yml'
+    Beanqueue.connect Beanqueue.get_params('./config/beanstalk.yml')
 
 == USAGE:
 
@@ -60,14 +60,18 @@ or with params:
 
     Beanqueue.push 'some.job', 
        { param1: 'val1', param2: 'val2' },
-       timeout: 60.seconds, # job will be re-put after this time of execution
-                            # default is 2.minutes
-       priority: 100,       # beanstalk inner priority
-                            # I prefer to use grouping instead
-       delay: 5,            # delay job queuing
-                            # default is 0
-       fork: true           # does job should be performed in fork
-                            # default is set in worker/job definition
+       timeout:  60.seconds,  # job will be re-put after this time of execution
+                              # default is 2.minutes
+
+       priority: 100,         # beanstalk inner priority, bigger - higher
+                              # default is 65536
+                              # I prefer to use grouping instead
+
+       delay:    5,           # delay job queuing
+                              # default is 0
+
+       fork:     true         # does job should be performed in fork
+                              # default is set in worker/job definition
 
 == LICENSE:
 

data/lib/beanqueue.rb

@@ -1,20 +1,20 @@
 require 'beanstalk-client'
 
 module Beanqueue
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 
   class << self
-    def load(yaml_path)
-      config = YAML.load(open(yaml_path))
-      if config['nodes']
-        connect *(config['nodes'].map { |node| "#{node['host']}:#{node['port']}" })
+    def get_params(yaml_path)
+      hash = YAML.load(open(yaml_path))
+      if hash['nodes']
+        hash['nodes'].map { |node| "#{node['host']}:#{node['port']}" }
       else
-        connect "#{config['host']}:#{config['port']}"
+        "#{hash['host']}:#{hash['port']}"
       end
-    end
+    end      
 
-    def connect(*nodes)
-      @connection = Beanstalk::Pool.new nodes.to_a
+    def connect(nodes)
+      @connection = Beanstalk::Pool.new(nodes.is_a?(Array) ? nodes : [nodes])
     end
 
     def push(name, args={}, opts={})
@@ -26,5 +26,5 @@ module Beanqueue
 end
 
 if defined? Rails
-  Beanqueue.load Rails.root.join('config', 'beanstalk.yml')
+  Beanqueue.connect Beanqueue.get_params(Rails.root.join('config', 'beanstalk.yml'))
 end

data/test/test_beanqueue.rb

@@ -10,16 +10,18 @@ class TestBeanqueue < Test::Unit::TestCase
   
   def test_connect
     conn = Beanqueue.connect 'localhost:11300'
-    assert conn && conn.instance_eval { @connections['localhost:11300'] }, 'connection should be set up'
-    puts conn
+    assert conn && conn.instance_eval { @connections['localhost:11300'] }, 'connection should be set up from string'
+
+    conn = Beanqueue.connect ['localhost:11300']
+    assert conn && conn.instance_eval { @connections['localhost:11300'] }, 'connection should be set up from array'
   end
 
-  def test_load
-    conn = Beanqueue.load File.expand_path('../configs/one.yml', __FILE__)
-    assert conn && conn.instance_eval { @connections['localhost:11300'] }, 'connection from one-node YAML config should be set up'
+  def test_get_params
+    params = Beanqueue.get_params File.expand_path('../configs/one.yml', __FILE__)
+    assert_equal 'localhost:11300', params, 'params from one-node YAML config are wrong'
 
-    conn = Beanqueue.load File.expand_path('../configs/many.yml', __FILE__)
-    assert conn && conn.instance_eval { @connections['localhost:11300'] }, 'connection from many-nodes YAML config should be set up'
+    params = Beanqueue.get_params File.expand_path('../configs/many.yml', __FILE__)
+    assert_equal ['localhost:11300', '192.168.1.1:11301'], params, 'params from many-nodes YAML config are wrong'
   end
 
   def test_push

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanqueue
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &7981320 !ruby/object:Gem::Requirement
+  requirement: &21543920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7981320
+  version_requirements: *21543920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7980780 !ruby/object:Gem::Requirement
+  requirement: &21542600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *7980780
+  version_requirements: *21542600
 description: ! 'This is a beanstalk-based job-queueing-manager, replacement for gem
   ''stalker'' with additions: