ragnar 0.2.0 → 0.2.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.swp

data/lib/ragnar/connector.rb

@@ -14,9 +14,9 @@ module Ragnar
       # Pass connection options through to AMQP
       def connect
         # backwards compatible code
-        host = @host.nil? ? Ragnar::Config.host : @host
-        port = @port.nil? ? Ragnar::Config.port : @port
-        @connection = AMQP.connect({:host => @host, :port => @port})
+        @host ||= ::Ragnar::Config.host
+        @port ||= ::Ragnar::Config.port
+        @connection = ::AMQP.connect({:host => @host, :port => @port})
       end
 
       def connected?

data/lib/ragnar/exchange.rb

@@ -16,7 +16,7 @@ module Ragnar
         channel = AMQP::Channel.new(connection)
         exchange = channel.__send__(@type, @name, @options)
       
-        channel.queue(@name).bind(exchange, opts.merge(routing_key: routing_key))
+        channel.queue(@name).bind(exchange, opts.merge(:routing_key => routing_key))
         exchange.publish(message, opts.merge(:routing_key => routing_key))
       end
     end
@@ -50,4 +50,4 @@ module Ragnar
     
     
   end
-end
+end

data/lib/ragnar/version.rb

@@ -1,3 +1,3 @@
 module Ragnar
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/ragnar.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'bunny'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'evented-spec', '~>0.4.1'
+  s.add_development_dependency 'pry'
 end

data/spec/lib/ragnar/connector_spec.rb

@@ -5,6 +5,9 @@ describe Ragnar::Connector do
   include EventedSpec::SpecHelper
   include EventedSpec::AMQPSpec
 
+  before(:all) { EM.stop_event_loop; sleep(0.3) }
+  after(:all) { Thread.new { EM.run }; Thread.pass until EM.reactor_running? }
+
   before(:each) do
     Ragnar::Connector.connection = nil
   end
@@ -13,6 +16,7 @@ describe Ragnar::Connector do
 
     context 'new configuration methods' do
       it 'can set host and port and have a connection' do
+        AMQP.stub(:connect)
         AMQP.should_receive(:connect).with({:host => Ragnar::Config.host, :port => Ragnar::Config.port})
         Ragnar::Connector.connect
         done
@@ -26,6 +30,7 @@ describe Ragnar::Connector do
       end
 
       it 'can set host and port and have a connection' do
+        AMQP.stub(:connect)
         host = 'test.md.com'
         port = '5763'
 
@@ -34,10 +39,32 @@ describe Ragnar::Connector do
 
         AMQP.should_receive(:connect).with({host: host, port: port})
         Ragnar::Connector.connect
+        done
+      end
+    end
+
+    context 'new configuration methods' do
+      it 'can set host and port and have a connection' do
+        AMQP.stub(:connect)
+        host = 'test2.md.com'
+        port = '5763'
+
+        Ragnar::Connector.host = nil
+        Ragnar::Connector.port = nil
+
+        Ragnar::Config.configure do |c|
+          c.host = host
+          c.port = port
+        end
+
+        AMQP.should_receive(:connect).with({host: host, port: port})
+        Ragnar::Connector.connect
+        done
       end
     end
 
     it 'uses the existing reactor if it already exists' do
+      AMQP.stub(:connect)
       em do
         EM.should_not_receive(:run)
         Ragnar::Connector.connect
@@ -50,6 +77,7 @@ describe Ragnar::Connector do
   describe '.connection' do
 
     it 'stores the connection' do
+      AMQP.stub(:connect).and_return(double("connection", :connected? => true))
       Ragnar::Connector.connect
       delayed(0.3) {
         Ragnar::Connector.connection.should be_connected
@@ -67,6 +95,7 @@ describe Ragnar::Connector do
 
   describe '.connected?' do
     it 'relays connection state' do
+      AMQP.stub(:connect).and_return(double("connection", :connected? => true))
       Ragnar::Connector.connected?.should be_false
       Ragnar::Connector.connect
       delayed(0.3) {

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'eventmachine'
 
 unless EM.reactor_running?
   Thread.new { EventMachine.run }
-  sleep 0.5
+  Thread.pass until EM.reactor_running?
 end
 
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.expand_path('../lib', File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ragnar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2153647520 !ruby/object:Gem::Requirement
+  requirement: &2157572600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153647520
+  version_requirements: *2157572600
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &2153647100 !ruby/object:Gem::Requirement
+  requirement: &2157572160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153647100
+  version_requirements: *2157572160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153646600 !ruby/object:Gem::Requirement
+  requirement: &2157571700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153646600
+  version_requirements: *2157571700
 - !ruby/object:Gem::Dependency
   name: evented-spec
-  requirement: &2153646100 !ruby/object:Gem::Requirement
+  requirement: &2157571200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2153646100
+  version_requirements: *2157571200
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2157570780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157570780
 description: Provide top-level pub/sub methods with RabbitMQ (AMQP) for interacting
   with a larger service ecosystem
 email: