evrone-common-amqp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2ff64fea744fab85ab2b7c267c3a72e4b82c60
-  data.tar.gz: 621aef8263bf27dea0744aaa13add4431e888daa
+  metadata.gz: 13e75e0e8027b05c344009de228c214703cffaf8
+  data.tar.gz: 957c8666262ad04d916252f6446f4136e6dcc91c
 SHA512:
-  metadata.gz: ce1d83cd400b77d953ad4a2fcb1038c57f7ff3372ff309fbcd5638296b0d3b872d926ed8d5a423c01aa942cfc194fa3a2021ed5ae318be1e015f19d54f3437a5
-  data.tar.gz: ec16503bdaef0234e555a71664bec7dfff88990251b6ce02571f830d06936046e892538bfa2e50e95300cf335cfa35b94bd1f7598e5cd0141b7e35973861dbaf
+  metadata.gz: 46fd1b8ec7e5561e7fc6d61c29c86b3a4b64b0b2122689b800a10b671f0da4281c00149a4bf3171dcdd50233041514906eaefe68d22447b397f6dcb5f8d42c95
+  data.tar.gz: f2ef3a3725cad3aaa5762864f9f2185461619b3b106ffd0074a7d3c195deda60c72b3fd09343aba1273d40a76d524044fdb75d43026b2e91975e4ab1c0a001cc

data/lib/evrone/common/amqp/consumer/configuration.rb

@@ -24,29 +24,38 @@ module Evrone
         end
 
         %w{ exchange queue }.each do |m|
-          define_method m do |*name|
+          define_method m do |*name, &b|
             options = name.last.is_a?(Hash) ? name.pop : {}
-            consumer_configuration.__send__(m).name    = name.first
+            val = b || name.first
+            consumer_configuration.__send__(m).name    = val
             consumer_configuration.__send__(m).options = options
           end
 
           define_method "#{m}_name" do
-            consumer_configuration.__send__(m).name || consumer_name
+            value_maybe_proc(consumer_configuration.__send__(m).name || consumer_name)
           end
 
           define_method "#{m}_options" do
-            consumer_configuration.__send__(m).options
+            value_maybe_proc(consumer_configuration.__send__(m).options)
           end
         end
 
-        def routing_key(name = nil)
-          consumer_configuration.routing_key = name if name
-          consumer_configuration.routing_key
+        def routing_key(name = nil, &block)
+          val = block || name
+          if val
+            consumer_configuration.routing_key = val
+          else
+            value_maybe_proc consumer_configuration.routing_key
+          end
         end
 
-        def headers(values = nil)
-          consumer_configuration.headers = values unless values == nil
-          consumer_configuration.headers
+        def headers(values = nil, &block)
+          val = block || values
+          if val
+            consumer_configuration.headers = val
+          else
+            value_maybe_proc consumer_configuration.headers
+          end
         end
 
         def model(value = nil)
@@ -80,6 +89,15 @@ module Evrone
 
         private
 
+          def value_maybe_proc(val)
+            case val
+            when Proc
+              val.call
+            else
+              val
+            end
+          end
+
           def make_consumer_name
             to_s.scan(/[A-Z][a-z]*/).join("_")
                 .downcase

data/lib/evrone/common/amqp/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module Common
     module AMQP
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/lib/amqp/consumer_spec.rb

@@ -68,13 +68,25 @@ describe Evrone::Common::AMQP::Consumer do
 
       context "set routing_key" do
         before { consumer_class.routing_key 'key' }
-        it { should eq({routing_key: 'key'}) }
+        it { should eq(routing_key: 'key') }
+      end
+
+      context "set routing_key by block" do
+        before do
+          consumer_class.routing_key { 'key.block' }
+        end
+        it { should eq(routing_key: 'key.block') }
       end
 
       context "set headers" do
         before { consumer_class.headers 'key' }
         it { should eq({headers: 'key'}) }
       end
+
+      context "set headers by block" do
+        before { consumer_class.headers { 'key.block' } }
+        it { should eq(headers: 'key.block') }
+      end
     end
 
     context "ack" do
@@ -101,6 +113,11 @@ describe Evrone::Common::AMQP::Consumer do
         consumer_class.exchange :foo
         expect(subject).to eq :foo
       end
+
+      it "when set by block should be" do
+        consumer_class.exchange { 'name.block' }
+        expect(subject).to eq 'name.block'
+      end
     end
 
     context "queue_name" do
@@ -113,6 +130,11 @@ describe Evrone::Common::AMQP::Consumer do
         consumer_class.queue :bar
         expect(subject).to eq :bar
       end
+
+      it "when set by block should be" do
+        consumer_class.queue { 'name.block' }
+        expect(subject).to eq 'name.block'
+      end
     end
 
     %w{ queue exchange }.each do |m|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny