lapine 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19554974173dd44d98df62ed0ff7a8a34dcaf201
-  data.tar.gz: abc54df05e0e133655eee78b2fc6c50a48db47cd
+  metadata.gz: 17ff6eda9eaea1807ee77240e11fa2dc336f7350
+  data.tar.gz: b94a4cbada011e8f4fe12e6873b2def2ab923e27
 SHA512:
-  metadata.gz: 39dd5b1c4bd4145fb0710145afaa00050fdc9b24001f99645a9c82dd9c205ae01e32ad1736100df87b1ab7809c25edf7f55192b22a9858dde1e0f9ccb58dd3b3
-  data.tar.gz: 35470b955af0f1ade5a271b8983d51a91988e62a21466b03726d55da67fbbd11eaad0f0bc87a7fd41524915972df3be0352d2a463457572962ded1313982c1d8
+  metadata.gz: f68160452a12c78121c0175e2cbf8448924a6d4dd075de8e5051628240cb097b2e3bf8ecd6bf3b5779a83b3a8b24fb020fdd7b977caa71d236628bb44ea68d13
+  data.tar.gz: 391d24cbd65e613f44f46df60eca15c1958c20466b01eb3425faea7448225127f45f6e78758ddc7f3b2b9ef56ce4259bfa1fe283c68c768b5bbde7bd214b9dbf

data/Changelog.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+## 1.0.1
+
+* Increased verbosity of errors
+* Avoid instance_variable_get in publisher
+  * rename @exchange to @lapine_exchange
+
 ## 1.0.0
 
 * Breaking Change - error handler includes metadata in method signature

data/lib/lapine.rb

@@ -1,13 +1,11 @@
 require 'lapine/version'
+require 'lapine/errors'
 require 'lapine/configuration'
 require 'lapine/exchange'
 require 'lapine/publisher'
 require 'lapine/annotated_logger'
 
 module Lapine
-  class UndefinedConnection < StandardError; end
-  class UndefinedExchange < StandardError; end
-
   def self.config
     @config ||= Configuration.new
   end
@@ -18,14 +16,14 @@ module Lapine
 
   def self.add_exchange(name, properties)
     connection = properties[:connection]
-    raise UndefinedConnection unless connection
-    raise UndefinedConnection unless config.connection_properties[connection]
+    raise UndefinedConnection.new("No connection for #{name}, properties: #{properties}") unless connection
+    raise UndefinedConnection.new("No connection properties for #{name}, properties: #{properties}") unless config.connection_properties[connection]
     config.exchange_properties[name] = properties
   end
 
   def self.find_exchange(name)
     exchange = config.exchange_properties[name]
-    raise UndefinedExchange unless exchange
+    raise UndefinedExchange.new("No exchange for #{name}") unless exchange
     return config.exchanges[name].exchange if config.exchanges[name]
     config.exchanges[name] = Lapine::Exchange.new(name, exchange)
     config.exchanges[name].exchange

data/lib/lapine/dtrace.rb

@@ -22,7 +22,7 @@ module Lapine
     end
 
     def self.fire!(probe_name, *args)
-      raise "Unknown probe: #{probe_name}" unless self.provider.probes[probe_name]
+      raise ArgumentError.new("Unknown probe: #{probe_name}") unless self.provider.probes[probe_name]
       probe = self.provider.probes[probe_name]
       probe.fire(*args) if probe.enabled?
     end

data/lib/lapine/errors.rb

@@ -0,0 +1,6 @@
+module Lapine
+  class LapineError < StandardError; end
+  class UndefinedConnection < LapineError; end
+  class UndefinedExchange < LapineError; end
+  class NilExchange < LapineError; end
+end

data/lib/lapine/exchange.rb

@@ -12,7 +12,8 @@ module Lapine
     end
 
     def exchange
-      reconnect unless conn && conn.connected?
+      reconnect unless @exchange && conn && conn.connected?
+      raise Lapine::NilExchange unless @exchange
       @exchange
     end
 

data/lib/lapine/publisher.rb

@@ -8,7 +8,7 @@ module Lapine
     end
 
     def publish(routing_key = nil)
-      Lapine.find_exchange(self.class.instance_variable_get(:@exchange)).publish(to_json, routing_key: routing_key)
+      Lapine.find_exchange(self.class.current_lapine_exchange).publish(to_json, routing_key: routing_key)
     end
 
     def to_json
@@ -17,7 +17,11 @@ module Lapine
 
     module ClassMethods
       def exchange(name)
-        @exchange = name
+        @lapine_exchange = name
+      end
+
+      def current_lapine_exchange
+        @lapine_exchange
       end
     end
   end

data/lib/lapine/version.rb

@@ -1,3 +1,3 @@
 module Lapine
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -184,6 +184,7 @@ files:
 - lib/lapine/consumer/runner.rb
 - lib/lapine/consumer/topology.rb
 - lib/lapine/dtrace.rb
+- lib/lapine/errors.rb
 - lib/lapine/exchange.rb
 - lib/lapine/publisher.rb
 - lib/lapine/test/exchange.rb