lapine 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156563cfc5807e744c6713e272719901fb88f280
-  data.tar.gz: acac0fa6b44c79629779ddef980762f2c7709bbe
+  metadata.gz: 6a1ec7e5fe596da8c60c447bedcf05df5cb36175
+  data.tar.gz: 2ba20e536b210ee4ca0070ee8484adb056be88cb
 SHA512:
-  metadata.gz: 11aa3fbc86af8a1fac6c4a0001bf0a540d8d234b4b89f242119201628c93ddc88beaecd5912faee3d629e3c597cdcc9d130b682c84c242b88b6166f3e2878ace
-  data.tar.gz: 08976cc67829c9539ed52bc8d0cc32a6d168f561172d322e1400c984b9fbb8b7ac980737692d56ab77c47dba94de0da41ecc628695b8e7f0948e19aabc51f1e4
+  metadata.gz: e009b311553286719e4299230afae8ceb8a037dfac712693d3e3d164dbb92eaac83f7162d6773d2994c89a731487b9afcf61fe02a93b31719f6de9a355f8c565
+  data.tar.gz: 88c9495d300d4963da640166366913513ef3bc11861539fed3b5afada498b5bdf952e449ceb47cbb16859e628d73542cc5397f8da6b60b2764e69c8dcad2c40b

data/README.md

@@ -1,6 +1,8 @@
 Lapine
 ======
 
+[![Gem Version](https://badge.fury.io/rb/lapine.svg)](http://badge.fury.io/rb/lapine)
+
 Speak to RabbitMQ. This gem serves as a wrapper for publishing messages
 to RabbitMQ via the Bunny gem, and for consuming messages using the AMQP
 gem.

data/lapine.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['dev@wanelo.com']
   spec.summary       = %q{Talk to rabbits}
   spec.description   = %q{Talk to rabbits}
-  spec.homepage      = 'https://github.com/wanelo/lapine'
+  spec.homepage      = 'https://github.com/messagebus/lapine'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -20,13 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'amqp'
   spec.add_dependency 'bunny'
+  spec.add_dependency 'environmenter', '~> 0.1'
+  spec.add_dependency 'middlewear', '~> 0.1'
   spec.add_dependency 'mixlib-cli'
   spec.add_dependency 'oj'
   spec.add_dependency 'ruby-usdt', '>= 0.2.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'guard-rspec', '~> 4.3.1'
+  spec.add_development_dependency 'guard-rspec', '~> 4.3'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.1.0'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'em-spec'
 end

data/lib/lapine/consumer/middleware.rb

@@ -1,6 +1,7 @@
 require 'lapine/consumer/middleware/error_handler'
 require 'lapine/consumer/middleware/message_ack_handler'
 require 'lapine/consumer/middleware/json_decoder'
+require 'middlewear'
 
 module Lapine
   module Consumer
@@ -28,101 +29,16 @@ module Lapine
     #   end
     #
     module Middleware
-      # A Register of a middleware class that messages will be passed through
-      # on the way to being dispatched.
-      class Register < Struct.new(:klass, :args)
-        def create_new(app)
-          klass.new(app, *args)
-        end
-      end
+      include Middlewear
 
       DEFAULT_MIDDLEWARE = [
-        Register.new(MessageAckHandler),
-        Register.new(ErrorHandler),
-        Register.new(JsonDecoder)
+        MessageAckHandler,
+        ErrorHandler,
+        JsonDecoder
       ].freeze
 
-      class << self
-        def add(klass, *args)
-          registry << [klass, args]
-        end
-
-        def add_before(before_klass, klass, *args)
-          idx = registry.index_of(before_klass)
-          raise MiddlewareNotFound.new("#{before_klass} not registered in Lapine middleware") unless idx
-          registry.insert(idx, klass, args)
-        end
-
-        def add_after(after_klass, klass, *args)
-          idx = registry.index_of(after_klass)
-          raise MiddlewareNotFound.new("#{after_klass} not registered in Lapine middleware") unless idx
-          registry.insert(idx + 1, klass, args)
-        end
-
-        def delete(klass)
-          registry.delete(klass)
-        end
-
-        def registry
-          @registry ||= Registry.new(DEFAULT_MIDDLEWARE.dup)
-        end
-
-        def create_chain(app)
-          registry.map { |r| r.create_new(app) }
-        end
-
-        def app
-          App.new.tap do |app|
-            app.chain = create_chain(app)
-          end
-        end
-      end
-
-      class App
-        attr_accessor :chain
-
-        def call(message, &block)
-          chain << block if block_given?
-          current_register = chain.shift
-          current_register.call(message) if current_register
-        end
-      end
-
-      # Registry holds records of each middleware class that is added to the
-      # consumer middleware chain.
-      class Registry
-        include Enumerable
-
-        attr_reader :registry
-
-        def initialize(registry = [])
-          @registry = registry
-        end
-
-        def all
-          registry
-        end
-
-        def each(&blk)
-          all.each(&blk)
-        end
-
-        def delete(klass)
-          registry.reject! { |register| register.klass == klass }
-        end
-
-        def <<(klass_args)
-          insert(-1, klass_args[0], klass_args[1])
-        end
-
-        def index_of(klass)
-          registry.find_index { |register| register.klass == klass }
-        end
-
-        def insert(index, klass, args)
-          raise Lapine::DuplicateMiddleware if index_of(klass)
-          registry.insert(index, Register.new(klass, args))
-        end
+      DEFAULT_MIDDLEWARE.each do |middleware|
+        Lapine::Consumer::Middleware.add(middleware)
       end
     end
   end

data/lib/lapine/consumer/runner.rb

@@ -1,10 +1,10 @@
 require 'amqp'
 require 'digest'
+require 'environmenter'
 require 'eventmachine'
 require 'lapine/annotated_logger'
 require 'lapine/consumer/config'
 require 'lapine/consumer/connection'
-require 'lapine/consumer/environment'
 require 'lapine/consumer/message'
 require 'lapine/consumer/middleware'
 require 'lapine/consumer/topology'
@@ -23,7 +23,7 @@ module Lapine
 
       def run
         handle_signals!
-        Consumer::Environment.new(config).load!
+        Environmenter::Loader.new(config).load!
         logger.info 'starting Lapine::Consumer'
 
         @queue_properties = queue_properties

data/lib/lapine/version.rb

@@ -1,3 +1,3 @@
 module Lapine
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

data/spec/lib/lapine/consumer/middleware_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe Lapine::Consumer::Middleware do
           Lapine::Consumer::Middleware.tap do |middleware|
             middleware.add MiddlewareAddLetter, 'f'
           end
-        }.to raise_error(Lapine::DuplicateMiddleware)
+        }.to raise_error(Middlewear::DuplicateMiddleware)
       end
     end
   end
@@ -97,6 +97,12 @@ RSpec.describe Lapine::Consumer::Middleware do
     describe 'with default middleware' do
       let(:error) { StandardError.new('doh') }
 
+      before do
+        Lapine::Consumer::Middleware::DEFAULT_MIDDLEWARE.each do |mw|
+          Lapine::Consumer::Middleware.add(mw)
+        end
+      end
+
       it 'runs through the dispatcher error_handler' do
         errors = []
         Lapine::Consumer::Dispatcher.error_handler = ->(e, data, md) {

data/spec/spec_helper.rb

@@ -24,7 +24,7 @@ RSpec.configure do |config|
   config.before :each do
     Lapine::Consumer::Dispatcher.error_handler = nil
     Lapine.instance_variable_set(:@config, nil)
-    Lapine::Consumer::Middleware.instance_variable_set(:@registry,nil)
+    Lapine::Consumer::Middleware.instance_variable_set(:@registry, nil)
     Thread.current.thread_variable_set(:lapine_exchanges, nil)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -39,6 +39,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: environmenter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: middlewear
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: em-spec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +208,6 @@ files:
 - lib/lapine/consumer/config.rb
 - lib/lapine/consumer/connection.rb
 - lib/lapine/consumer/dispatcher.rb
-- lib/lapine/consumer/environment.rb
 - lib/lapine/consumer/message.rb
 - lib/lapine/consumer/middleware.rb
 - lib/lapine/consumer/middleware/error_handler.rb
@@ -206,7 +233,7 @@ files:
 - spec/lib/lapine_spec.rb
 - spec/spec_helper.rb
 - spec/support/rspec_test_helper.rb
-homepage: https://github.com/wanelo/lapine
+homepage: https://github.com/messagebus/lapine
 licenses:
 - MIT
 metadata: {}
@@ -226,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Talk to rabbits

data/lib/lapine/consumer/environment.rb

@@ -1,47 +0,0 @@
-module Lapine
-  module Consumer
-    class Environment
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
-      end
-
-      def load!
-        set_environment
-        load_rails
-        require_from_config
-      end
-
-      def set_environment
-        ENV['RAILS_ENV'] ||= 'development'
-        ENV['RACK_ENV'] ||= ENV['RAILS_ENV']
-      end
-
-      def load_rails
-        begin
-          require 'rails'
-          if ::Rails.application.respond_to?(:eager_load)
-            require File.expand_path('config/environment.rb')
-            ::Rails.application.eager_load!
-          else
-            require File.expand_path('config/application.rb')
-            ::Rails::Application.initializer "lapine.load_rails" do
-              ::Rails.application.config.eager_load = true
-            end
-            require File.expand_path('config/environment.rb')
-          end
-        rescue LoadError
-        end
-      end
-
-      def require_from_config
-        if config.require
-          config.require.each do |file|
-            require File.expand_path(file)
-          end
-        end
-      end
-    end
-  end
-end