loga 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cdc0f0a6e5b8ea5868e4b85c00638ed67d73fac4
-  data.tar.gz: 79969e8d9e8e2a06649e6ad7c5cb857cbce35f86
+SHA256:
+  metadata.gz: b7c3c0cd9e1fab4d284e3adc88c1d27ee6c61f97832eb29510bbc4f44c59b302
+  data.tar.gz: 7215fed59ad0cb9e9e66ae6b8d60ed5c8da4929a4d7e91372bdae98b266a0783
 SHA512:
-  metadata.gz: 3ade6b8ec6ee1c29d66eb45cd2b04ff8d8334a266312fa3ac24268b575b90113ba56d24432aee50f25d41d6a22a1a9903014d518437cdd1c2ccaf9fcf03381aa
-  data.tar.gz: 3556ccbed13ad63dad04534a6b87a4b25b5ac75eb84ecba88e059df63aa2e2cf3749a2fb4e3e063fa57494311d2cc01fcb642498e2901099f3352c4151064085
+  metadata.gz: b447cbd98d83ed537851a626688de411fffa053a97fb7d24bc0988dd5f21c6a9cee63f4ac88948cba9bafe820a94b1478da3fcb9617041bfb6c70ce652a402b1
+  data.tar.gz: 517841207ffc10a6f3badab0893cf13f7ad45c1e4c21dcc0b92752b7ee0de0f270f9bfe0be75739f0a034edc74b5bcafe9f8a73ba53220ee1527f70dcbbd7f49

data/.circleci/config.yml

@@ -0,0 +1,157 @@
+basic_build: &basic_build
+  working_directory: ~/loga
+  docker:
+    - image: circleci/ruby:2.5.1
+
+test_build: &test_build
+  working_directory: ~/loga
+  steps:
+    - checkout
+    - &restore_gems
+      restore_cache:
+        keys:
+          - v2-gems-{{ checksum "Gemfile" }}-{{ checksum "Appraisals"}}-{{ .Environment.CIRCLE_JOB }}
+          - v2-gems-{{ checksum "Gemfile" }}
+    - &bundle_install
+      run: bundle install --jobs 4 --path=vendor/bundle --retry 3
+    - run: bundle exec appraisal install
+    - &cache_gems
+      save_cache:
+        key: v2-gems-{{ checksum "Gemfile" }}-{{ checksum "Appraisals"}}-{{ .Environment.CIRCLE_JOB }}
+        paths:
+          - gemfiles/vendor/bundle
+          - vendor/bundle
+    - attach_workspace:
+        at: ./tmp
+    - run: RACK_ENV=development bundle exec appraisal rspec
+    - run: RACK_ENV=production bundle exec appraisal rspec
+    - run: ./tmp/cc-test-reporter format-coverage -t simplecov -o $(ruby -e 'puts "tmp/codeclimate.#{RUBY_VERSION}.json"') coverage/.resultset.json
+    - persist_to_workspace:
+        root: tmp
+        paths:
+          - codeclimate.*.json
+    - store_artifacts:
+        path: coverage
+
+version: 2
+jobs:
+  build:
+    <<: *basic_build
+    steps:
+      - run:
+          name: Download cc-test-reporter
+          command: |
+            mkdir -p tmp/
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
+            chmod +x ./tmp/cc-test-reporter
+      - persist_to_workspace:
+          root: ./tmp
+          paths:
+            - cc-test-reporter
+  upload-coverage:
+    <<: *basic_build
+    steps:
+      - attach_workspace:
+          at: ./tmp
+      - run:
+          name: Upload coverage results to Code Climate
+          command: |
+            ./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json -o tmp/codeclimate.total.json
+            ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.total.json -r $CODECLIMATE_REPO_TOKEN
+  ruby-2.2:
+    docker:
+      - image: circleci/ruby:2.2.10
+    <<: *test_build
+  ruby-2.3:
+    docker:
+      - image: circleci/ruby:2.3.7
+    <<: *test_build
+  ruby-2.4:
+    docker:
+      - image: circleci/ruby:2.4.4
+    <<: *test_build
+  ruby-2.5:
+    docker:
+      - image: circleci/ruby:2.5.1
+    <<: *test_build
+  rubocop:
+    <<: *basic_build
+    steps:
+      - checkout
+      - *restore_gems
+      - *bundle_install
+      - *cache_gems
+      - run: bundle exec rubocop
+  push-to-rubygems:
+    <<: *basic_build
+    steps:
+      - checkout
+      - *restore_gems
+      - *bundle_install
+      - *cache_gems
+      - run:
+          name: Build the gem
+          command: gem build $CIRCLE_PROJECT_REPONAME.gemspec
+      - deploy:
+          name: Publish to rubygems
+          command: |
+            echo ":rubygems_api_key: $RUBYGEMS_API_KEY" >  ~/.gem/credentials
+            chmod 0600 ~/.gem/credentials
+            gem push $CIRCLE_PROJECT_REPONAME-$(echo $CIRCLE_TAG | sed -e 's/v//').gem
+workflows:
+  version: 2
+  test-then-push-gem:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /.*/
+      - rubocop:
+          filters:
+            tags:
+              only: /.*/
+      - ruby-2.2:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
+      - ruby-2.3:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
+      - ruby-2.4:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
+      - ruby-2.5:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
+      - upload-coverage:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - ruby-2.2
+            - ruby-2.3
+            - ruby-2.4
+            - ruby-2.5
+      - push-to-rubygems:
+          filters:
+            tags:
+              only: /^v\d.+/
+            branches:
+              ignore: /.*/
+          requires:
+            - rubocop
+            - ruby-2.2
+            - ruby-2.3
+            - ruby-2.4
+            - ruby-2.5

data/.codeclimate.yml

@@ -0,0 +1,4 @@
+engines:
+  rubocop:
+    enabled: true
+    channel: rubocop-0-50

data/.gitignore

@@ -23,3 +23,5 @@ tmp
 mkmf.log
 spec/fixtures/**/*.log
 gemfiles/*.lock
+vendor/bundle
+.byebug_history

data/.rubocop.yml

@@ -1,14 +1,25 @@
 AllCops:
   Exclude:
-    - 'spec/fixtures/**/*'
     - '*.gemspec'
+    - 'spec/fixtures/**/*'
+    - 'vendor/bundle/**/*'
 
 Documentation:
-    Enabled: false
+  Enabled: false
+
+Layout/ExtraSpacing:
+  Enabled: false
+
+Layout/SpaceAroundOperators:
+  Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb
+
 Metrics/LineLength:
   Enabled: true
   Max: 90
@@ -17,9 +28,6 @@ Metrics/MethodLength:
   Enabled: true
   Max: 15
 
-Style/ExtraSpacing:
-  Enabled: false
-
 Style/BlockDelimiters:
   Enabled: false
 
@@ -29,9 +37,6 @@ Style/FormatString:
 Style/PerlBackrefs:
   Enabled: false
 
-Style/SpaceAroundOperators:
-  Enabled: false
-
 Style/TrailingCommaInLiteral:
   Enabled: true
   EnforcedStyleForMultiline: comma

data/Appraisals

@@ -1,17 +1,27 @@
-appraise 'rails32' do
-  gem 'rails', '~> 3.2.0'
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
+  appraise 'rails32' do
+    gem 'rails', '~> 3.2.0'
+  end
+
+  appraise 'rails40' do
+    gem 'rails', '~> 4.0.0'
+  end
 end
 
-appraise 'rails40' do
-  gem 'rails', '~> 4.0.0'
+appraise 'rails42' do
+  gem 'rails', '~> 4.2.0'
 end
 
 appraise 'sinatra14' do
- gem 'sinatra',  '~> 1.4.0'
+  gem 'sinatra', '~> 1.4.0'
 end
 
 appraise 'rails50' do
- gem 'rails',  '~> 5.0.0'
+  gem 'rails', '~> 5.0.0'
+end
+
+appraise 'rails52' do
+  gem 'rails', '~> 5.2.0'
 end
 
 appraise 'unit' do

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0] - 2018-05-10
+### Added
+Subscribe to `ActionMailer` events
+  - deliver
+  - process
+  - receive
+
 ## [2.1.2] - 2016-12-08
 ### Fixed
 - `Loga::Rack::Logger` looks into `env['rack.exception']` for exceptions

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 
 group :test do
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0', require: false
 end

data/Guardfile

@@ -4,7 +4,7 @@ guard :rubocop do
 end
 
 group :sinatra do
-  %w(production development).each do |env|
+  %w[production development].each do |env|
     guard :rspec,
           all_on_start: true,
           cmd: "RACK_ENV=#{env} bundle exec appraisal sinatra14 rspec" do
@@ -14,23 +14,25 @@ group :sinatra do
 end
 
 group :rails do
-  %w(production development).each do |env|
-    %w(rails32 rails40 rails50).each do |appraisal|
-      guard :rspec,
-            all_on_start: true,
-            cmd: "RACK_ENV=#{env} bundle exec appraisal #{appraisal} rspec" do
+  %w[production development].each do |env|
+    %w[rails32 rails40 rails50 rails52].each do |appraisal|
+      cmd = "RACK_ENV=#{env} bundle exec appraisal #{appraisal} rspec"
+
+      guard :rspec, all_on_start: true, cmd: cmd do
         watch('lib/loga/railtie.rb') do
           [
             'spec/integration/rails/request_spec.rb',
             'spec/integration/rails/railtie_spec.rb',
           ]
         end
+
         watch(%r{^spec/fixtures/rails\d{2}/.+\.rb$}) do
           [
             'spec/integration/rails/request_spec.rb',
             'spec/integration/rails/railtie_spec.rb',
           ]
         end
+
         watch(%r{^spec/integration/rails/.+_spec\.rb$})
       end
     end

data/README.md

@@ -95,6 +95,7 @@ This is made possible by silencing these loggers:
 - `ActionDispatch::DebugExceptions`
 - `ActionController::LogSubscriber`
 - `ActionView::LogSubscriber`
+- `ActionMailer::LogSubscriber`
 
 #### Request log tags
 

data/Rakefile

@@ -6,4 +6,4 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/gemfiles/rails32.gemfile

@@ -6,7 +6,6 @@ gem "rails", "~> 3.2.0"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails40.gemfile

@@ -6,7 +6,6 @@ gem "rails", "~> 4.0.0"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+group :test do
+  gem "simplecov"
+end
+
+gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -6,7 +6,6 @@ gem "rails", "~> 5.0.0"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+group :test do
+  gem "simplecov"
+end
+
+gemspec path: "../"

data/gemfiles/sinatra14.gemfile

@@ -6,7 +6,6 @@ gem "sinatra", "~> 1.4.0"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/unit.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0", :require => false
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/loga.rb

@@ -13,17 +13,19 @@ module Loga
   ConfigurationError = Class.new(StandardError)
 
   def self.configuration
-    if @configuration.nil?
+    unless @configuration
       raise ConfigurationError,
             'Loga has not been configured. Configure with Loga.configure(options)'
     end
+
     @configuration
   end
 
   def self.configure(options, framework_options = {})
-    unless @configuration.nil?
+    if @configuration
       raise ConfigurationError, 'Loga has already been configured'
     end
+
     @configuration ||= Configuration.new(options, framework_options)
   end
 

data/lib/loga/configuration.rb

@@ -8,15 +8,15 @@ require 'socket'
 
 module Loga
   class Configuration
-    FRAMEWORK_EXCEPTIONS = %w(
+    FRAMEWORK_EXCEPTIONS = %w[
       ActionController::RoutingError
       ActiveRecord::RecordNotFound
       Sinatra::NotFound
-    ).freeze
+    ].freeze
 
-    attr_accessor :device, :filter_exceptions, :filter_parameters, :format,
-                  :host, :level, :service_name, :service_version, :sync, :tags
-    attr_reader :logger
+    attr_accessor :device, :filter_exceptions, :filter_parameters,
+                  :host, :level, :service_version, :sync, :tags
+    attr_reader :logger, :format, :service_name
 
     def initialize(user_options = {}, framework_options = {})
       options = default_options.merge(framework_options)