ragnar 0.1.0 → 0.1.2

data/lib/ragnar/connector.rb

@@ -8,14 +8,15 @@ module Ragnar
       
       # Store the connection for later retrieval
       attr_accessor :connection
+      attr_accessor :host
+      attr_accessor :port
+      
+      @host = 'localhost'
+      @port = '5762'
       
       # Pass connection options through to AMQP
-      def connect opts={}
-        unless EM.reactor_running?
-          Thread.new { EventMachine.run }
-          sleep 0.5
-        end
-        @connection = AMQP.connect(opts)
+      def connect
+        @connection = AMQP.connect({host: @host, port: @port})
       end
       
       def connected?

data/lib/ragnar/exchange.rb

@@ -6,12 +6,19 @@ module Ragnar
     
     def initialize type, name, opts={}
       @type, @name, @options = type, name, opts
-      @channel = AMQP::Channel.new(Ragnar::Connector.connection)
-      @exchange = @channel.__send__(@type, @name, @options)
     end
     
     def publish routing_key, message, opts={}
-      @exchange.publish(message, opts.merge(:routing_key => routing_key))
+      EM.schedule do
+        Ragnar::Connector.connect unless Ragnar::Connector.connected?
+        
+        connection = Ragnar::Connector.connection
+        channel = AMQP::Channel.new(connection)
+        exchange = channel.__send__(@type, @name, @options)
+      
+        channel.queue(@name).bind(exchange, opts.merge(routing_key: routing_key))
+        exchange.publish(message, opts.merge(:routing_key => routing_key))
+      end
     end
     
     # Takes a subscription key or queue/routing options
@@ -28,8 +35,19 @@ module Ragnar
         queue_name = queue_prefix.nil? ? name : '%s.%s' % [queue_prefix, name]
         routing_key = name
       end
-      @channel.queue(queue_name).bind(@exchange, :routing_key => routing_key).subscribe(subscribe_opts, &block)
+   
+      EM.schedule do
+        Ragnar::Connector.connect unless Ragnar::Connector.connected?
+        
+        connection = Ragnar::Connector.connection
+        channel = AMQP::Channel.new(connection)
+        exchange = channel.__send__(@type, @name, @options)
+        
+        channel.queue(queue_name).bind(exchange, :routing_key => routing_key).subscribe(subscribe_opts, &block)
+      end
     end
     
+    
+    
   end
 end

data/lib/ragnar/version.rb

@@ -1,3 +1,3 @@
 module Ragnar
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/spec/lib/ragnar/connector_spec.rb

@@ -7,23 +7,21 @@ describe Ragnar::Connector do
   
   before(:each) do
     Ragnar::Connector.connection = nil
+    Ragnar::Connector.host = 'localhost'
+    Ragnar::Connector.port = '5762'
   end
   
   describe '.connect' do
     
-    it 'runs eventmachine and creates an AMQP connection' do
-      connection = Ragnar::Connector.connect
-      delayed(0.3) {
-        EM.reactor_running?.should be_true
-        connection.should be_connected
-        done
-      }
-    end
-    
-    it 'accepts an options hash and passes it through' do
-      opts = {:host => 'localhost', :port => '5762'}
-      AMQP.should_receive(:connect).with(opts)
-      Ragnar::Connector.connect(opts)
+    it 'can set host and port and have a connection' do
+      host = 'test.md.com'
+      port = '5763'
+      
+      Ragnar::Connector.host = host
+      Ragnar::Connector.port = port
+      
+      AMQP.should_receive(:connect).with({host: host, port: port})
+      Ragnar::Connector.connect
       done
     end
     

data/spec/lib/ragnar/exchange_spec.rb

@@ -6,6 +6,7 @@ describe Ragnar::Exchange do
   include EventedSpec::SpecHelper
   include EventedSpec::AMQPSpec
   
+  
   describe '.new' do
     it 'creates a channel and exchange' do
       opts = {:durable => true}

data/spec/spec_helper.rb

@@ -2,5 +2,11 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
 require 'evented-spec'
+require 'eventmachine'
+
+unless EM.reactor_running?
+  Thread.new { EventMachine.run }
+  sleep 0.5
+end
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))

metadata

@@ -2,7 +2,7 @@
 name: ragnar
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - BJ Neislen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp