rabbit_feed 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab62ca0a881a02a77ffb047578b18ee0171fe1b
-  data.tar.gz: 0c5026737dbb42a8ff35e8c411a58e96c2df7675
+  metadata.gz: bb3568ac0fb22611b9d73b0b1ffd3078d7a2f378
+  data.tar.gz: 34f7bf50b5d0c47e8aa40603cdea8a1b43cf4c42
 SHA512:
-  metadata.gz: 0e2025010bd1cdde1be560dc32a66374148c651cee165212310a54918ea5e16c4b5e5e73fbe3a8989b0635f08927633223e6de799b251583a6a95a922c657951
-  data.tar.gz: abe806532b976fb2c05770e5b1453e0ef671f4957544e6af447bb0fefa1c6690289547066dbe05299c022168fc1b44b4e6828a9450c82c433bf1eda17fdf40ba
+  metadata.gz: 997d107c3db5834ad0f8d75042af9f80aeb3070ec53a455cbfda8bf7004c658c96acc81dd33a540d10a39efa9d38ebca78e0c3f9539de35357a80ed1789550c3
+  data.tar.gz: 6844f471ea911177451f98d4a45750406dae32de59d44d18af54301a8576f3ac77cde9d555f515f75486390ad9320666e7f8eeab65f4522ed33a4f1bcf2ac494

data/.gitignore

@@ -5,7 +5,7 @@ pkg
 # OSX dotfile
 .DS_Store
 # Log files
-*.log
+*.log*
 *.iml
 .idea/
 *.gem

data/.rspec

@@ -2,3 +2,4 @@
 --order rand
 --color
 --format doc
+--require spec_helper

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbit_feed (2.3.1)
+    rabbit_feed (2.3.2)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)

data/README.md

@@ -80,7 +80,7 @@ EventRouting do
 end
 ```
 
-You may also override the log location (defaults to `STDOUT`), the environment (defaults to the `RAILS_ENV`), and the path to the RabbitFeed config file (defaults to `config/rabbit_feed.yml`) in the initializer, like this:
+You may also override the log location (defaults to `log/rabbit_feed.log` if a `log` directory exists, else `STDOUT`), the environment (defaults to the `RAILS_ENV` or `RACK_ENV`), and the path to the RabbitFeed config file (defaults to `config/rabbit_feed.yml`) in the initializer, like this:
 
 ```ruby
 RabbitFeed.instance_eval do

data/example/non_rails_app/.rspec

@@ -1 +1,3 @@
 --color
+--order rand
+--require spec_helper

data/example/non_rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.3.1)
+    rabbit_feed (2.3.2)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)

data/example/non_rails_app/bin/benchmark

@@ -7,10 +7,7 @@ require 'rabbit_feed'
 # Prevent deprecation warnings
 I18n.enforce_available_locales = true
 
-RabbitFeed.instance_eval do
-  self.log         = Logger.new 'log/rabbit_feed.log'
-  self.environment = 'development'
-end
+RabbitFeed.environment = 'development'
 
 payload = 'abc'*5000
 number_of_events = 5000

data/example/non_rails_app/lib/non_rails_app.rb

@@ -1,9 +1,6 @@
 require 'rabbit_feed'
 require_relative 'non_rails_app/event_handler'
 
-RabbitFeed.log = Logger.new('log/rabbit_feed.log')
-RabbitFeed.log.formatter = RabbitFeed::JsonLogFormatter
-
 EventRouting do
   accept_from('rails_app') do
     event('user_creates_beaver') do |event|

data/example/non_rails_app/spec/lib/non_rails_app/event_handler_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module NonRailsApp
   describe EventHandler do
 

data/example/non_rails_app/spec/lib/non_rails_app/event_routing_spec.rb

@@ -1,5 +1,3 @@
-require_relative '../../spec_helper'
-
 module NonRailsApp
   describe 'Event Routing' do
     let(:payload)  { {'field' => 'value'} }

data/example/non_rails_app/spec/spec_helper.rb

@@ -1,24 +1,5 @@
 require 'non_rails_app'
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
   RabbitFeed::TestingSupport.setup(config)
 end
-
-RabbitFeed.log = Logger.new('log/rabbit_feed.log')
-RabbitFeed.log.formatter = RabbitFeed::JsonLogFormatter
-RabbitFeed.environment = 'test'
-RabbitFeed.configuration_file_path = 'config/rabbit_feed.yml'

data/example/rails_app/.rspec

@@ -1 +1,3 @@
 --color
+--order rand
+--require rails_helper

data/example/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.3.1)
+    rabbit_feed (2.3.2)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)

data/example/rails_app/config/initializers/rabbit_feed.rb

@@ -1,6 +1,3 @@
-RabbitFeed.log = Logger.new('log/rabbit_feed.log')
-RabbitFeed.log.formatter = RabbitFeed::JsonLogFormatter
-
 EventDefinitions do
   define_event('user_creates_beaver', version: '1.0.0') do
     defined_as do

data/example/rails_app/spec/controllers/beavers_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 describe BeaversController do
 
   describe 'POST create' do

data/example/rails_app/spec/event_routing_spec.rb

@@ -1,5 +1,3 @@
-require_relative 'rails_helper'
-
 module RailsApp
   describe 'Event Routing' do
 

data/example/rails_app/spec/rails_helper.rb

@@ -1,7 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 

data/lib/rabbit_feed.rb

@@ -29,10 +29,7 @@ module RabbitFeed
   attr_accessor :log, :environment, :configuration_file_path, :application
 
   def configuration
-    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, application)
+    @configuration ||= (Configuration.load configuration_file_path, environment, application)
   end
 
   def exception_notify exception
@@ -40,4 +37,24 @@ module RabbitFeed
       (Airbrake.notify_or_ignore exception) if Airbrake.configuration.public?
     end
   end
+
+  def default_logger
+    if File.directory? 'log'
+      Logger.new 'log/rabbit_feed.log', 10, 100.megabytes
+    else
+      Logger.new STDOUT
+    end.tap do |log|
+      log.formatter = RabbitFeed::JsonLogFormatter
+      log.level     = Logger::INFO
+    end
+  end
+
+  def set_defaults
+    self.log                     = default_logger
+    self.configuration_file_path = 'config/rabbit_feed.yml'
+    self.environment             = ENV['RAILS_ENV'] || ENV['RACK_ENV']
+  end
+  private :set_defaults
+
+  set_defaults
 end

data/lib/rabbit_feed/client.rb

@@ -86,7 +86,7 @@ module RabbitFeed
     end
 
     def set_logging
-      RabbitFeed.log           = Logger.new options[:logfile]
+      RabbitFeed.log           = Logger.new(options[:logfile], 10, 100.megabytes)
       RabbitFeed.log.level     = verbose? ? Logger::DEBUG : Logger::INFO
       RabbitFeed.log.formatter = RabbitFeed::JsonLogFormatter
     end

data/lib/rabbit_feed/testing_support.rb

@@ -9,6 +9,7 @@ module RabbitFeed
     attr_accessor :published_events
 
     def setup rspec_config
+      RabbitFeed.environment ||= 'test'
       capture_published_events rspec_config
       include_support rspec_config
     end

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/spec/lib/rabbit_feed/client_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe Client do
     let(:command)     { 'consume' }

data/spec/lib/rabbit_feed/configuration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe Configuration do
 

data/spec/lib/rabbit_feed/consumer_connection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe ConsumerConnection do
     let(:bunny_queue)      { double(:bunny_queue, bind: nil, subscribe: nil)}

data/spec/lib/rabbit_feed/event_definitions_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe EventDefinitions do
     before do

data/spec/lib/rabbit_feed/event_routing_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe EventRouting do
     before do

data/spec/lib/rabbit_feed/event_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe Event do
     let(:schema)   { double(:schema) }

data/spec/lib/rabbit_feed/producer_connection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe ProducerConnection do
     let(:bunny_exchange)   { double(:bunny_exchange, on_return: nil, publish: nil) }

data/spec/lib/rabbit_feed/producer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   describe Producer do
     describe '.publish' do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   module TestingSupport
     module RSpecMatchers

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RabbitFeed
   module TestingSupport
     describe TestingHelpers do

data/spec/spec_helper.rb

@@ -38,8 +38,7 @@ RSpec.configure do |config|
 end
 
 def reset_environment
-  RabbitFeed.log                         = Logger.new('test.log')
-  RabbitFeed.log.formatter               = RabbitFeed::JsonLogFormatter
+  RabbitFeed.log                         = RabbitFeed.default_logger
   RabbitFeed.environment                 = 'test'
   RabbitFeed.configuration_file_path     = 'spec/fixtures/configuration.yml'
   RabbitFeed::Consumer.event_routing     = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_feed
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -225,7 +225,6 @@ files:
 - 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
 - example/rails_app/test/fixtures/.keep
@@ -258,6 +257,7 @@ files:
 - lib/rabbit_feed/testing_support/test_rabbit_feed_consumer.rb
 - lib/rabbit_feed/testing_support/testing_helpers.rb
 - lib/rabbit_feed/version.rb
+- log/.keep
 - logo.png
 - rabbit_feed.gemspec
 - run_benchmark

data/example/rails_app/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-require 'rabbit_feed'
-require 'logger'
-
-RSpec.configure do |config|
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end
-
-RabbitFeed.log = Logger.new('log/rabbit_feed.log')
-RabbitFeed.log.formatter = RabbitFeed::JsonLogFormatter