rabbit_feed 0.3.1 → 1.0.0

data/lib/rabbit_feed/testing_support/testing_helpers.rb

@@ -1,16 +1,10 @@
 module RabbitFeed
   module TestingSupport
     module TestingHelpers
+
       def rabbit_feed_consumer
         TestRabbitFeedConsumer.new
       end
     end
-
-    class TestRabbitFeedConsumer
-      def consume_event(event)
-        event = Event.new('no schema',event)
-        RabbitFeed::Consumer.event_routing.handle_event(event)
-      end
-    end
   end
 end

data/lib/rabbit_feed/testing_support.rb

@@ -0,0 +1,32 @@
+require 'rabbit_feed/testing_support/rspec_matchers/publish_event'
+require 'rabbit_feed/testing_support/test_rabbit_feed_consumer'
+require 'rabbit_feed/testing_support/testing_helpers'
+
+module RabbitFeed
+  module TestingSupport
+    extend self
+
+    attr_accessor :published_events
+
+    def setup rspec_config
+      capture_published_events rspec_config
+      include_support rspec_config
+    end
+
+    def capture_published_events rspec_config
+      rspec_config.before :each do
+
+        TestingSupport.published_events = []
+
+        allow(RabbitFeed::ProducerConnection).to receive(:publish) do |serialized_event, routing_key|
+          TestingSupport.published_events << (Event.deserialize serialized_event)
+        end
+      end
+    end
+
+    def include_support rspec_config
+      rspec_config.include(RabbitFeed::TestingSupport::RSpecMatchers)
+      rspec_config.include(RabbitFeed::TestingSupport::TestingHelpers)
+    end
+  end
+end

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '0.3.1'
+  VERSION = '1.0.0'
 end

data/lib/rabbit_feed.rb

@@ -16,8 +16,7 @@ require 'rabbit_feed/event_routing'
 require 'rabbit_feed/producer_connection'
 require 'rabbit_feed/producer'
 require 'rabbit_feed/event_definitions'
-require 'rabbit_feed/testing_support/rspec_matchers/publish_event'
-require 'rabbit_feed/testing_support/testing_helpers'
+require 'rabbit_feed/testing_support'
 
 module RabbitFeed
   extend self
@@ -29,8 +28,10 @@ module RabbitFeed
   attr_accessor :log, :environment, :configuration_file_path
 
   def configuration
-    raise ConfigurationError.new 'rabbit feed log is not set' unless log.present?
-    @configuration ||= (Configuration.load RabbitFeed.configuration_file_path, RabbitFeed.environment)
+    RabbitFeed.log                     ||= (Logger.new STDOUT)
+    RabbitFeed.configuration_file_path ||= 'config/rabbit_feed.yml'
+    RabbitFeed.environment             ||= ENV['RAILS_ENV'] || ENV['RACK_ENV']
+    @configuration                     ||= (Configuration.load RabbitFeed.configuration_file_path, RabbitFeed.environment)
   end
 
   def exception_notify exception

data/rabbit_feed.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RabbitFeed::VERSION
   spec.authors       = ['Simply Business']
   spec.email         = ['tech@simplybusiness.co.uk']
-  spec.description   = %q{A gem allowing your application to publish messages to RabbitMQ}
-  spec.summary       = %q{This will enable your application to publish messages to a bus to be processed by other services}
+  spec.description   = %q{A gem providing asynchronous event publish and subscribe capabilities with RabbitMQ.}
+  spec.summary       = %q{Enables your Ruby applications to perform centralized event logging with RabbitMq}
   spec.homepage      = 'https://github.com/simplybusiness/rabbit_feed'
   spec.license       = 'MIT'
 
@@ -19,17 +19,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Gem for interfacing with RabbitMq
-  spec.add_dependency 'bunny'
+  spec.add_dependency 'bunny', '>= 1.1.9', '< 1.7.0'
   # We use some helpers from ActiveSupport
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'activesupport', '>= 3.2.0', '< 5.0.0'
   # We use validations from ActiveModel
-  spec.add_dependency 'activemodel'
+  spec.add_dependency 'activemodel', '>= 3.2.0', '< 5.0.0'
   # Provides connection pooling for the producer connections
-  spec.add_dependency 'connection_pool'
+  spec.add_dependency 'connection_pool', '< 2.2.0'
   # Manages process pidfile
   spec.add_dependency 'pidfile'
   # Schema definitions and serialization for events
-  spec.add_dependency 'avro'
+  spec.add_dependency 'avro', '>= 1.5.4', '< 1.8.0'
   # For stubbing and custom matchers
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '>=2.14.0', '< 3.2.0'
 end

data/spec/lib/rabbit_feed/configuration_spec.rb

@@ -23,7 +23,15 @@ module RabbitFeed
       context 'with missing configuration' do
         let(:environment) { 'production' }
 
-        it 'should raise an error' do
+        it 'raises an error' do
+          expect{ subject }.to raise_error ConfigurationError
+        end
+      end
+
+      context 'with missing configuration file' do
+        let(:file_path) { 'I do not exist' }
+
+        it 'raises an error' do
           expect{ subject }.to raise_error ConfigurationError
         end
       end
@@ -42,8 +50,8 @@ module RabbitFeed
         its(:heartbeat)                 { should eq 60 }
         its(:connect_timeout)           { should eq 1 }
         its(:network_recovery_interval) { should eq 0.1 }
-        its(:auto_delete_queue)         { should be_true }
-        its(:auto_delete_exchange)      { should be_true }
+        its(:auto_delete_queue)         { should be_truthy }
+        its(:auto_delete_exchange)      { should be_truthy }
       end
 
     end
@@ -70,8 +78,8 @@ module RabbitFeed
         its(:heartbeat)                 { should eq 5 }
         its(:connect_timeout)           { should eq 10 }
         its(:network_recovery_interval) { should eq 1 }
-        its(:auto_delete_queue)         { should be_false }
-        its(:auto_delete_exchange)      { should be_false }
+        its(:auto_delete_queue)         { should be_falsey }
+        its(:auto_delete_exchange)      { should be_falsey }
       end
 
       context 'with provided options' do
@@ -106,8 +114,8 @@ module RabbitFeed
         its(:heartbeat)                 { should eq 3 }
         its(:connect_timeout)           { should eq 4 }
         its(:network_recovery_interval) { should eq 2 }
-        its(:auto_delete_queue)         { should be_true }
-        its(:auto_delete_exchange)      { should be_true }
+        its(:auto_delete_queue)         { should be_truthy }
+        its(:auto_delete_exchange)      { should be_truthy }
       end
 
       context 'with empty options' do

data/spec/lib/rabbit_feed/event_routing_spec.rb

@@ -17,6 +17,14 @@ module RabbitFeed
             event.payload
           end
         end
+        accept_from(:any) do
+          event('event_3') do |event|
+            raise 'event_3 from any app'
+          end
+          event('event_4') do |event|
+            event.payload
+          end
+        end
       end
     end
 
@@ -26,14 +34,17 @@ module RabbitFeed
         test.dummy_1.event_1
         test.dummy_1.event_2
         test.dummy_2.event_3
+        test.*.event_3
+        test.*.event_4
       }
     end
 
-    it 'routes the event to the correct action' do
+    it 'routes the event to the correct action, preferring named applications' do
       events = [
         double(:event, application: 'dummy_1', name: 'event_1', payload: 1),
         double(:event, application: 'dummy_1', name: 'event_2', payload: 2),
         double(:event, application: 'dummy_2', name: 'event_3', payload: 3),
+        double(:event, application: 'none',    name: 'event_4', payload: 4),
       ]
       events.each do |event|
         (RabbitFeed::Consumer.event_routing.handle_event event).should eq event.payload
@@ -114,8 +125,37 @@ module RabbitFeed
           test.dummy_1.event_2
           test.dummy_2.event_3
           test.dummy_3.event_4
+          test.*.event_3
+          test.*.event_4
         }
       end
     end
+
+    context 'defining the same application twice' do
+
+      it 'raises an exception for a named application' do
+        expect do
+          EventRouting do
+            accept_from('dummy_2') do
+              event('event_4') do |event|
+                event.payload
+              end
+            end
+          end
+        end.to raise_error ConfigurationError
+      end
+
+      it 'raises an exception for the catch-all application' do
+        expect do
+          EventRouting do
+            accept_from(:any) do
+              event('event_4') do |event|
+                event.payload
+              end
+            end
+          end
+        end.to raise_error ConfigurationError
+      end
+    end
   end
 end

data/spec/lib/rabbit_feed/producer_spec.rb

@@ -5,7 +5,7 @@ module RabbitFeed
     describe '.publish' do
       let(:event_name) { 'event_name' }
       before do
-        RabbitFeed::Producer.stub!
+        allow(RabbitFeed::ProducerConnection).to receive(:publish)
         EventDefinitions do
           define_event('event_name', version: '1.0.0') do
             defined_as do

data/spec/lib/rabbit_feed/testing_support/rspec_matchers/publish_event_spec.rb

@@ -6,6 +6,7 @@ module RabbitFeed
       describe PublishEvent do
         let(:event_name) { 'test_event' }
         let(:event_payload) { {'field' => 'value'} }
+        TestingSupport.capture_published_events self
         before do
           EventDefinitions do
             define_event('test_event', version: '1.0.0') do
@@ -41,18 +42,32 @@ module RabbitFeed
               raise 'this hurts me more than it hurts you'
             }.to_not publish_event(event_name, {})
           end
+
+          context 'when not validating the payload' do
+            it 'validates' do
+              expect {
+                RabbitFeed::Producer.publish_event event_name, event_payload
+              }.to publish_event(event_name)
+            end
+
+            it 'validates the negation' do
+              expect {
+                RabbitFeed::Producer.publish_event 'different name', {}
+              }.to_not publish_event(event_name)
+            end
+          end
         end
 
         it 'validates the event name' do
           matcher = described_class.new(event_name, {})
           block   = Proc.new { RabbitFeed::Producer.publish_event 'different name', {} }
-          (matcher.matches? block).should be_false
+          (matcher.matches? block).should be_falsey
         end
 
         it 'validates the event payload' do
           matcher = described_class.new(event_name, event_payload)
           block   = Proc.new { RabbitFeed::Producer.publish_event event_name, {'field' => 'different value'} }
-          (matcher.matches? block).should be_false
+          (matcher.matches? block).should be_falsey
         end
       end
     end

data/spec/lib/rabbit_feed/testing_support/testing_helper_spec.rb

@@ -4,9 +4,6 @@ module RabbitFeed
   module TestingSupport
     describe TestingHelpers do
       describe 'consuming events' do
-
-        include TestingHelpers
-
         accumulator = []
 
         let(:define_route) do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'codeclimate-test-reporter'
 require 'rabbit_feed'
+require 'rspec/its'
 require 'timecop'
 require 'timeout'
 
@@ -21,6 +22,10 @@ Dir.glob('spec/features/step_definitions/**/*_steps.rb') { |f| load f, true }
 
 RSpec.configure do |config|
 
+  config.expect_with :rspec do |expects|
+    expects.syntax = [:should, :expect]
+  end
+
   config.before do
     reset_environment
   end
@@ -37,7 +42,7 @@ RSpec.configure do |config|
     RabbitFeed::Producer.event_definitions = nil
   end
 
-  config.include(RabbitFeed::TestingSupport::RSpecMatchers)
+  RabbitFeed::TestingSupport.include_support config
 end
 
 def kill_consumer_thread

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_feed
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,56 +16,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: pidfile
   requirement: !ruby/object:Gem::Requirement
@@ -86,29 +104,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: A gem allowing your application to publish messages to RabbitMQ
+        version: 2.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+description: A gem providing asynchronous event publish and subscribe capabilities
+  with RabbitMQ.
 email:
 - tech@simplybusiness.co.uk
 executables:
@@ -209,6 +240,7 @@ files:
 - example/rails_app/public/robots.txt
 - example/rails_app/spec/controllers/beavers_controller_spec.rb
 - example/rails_app/spec/event_routing_spec.rb
+- example/rails_app/spec/rails_helper.rb
 - example/rails_app/spec/spec_helper.rb
 - example/rails_app/test/controllers/.keep
 - example/rails_app/test/controllers/beavers_controller_test.rb
@@ -236,7 +268,9 @@ files:
 - lib/rabbit_feed/event_routing.rb
 - lib/rabbit_feed/producer.rb
 - lib/rabbit_feed/producer_connection.rb
+- lib/rabbit_feed/testing_support.rb
 - lib/rabbit_feed/testing_support/rspec_matchers/publish_event.rb
+- lib/rabbit_feed/testing_support/test_rabbit_feed_consumer.rb
 - lib/rabbit_feed/testing_support/testing_helpers.rb
 - lib/rabbit_feed/version.rb
 - logo.png
@@ -283,8 +317,8 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: This will enable your application to publish messages to a bus to be processed
-  by other services
+summary: Enables your Ruby applications to perform centralized event logging with
+  RabbitMq
 test_files:
 - spec/features/connectivity.feature
 - spec/features/step_definitions/connectivity_steps.rb