backchat 0.0.1 → 0.0.2

data/lib/backchat.rb

@@ -1,7 +1,6 @@
 require     'java/smack'
 require     'java/smackx'
 java_import 'org.jivesoftware.smack.XMPPConnection'
-java_import 'java.util.concurrent.ArrayBlockingQueue'
 require     'backchat/connection_pool'
 require     'backchat/version'
 

data/lib/backchat/connection_pool.rb

@@ -6,34 +6,39 @@ module Backchat
       host: 'localhost',
       username: 'admin',
       password: 'password',
-      pool_size: 5 }
+      pool_size: 5,
+      persistent: true }
 
     @settings = DEFAULT_SETTINGS
 
     def initialize(count = self.class.settings[:pool_size])
-      @queue = fill(ArrayBlockingQueue.new(count))
+      @queue = fill(SizedQueue.new(count))
     end
 
-    def each(&block)
-      queue.each(&block)
+    def count
+      queue.length
     end
 
     def take
-      queue.take
+      queue.pop
     end
 
     def add(connection)
-      queue.add(connection)
+      queue.push(connection)
     end
 
     def with_connection
       connection = take
+      connection.connect unless connection.is_connected?
+      connection.login(self.class.settings[:username],
+                       self.class.settings[:password],
+                       "resource_#{connection.connection_id}") unless connection.is_authenticated?
       yield connection
     ensure
+      connection.disconnect unless self.class.settings[:persistent]
       add(connection)
     end
 
-
     class << self
       attr_reader :settings
 
@@ -58,7 +63,7 @@ module Backchat
       end
 
       private
-      [:host, :username, :password, :pool_size].each do |key|
+      [:host, :username, :password, :pool_size, :persistent].each do |key|
         define_method("#{key}") do |val|
           @settings ||= {}
           @settings[key] = val
@@ -70,13 +75,16 @@ module Backchat
     attr_reader :queue
 
     def fill(queue)
-      while queue.remaining_capacity > 0
+      while queue.length < queue.max
         conn = XMPPConnection.new(self.class.settings[:host])
-        conn.connect
-        conn.login(self.class.settings[:username],
-                   self.class.settings[:password], conn.connection_id)
+        if self.class.settings[:persistent]
+          conn.connect
+          conn.login(self.class.settings[:username],
+                     self.class.settings[:password],
+                     "resource_#{conn.connection_id}")
+        end
 
-        queue.add(conn)
+        queue.push(conn)
       end
 
       queue

data/lib/backchat/version.rb

@@ -1,3 +1,3 @@
 module Backchat
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/lib/backchat/test_connection_pool.rb

@@ -19,7 +19,8 @@ class BackchatConnectionPoolTest < MiniTest::Unit::TestCase
     assert_equal Backchat::ConnectionPool.settings, { host: 'example.com',
                                                       username: 'don_draper',
                                                       password: 'secret',
-                                                      pool_size: 1 }
+                                                      pool_size: 1,
+                                                      persistent: true }
   end
 
   def test_configure_accepts_a_hash
@@ -29,7 +30,8 @@ class BackchatConnectionPoolTest < MiniTest::Unit::TestCase
     assert_equal Backchat::ConnectionPool.settings, { host: 'example.com',
                                                       username: 'don_draper',
                                                       password: 'secret',
-                                                      pool_size: 1 }
+                                                      pool_size: 1,
+                                                      persistent: true }
   end
 
   def test_configure_allows_partial_settings_in_a_block
@@ -50,8 +52,8 @@ class BackchatConnectionPoolTest < MiniTest::Unit::TestCase
     assert_includes @pool.instance_variables, :@queue
   end
 
-  def test_queue_is_an_array_blocking_queue
-    assert_instance_of ArrayBlockingQueue, @pool.instance_variable_get(:@queue)
+  def test_queue_is_a_queue
+    assert_instance_of SizedQueue, @pool.instance_variable_get(:@queue)
   end
 
   def test_initialize_fills_the_pool_with_connections

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: backchat
 version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease:
-  version: 0.0.1
 platform: ruby
 authors:
 - Zach Pendleton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler