loga 2.7.0 → 2.8.1

data/spec/unit/loga/rack/logger_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test'
 
@@ -40,22 +42,22 @@ describe Loga::Rack::Logger do
       middleware.call(env, started_at)
 
       expect(Loga::Event).to have_received(:new).with(
-        data:      {
+        data: {
           request: {
-            'status'     => response_status,
-            'method'     => 'GET',
-            'path'       => '/about_us',
-            'params'     => { 'limit' => '1' },
+            'status' => response_status,
+            'method' => 'GET',
+            'path' => '/about_us',
+            'params' => { 'limit' => '1' },
             'request_id' => nil,
             'request_ip' => nil,
             'user_agent' => nil,
-            'duration'   => 500,
+            'duration' => 500,
           },
         },
         exception: logged_exception,
-        message:   %r{^GET \/about_us\?limit=1 #{response_status} in \d+ms$},
+        message: %r{^GET /about_us\?limit=1 #{response_status} in \d+ms$},
         timestamp: started_at,
-        type:      'request',
+        type: 'request',
       )
     end
 
@@ -82,22 +84,22 @@ describe Loga::Rack::Logger do
         expect { middleware.call(env, started_at) }.to raise_error(exception_class)
 
         expect(Loga::Event).to have_received(:new).with(
-          data:      {
+          data: {
             request: {
-              'status'     => response_status,
-              'method'     => 'GET',
-              'path'       => '/about_us',
-              'params'     => { 'limit' => '1' },
+              'status' => response_status,
+              'method' => 'GET',
+              'path' => '/about_us',
+              'params' => { 'limit' => '1' },
               'request_id' => nil,
               'request_ip' => nil,
               'user_agent' => nil,
-              'duration'   => 500,
+              'duration' => 500,
             },
           },
           exception: logged_exception,
-          message:   %r{^GET \/about_us\?limit=1 #{response_status} in \d+ms$},
+          message: %r{^GET /about_us\?limit=1 #{response_status} in \d+ms$},
           timestamp: started_at,
-          type:      'request',
+          type: 'request',
         )
       end
     end

data/spec/unit/loga/rack/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Loga::Rack::Request do

data/spec/unit/loga/service_version_strategies_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Loga::ServiceVersionStrategies do

data/spec/unit/loga/utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Loga::Utilities do

data/spec/unit/loga_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Loga do
@@ -64,7 +66,7 @@ describe Loga do
     context 'when Loga is configured' do
       before { subject.configure(options) }
 
-      specify { expect(subject.logger).to be_kind_of(Logger) }
+      specify { expect(subject.logger).to be_a(Logger) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,202 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Log aggregation through unified logging middleware, while respecting
   the original log format.
 email:
@@ -242,11 +46,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".codeclimate.yml"
+- ".github/workflows/build-and-test.yml"
+- ".github/workflows/publish-gem.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -254,12 +60,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
 - gemfiles/sidekiq51.gemfile
 - gemfiles/sidekiq60.gemfile
 - gemfiles/sidekiq61.gemfile
@@ -271,6 +76,9 @@ files:
 - gemfiles/sidekiq70.gemfile
 - gemfiles/sidekiq71.gemfile
 - gemfiles/sinatra14.gemfile
+- gemfiles/sinatra2.gemfile
+- gemfiles/sinatra3.gemfile
+- gemfiles/sinatra4.gemfile
 - gemfiles/unit.gemfile
 - lib/loga.rb
 - lib/loga/configuration.rb
@@ -297,12 +105,11 @@ files:
 - lib/loga/version.rb
 - loga.gemspec
 - spec/fixtures/README.md
-- spec/fixtures/rails42.rb
-- spec/fixtures/rails50.rb
 - spec/fixtures/rails52.rb
 - spec/fixtures/rails60.rb
 - spec/fixtures/rails61.rb
 - spec/fixtures/rails70.rb
+- spec/fixtures/rails71.rb
 - spec/fixtures/random_bin
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb
@@ -352,18 +159,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Facilitate log aggregation via unified logging
 test_files:
 - spec/fixtures/README.md
-- spec/fixtures/rails42.rb
-- spec/fixtures/rails50.rb
 - spec/fixtures/rails52.rb
 - spec/fixtures/rails60.rb
 - spec/fixtures/rails61.rb
 - spec/fixtures/rails70.rb
+- spec/fixtures/rails71.rb
 - spec/fixtures/random_bin
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb

data/.circleci/config.yml

@@ -1,112 +0,0 @@
-basic_build: &basic_build
-  working_directory: ~/loga
-  docker:
-    - image: cimg/ruby:2.7.5
-
-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
-    - store_artifacts:
-        path: coverage
-
-version: 2
-jobs:
-  ruby-2.5:
-    docker:
-      - image: circleci/ruby:2.5
-    <<: *test_build
-  ruby-2.6:
-    docker:
-      - image: circleci/ruby:2.6
-    <<: *test_build
-  ruby-2.7:
-    docker:
-      - image: cimg/ruby:2.7
-      - image: redis:7
-    <<: *test_build
-  ruby-3.0:
-    docker:
-      - image: cimg/ruby:3.0
-      - image: redis:7
-    <<: *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: |
-            mkdir ~/.gem
-            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:
-      - rubocop:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.5:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.6:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.7:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-3.0:
-          filters:
-            tags:
-              only: /.*/
-      - push-to-rubygems:
-          context: org-rubygems
-          filters:
-            tags:
-              only: /^v\d.+/
-            branches:
-              ignore: /.*/
-          requires:
-            - rubocop
-            - ruby-2.5
-            - ruby-2.6
-            - ruby-2.7
-            - ruby-3.0

data/gemfiles/rails42.gemfile

@@ -1,11 +0,0 @@
-# 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

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

data/spec/fixtures/rails42.rb

@@ -1,80 +0,0 @@
-require 'action_controller/railtie'
-require 'action_mailer/railtie'
-
-Bundler.require(*Rails.groups)
-
-STREAM = StringIO.new unless defined?(STREAM)
-
-class Dummy < Rails::Application
-  config.eager_load = true
-  config.filter_parameters += [:password]
-  config.secret_key_base = '2624599ca9ab3cf3823626240138a128118a87683bf03ab8f155844c33b3cd8cbbfa3ef5e29db6f5bd182f8bd4776209d9577cfb46ac51bfd232b00ab0136b24'
-  config.session_store :cookie_store, key: '_rails42_session'
-
-  config.log_tags = [:uuid, 'TEST_TAG']
-  config.loga = {
-    device: STREAM,
-    host: 'bird.example.com',
-    service_name: 'hello_world_app',
-    service_version: '1.0',
-  }
-  config.action_mailer.delivery_method = :test
-end
-
-class ApplicationController < ActionController::Base
-  include Rails.application.routes.url_helpers
-  protect_from_forgery
-
-  def ok
-    render text: 'Hello Rails'
-  end
-
-  def error
-    nil.name
-  end
-
-  def show
-    render json: params
-  end
-
-  def create
-    render json: params
-  end
-
-  def new
-    redirect_to :ok
-  end
-
-  def update
-    @id = params[:id]
-    render '/user'
-  end
-end
-
-class FakeMailer < ActionMailer::Base
-  default from: 'notifications@example.com'
-
-  def self.send_email
-    basic_mail.deliver_now
-  end
-
-  def basic_mail
-    mail(
-      to: 'user@example.com',
-      subject: 'Welcome to My Awesome Site',
-      body: 'Banana muffin',
-      content_type: 'text/html',
-    )
-  end
-end
-
-Dummy.routes.append do
-  get 'ok'        => 'application#ok'
-  get 'error'     => 'application#error'
-  get 'show'      => 'application#show'
-  post 'users'    => 'application#create'
-  get 'new'       => 'application#new'
-  put 'users/:id' => 'application#update'
-end
-
-Dummy.initialize!