evrone-common-amqp 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684e39904cedd622f5262a9694ca8e1d3276c7ca
-  data.tar.gz: 2e1261f6115f45a611626d9b91574df740abdffb
+  metadata.gz: c24324f4e19411cb06a578695a44e8f495b1a9b8
+  data.tar.gz: e91da1a141c2eb6581e8a7f377186312a6b71488
 SHA512:
-  metadata.gz: 94932a2a0f44f280fd53a134116cb56285616192e5663244b08de71322f4ccd427abba3a42a5b7638e9f32b58c3f4aa6a9e6f01257b639d36bd3cf8c123d5beb
-  data.tar.gz: 73391330d411391d4ceb039617724e12d49cffd916990274ff885552fc82ddfbfffba55aaab7927f80b79ddc7d86f2ac03a7a0a7f24c93f0cab6460114c3f8e9
+  metadata.gz: deb6175551f9b6569783539f33ad9c4836bf70db5dded7a1d6d8c2ddf38ab709c78d68e7e1aeb11848d7eec135d378adf07d1b2df3bf877d858aa3f9586b06d2
+  data.tar.gz: 77e583d9cc31af0ada5f625a1e3c51eac418ee3f6569d0ee66f2bddd03a4971fe5b981c02f1f4bc633ea04a29684b7367a61cff01556e76b2b064336cb3f1977

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

@@ -8,9 +8,7 @@ module Evrone
 
         attr_accessor :url, :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :logger, :pool_timeout,
-          :heartbeat, :spawn_attempts, :content_type
-
-        attr_reader  :publishing_builder, :recieving_builder, :subscribing_builder
+          :heartbeat, :spawn_attempts, :content_type, :callbacks
 
         def initialize
           reset!
@@ -20,16 +18,12 @@ module Evrone
           Common::AMQP::Formatter
         end
 
-        def publishing(&block)
-          @publishing_builder = Common::Rack::Builder.new(&block)
-        end
-
-        def recieving(&block)
-          @recieving_builder = Common::Rack::Builder.new(&block)
-        end
-
-        def subscribing(&block)
-          @subscribing_builder = Common::Rack::Builder.new(&block)
+        %w{ before after }.each do |p|
+          %w{ subscribe publish recieve }.each do |m|
+            define_method "#{p}_#{m}" do |&callback|
+              callbacks["#{p}_#{m}".to_sym] = callback
+            end
+          end
         end
 
         def default_exchange_name
@@ -51,6 +45,8 @@ module Evrone
 
           @content_type          = 'application/json'
 
+          @callbacks             = {}
+
           @default_exchange_options = {
             durable:     true,
             auto_delete: false

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

@@ -13,8 +13,8 @@ module Evrone
 
           x = declare_exchange
 
-          with_middleware :publishing, message: message, exchange: x do |opts|
-            m = serialize_message opts[:message], options[:content_type]
+          run_callbacks(:publish, message: message, exchange: x) do
+            m = serialize_message message, options[:content_type]
             x.publish m, options
           end
 

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

@@ -10,7 +10,7 @@ module Evrone
             x = declare_exchange
             q = declare_queue
 
-            with_middleware(:subscribing, exchange: x, queue: q) do |_|
+            run_callbacks(:subscribe, exchange: x, queue: q) do
               debug "subscribing to #{q.name}:#{x.name} using #{bind_options.inspect}"
               q.bind(x, bind_options)
               debug "successfuly subscribed to #{q.name}:#{x.name}"
@@ -47,11 +47,11 @@ module Evrone
           def run_instance(delivery_info, properties, payload)
             payload = deserialize_message properties, payload
 
-            with_middleware(:recieving, payload: payload) do |opts|
+            run_callbacks :recieve, payload: payload do
               new.tap do |inst|
                 inst.properties    = properties
                 inst.delivery_info = delivery_info
-              end.perform opts[:payload]
+              end.perform payload
             end
           end
 

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

@@ -35,7 +35,7 @@ module Evrone
           include Common::AMQP::Consumer::Publish
           include Common::AMQP::Consumer::Subscribe
           include Common::AMQP::Logger
-          include Common::AMQP::WithMiddleware
+          include Common::AMQP::Callbacks
 
           def shutdown?
             Common::AMQP.shutdown?

data/lib/evrone/common/amqp/mixins/callbacks.rb

@@ -0,0 +1,25 @@
+module Evrone
+  module Common
+    module AMQP
+      module Callbacks
+
+        def run_callbacks(name, *args)
+          before = "before_#{name}".to_sym
+          after  = "after_#{name}".to_sym
+          if f = Common::AMQP.config.callbacks[before]
+            f.call(*args)
+          end
+
+          rs = yield if block_given?
+
+          if f = Common::AMQP.config.callbacks[after]
+            f.call(*args)
+          end
+
+          rs
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Evrone
   module Common
     module AMQP
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/evrone/common/amqp.rb

@@ -15,7 +15,7 @@ module Evrone
       end
 
       autoload :Logger,         File.expand_path("../amqp/mixins/logger",          __FILE__)
-      autoload :WithMiddleware, File.expand_path("../amqp/mixins/with_middleware", __FILE__)
+      autoload :Callbacks,      File.expand_path("../amqp/mixins/callbacks",       __FILE__)
 
       extend self
 

data/spec/lib/amqp/config_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Evrone::Common::AMQP::Config do
+  let(:config) { described_class.new }
+
+  context '(callbacks)' do
+    %w{ before after }.each do |p|
+      %w{ subscribe recieve publish }.each do |m|
+        name = "#{p}_#{m}"
+        it name do
+          config.public_send name do |value|
+            value
+          end
+
+          val = config.callbacks[name.to_sym].call("value")
+          expect(val).to eq 'value'
+        end
+      end
+    end
+  end
+end

data/spec/lib/amqp/mixins/callbacks_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Evrone::Common::AMQP::Callbacks do
+  let(:output) { [] }
+  let(:object) { Object.new.extend described_class }
+
+  before do
+    Evrone::Common::AMQP.config.reset!
+    Evrone::Common::AMQP.configure do |c|
+      c.before_publish { |v| output << "before:#{v}" }
+      c.after_publish  { |v| output << "after:#{v}" }
+    end
+  end
+
+  after  { Evrone::Common::AMQP.config.reset! }
+
+  context 'run_callbacks' do
+    it "should be success" do
+      object.run_callbacks :publish, "call" do
+        output << "call"
+      end
+      expect(output).to eq %w{ before:call call after:call }
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -120,17 +120,18 @@ files:
 - lib/evrone/common/amqp/consumer/publish.rb
 - lib/evrone/common/amqp/consumer/subscribe.rb
 - lib/evrone/common/amqp/formatter.rb
+- lib/evrone/common/amqp/mixins/callbacks.rb
 - lib/evrone/common/amqp/mixins/logger.rb
-- lib/evrone/common/amqp/mixins/with_middleware.rb
 - lib/evrone/common/amqp/session.rb
 - lib/evrone/common/amqp/supervisor/threaded.rb
 - lib/evrone/common/amqp/testing.rb
 - lib/evrone/common/amqp/version.rb
 - spec/integration/multi_threaded_spec.rb
 - spec/integration/threaded_supervisor_spec.rb
+- spec/lib/amqp/config_spec.rb
 - spec/lib/amqp/consumer_spec.rb
 - spec/lib/amqp/formatter_spec.rb
-- spec/lib/amqp/mixins/with_middleware_spec.rb
+- spec/lib/amqp/mixins/callbacks_spec.rb
 - spec/lib/amqp/session_spec.rb
 - spec/lib/amqp/supervisor/threaded_spec.rb
 - spec/lib/amqp_spec.rb
@@ -164,9 +165,10 @@ summary: Common amqp code
 test_files:
 - spec/integration/multi_threaded_spec.rb
 - spec/integration/threaded_supervisor_spec.rb
+- spec/lib/amqp/config_spec.rb
 - spec/lib/amqp/consumer_spec.rb
 - spec/lib/amqp/formatter_spec.rb
-- spec/lib/amqp/mixins/with_middleware_spec.rb
+- spec/lib/amqp/mixins/callbacks_spec.rb
 - spec/lib/amqp/session_spec.rb
 - spec/lib/amqp/supervisor/threaded_spec.rb
 - spec/lib/amqp_spec.rb

data/lib/evrone/common/amqp/mixins/with_middleware.rb

@@ -1,16 +0,0 @@
-module Evrone
-  module Common
-    module AMQP
-      module WithMiddleware
-        def with_middleware(name, env, &block)
-          builder = Common::AMQP.config.public_send("#{name}_builder")
-          if builder
-            builder.to_app(block).call env
-          else
-            yield env
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/amqp/mixins/with_middleware_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Evrone::Common::AMQP::WithMiddleware do
-  let(:object) { Object.new.extend described_class }
-
-  Foo = Struct.new(:app, :id) do
-    def call(env)
-      env << "called"
-      app.call env
-    end
-  end
-
-  before { Evrone::Common::AMQP.config.reset! }
-  after  { Evrone::Common::AMQP.config.reset! }
-
-  context 'with_middleware' do
-    it "should be successfull" do
-      Evrone::Common::AMQP.configure do |c|
-        c.publishing do
-          use Foo, :id
-        end
-      end
-
-      collected = ""
-      object.with_middleware(:publishing, "") do |env|
-        collected << env
-      end
-      expect(collected).to eq 'called'
-    end
-  end
-end
-