phobos_db_checkpoint 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58180a350edfdb0adf597bb4851c4673fb465dde
-  data.tar.gz: f598d60bce1c73e3a63730d3fce89fe61dedb697
+  metadata.gz: cda7a0046d7b17d682ad17fb2615b67422c42ad2
+  data.tar.gz: d4bb9fda8a27b46029ba802a43d7fe806e14efbc
 SHA512:
-  metadata.gz: e12c26c2e3d42820ce8ba9278a4952b87f7702a1f58f45d4cba547026479ed8e82948ad8e8d67b01ee010e45737384d641c10f5266eae2e231ea2cb59195197b
-  data.tar.gz: 3cd6e4ffa88191fc70eb8fef38808fcc4bb8a86fb37ed7f315372a11988f0ce881d123cc359fcf5b922e844d733a96933ad50b0b9a3b69434b0335e12a03029a
+  metadata.gz: c9b28fba9214df0f2e183b346eef37e9f0417a20a5e880b30d698120441ae52d8bc13a1d4c8b3c375c70400ef80fd87f915245e5903a4772612348247701b94a
+  data.tar.gz: 6f83144ee24b53cd43495b9aa0d1883931eac7d26e576a1445696c7948ae5f27ad23f56f2429ce870a8878c2a60a2b6e8df9bd0f84dc474020d8ee3016a4adf9

data/.dockerignore

@@ -0,0 +1,11 @@
+.idea
+.DS_Store
+.dockerignore
+.gitignore
+.travis.yml
+Gemfile.lock
+Dockerfile
+log/
+coverage/
+spec/examples.txt
+pkg/

data/.rubocop.yml

@@ -0,0 +1,25 @@
+###########################
+# Configuration for rubocop
+# in .rubocop.yml
+
+##############
+# Global rules
+# see .rubocop_common.yml
+
+##############
+# Inherit default rules first, and then override those rules with
+# our violation whitelist.
+inherit_from:
+  - .rubocop_common.yml
+  - .rubocop_todo.yml
+
+##############
+# Project specific overrides here, example:
+# Metrics/BlockLength:
+#   Exclude:
+#    - 'tasks/the_huge_task.rake'
+
+AllCops:
+  Exclude:
+    - phobos_db_checkpoint.gemspec
+    - spec/setup/**/*.rb

data/.rubocop_common.yml

@@ -0,0 +1,23 @@
+##############
+# Global rules
+AllCops:
+  Exclude:
+    - db/**/*
+  TargetRubyVersion: 2.5
+
+Rails:
+  Enabled: false
+
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/BlockLength:
+  Exclude:
+   - '*.gemspec'
+   - 'spec/**/*.rb'
+
+Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,32 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-05-14 08:11:29 +0200 using RuboCop version 0.55.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 30
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 107
+
+# Offense count: 52
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 296
+
+# Offense count: 9
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 34
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7

data/.rubosync.yml

@@ -0,0 +1,2 @@
+git:
+  repo: git@github.com:phobos/shared.git

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/.travis.yml

@@ -0,0 +1,35 @@
+sudo: required
+language: ruby
+rvm:
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
+
+services:
+  - docker
+
+env:
+  global:
+    - CC_TEST_REPORTER_ID=09c6fe3d9f5f4673b7172b7ff0bd9721b5969da49c6c46e976fb89cf83f2a0dd
+
+before_install:
+  - env
+  - docker-compose --version
+  - docker --version
+  - docker-compose config
+  - docker-compose build test
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter before-build || echo "Skipping CC coverage before-build"; fi
+  - mkdir coverage/
+  - touch ./coverage/.resultset.json
+
+script:
+  - docker-compose run --rm test rspec
+
+after_script:
+  - cat ./coverage/.resultset.json | sed "s|/opt/phobos_db_checkpoint|$PWD|" > ./coverage/.newresultset.json
+  - cp ./coverage/.newresultset.json ./coverage/.resultset.json
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT || echo "Skipping CC coverage after-build"; fi

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/).
 
+## 3.4.0 (2018-07-22)
+
+### Changed
+- Introduce rubocop style guide #37
+- Use test module from Phobos to run handler specs #39
+- Accomodate future breaking changes of Phobos `around_consume` being moved to an instance method #38
+
 ## 3.3.0 (2017-10-26)
 
 - [enhancement] Bump Phobos version to 1.5.0 to better support Avro. #34

data/Dockerfile

@@ -0,0 +1,18 @@
+FROM ruby:2.4.1-alpine
+
+RUN apk update && apk upgrade && \
+    apk add --no-cache bash git openssh build-base
+RUN apk add --no-cache postgresql-dev
+
+RUN gem install bundler -v 1.16.0
+
+WORKDIR /opt/phobos_db_checkpoint
+
+ADD Gemfile Gemfile
+ADD phobos_db_checkpoint.gemspec phobos_db_checkpoint.gemspec
+ADD lib/phobos_db_checkpoint/version.rb lib/phobos_db_checkpoint/version.rb
+
+RUN bundle config build.pg --with-pg-config=/usr/pgsql-9.6/bin/pg_config
+RUN bundle install
+
+ADD . .

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in phobos_db_checkpoint.gemspec

data/README.md

@@ -1,5 +1,7 @@
-![CircleCI](https://circleci.com/gh/klarna/phobos_db_checkpoint/tree/master.svg?style=shield&circle-token=a69fda09f130a862b69f6a7e8be834f884829ccd)
-[![Coverage Status](https://coveralls.io/repos/github/klarna/phobos_db_checkpoint/badge.svg?branch=master)](https://coveralls.io/github/klarna/phobos_db_checkpoint?branch=master)
+[![Build Status](https://travis-ci.org/klarna/phobos_db_checkpoint.svg?branch=travis)](https://travis-ci.org/klarna/phobos_db_checkpoint)
+[![Maintainability](https://api.codeclimate.com/v1/badges/6f508f2515a418568bd8/maintainability)](https://codeclimate.com/github/klarna/phobos_db_checkpoint/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/6f508f2515a418568bd8/test_coverage)](https://codeclimate.com/github/klarna/phobos_db_checkpoint/test_coverage)
+[![Chat with us on Discord](https://discordapp.com/api/guilds/379938130326847488/widget.png)](https://discord.gg/rfMUBVD)
 
 # Phobos DB Checkpoint
 
@@ -118,14 +120,14 @@ class MyHandler
 end
 ```
 
-If your handler returns anything different than an __ack__ it won't be saved to the database.
+In case your handler returns anything different from an __ack__ it won't be saved to the database.
 
 Note that the `PhobosDBCheckpoint::Handler` will automatically skip already handled events (i.e. duplicate Kafka messages).
 
 #### <a name="payload"></a> Payload
 PhobosDBCheckpoint assumes that the payload received from Phobos is in a JSON format. This means that if your payload is in any other format, for example Avro binary, you need to convert/decode it to JSON.
 
-To achieve this you can override the `#before_consume` method of the handler:
+To achieve this you can compose a new handler with `PhobosDBCheckpoint::Handler` using the `#around_consume` method:
 
 ```ruby
 class MyHandler
@@ -133,12 +135,9 @@ class MyHandler
 
   # <-- setup @avro before
 
-  def before_consume(payload)
-    @avro.decode(payload)
-  end
-
-  def consume(payload, metadata)
-    # <-- consume your stuff with the decoded payload
+  def around_consume(payload, metadata)
+    decoded_payload = @avro.decode(payload)
+    super(decoded_payload, metadata)
   end
 end
 ```

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'phobos_db_checkpoint'

data/bin/phobos_db_checkpoint

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 

data/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+services:
+  test:
+    build:
+      context: .
+    command: rspec
+    network_mode: host
+    volumes:
+      - ./coverage:/opt/phobos_db_checkpoint/coverage

data/lib/phobos_db_checkpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'digest'
 require 'active_record'
@@ -13,10 +15,10 @@ require 'phobos_db_checkpoint/handler'
 require 'phobos_db_checkpoint/actions/retry_failure'
 
 module PhobosDBCheckpoint
-  DEFAULT_DB_DIR = 'db'.freeze
+  DEFAULT_DB_DIR = 'db'
   DEFAULT_MIGRATION_PATH = File.join(DEFAULT_DB_DIR, 'migrate').freeze
-  DEFAULT_DB_CONFIG_PATH = 'config/database.yml'.freeze
-  DEFAULT_POOL_SIZE = 5.freeze
+  DEFAULT_DB_CONFIG_PATH = 'config/database.yml'
+  DEFAULT_POOL_SIZE = 5
 
   class << self
     attr_reader :db_config
@@ -45,14 +47,12 @@ module PhobosDBCheckpoint
 
       @db_config_path ||= ENV['DB_CONFIG'] || DEFAULT_DB_CONFIG_PATH
 
-      configs = YAML.load(ERB.new(File.read(File.expand_path(@db_config_path))).result)
+      configs = YAML.safe_load(ERB.new(File.read(File.expand_path(@db_config_path))).result, [], [], true)
       @db_config = configs[env]
 
       pool_size = @db_config['pool']
 
-      if pool_size.nil? && Phobos.config
-        pool_size = number_of_concurrent_listeners + DEFAULT_POOL_SIZE
-      end
+      pool_size = number_of_concurrent_listeners + DEFAULT_POOL_SIZE if pool_size.nil? && Phobos.config
 
       @db_config.merge!('pool' => pool_size || DEFAULT_POOL_SIZE)
     end
@@ -61,10 +61,12 @@ module PhobosDBCheckpoint
       ActiveRecord::Base.establish_connection(db_config)
     end
 
+    # rubocop:disable Lint/HandleExceptions
     def close_db_connection
       ActiveRecord::Base.connection_pool.disconnect!
     rescue ActiveRecord::ConnectionNotEstablished
     end
+    # rubocop:enable Lint/HandleExceptions
 
     def load_tasks
       @db_dir ||= DEFAULT_DB_DIR

data/lib/phobos_db_checkpoint/actions/retry_failure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   class RetryFailure
     include PhobosDBCheckpoint::Handler
@@ -8,11 +10,9 @@ module PhobosDBCheckpoint
     end
 
     def perform
-      self
-        .class
-        .around_consume(payload, metadata) do
-          @action_taken = handler.consume(payload, metadata)
-        end
+      around_consume(payload, metadata) do
+        @action_taken = handler.consume(payload, metadata)
+      end
 
       @failure.destroy
       @action_taken

data/lib/phobos_db_checkpoint/cli.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'fileutils'
 
 module PhobosDBCheckpoint
   module CLI
-
     class Commands < Thor
       include Thor::Actions
 
@@ -39,13 +40,9 @@ module PhobosDBCheckpoint
              default: 'config/database.yml',
              banner: 'Database configuration relative to your project'
       def copy_migrations
-        if options[:config]
-          ENV['DB_CONFIG'] = options[:config]
-        end
+        ENV['DB_CONFIG'] = options[:config] if options[:config]
 
-        unless active_connection?
-          PhobosDBCheckpoint.configure
-        end
+        PhobosDBCheckpoint.configure unless active_connection?
 
         destination_fullpath = File.join(destination_root, options[:destination])
         generated_migrations = list_migrations(destination_fullpath)
@@ -60,7 +57,7 @@ module PhobosDBCheckpoint
             template(template_path, file_path)
           end
         end
-      rescue
+      rescue StandardError
         FileUtils.rm_f(file_path.to_s)
         raise
       end
@@ -95,16 +92,15 @@ module PhobosDBCheckpoint
       end
 
       def migration_number(index = 0)
-        [Time.now.utc.strftime('%Y%m%d%H%M%S%6N'), '%.21d' % index].max
+        [Time.now.utc.strftime('%Y%m%d%H%M%S%6N'), format('%.21d', index)].max
       end
 
       def template_migrations_metadata
         @template_migrations_metadata ||= begin
           index = 0
           template_migrations.map do |path|
-            name = path.split('/').last
             index += 1
-            {path: path, name: path.gsub(/\.erb$/, ''), number: migration_number(index)}
+            { path: path, name: path.gsub(/\.erb$/, ''), number: migration_number(index) }
           end
         end
       end
@@ -115,7 +111,7 @@ module PhobosDBCheckpoint
 
       def list_migrations(dir)
         return [] unless Dir.exist?(dir)
-        Dir.entries(dir).select {|f| f =~ /\.rb(\.erb)?$/}
+        Dir.entries(dir).select { |f| f =~ /\.rb(\.erb)?$/ }.sort
       end
 
       def migrations_template_dir
@@ -133,8 +129,8 @@ module PhobosDBCheckpoint
       def active_connection?
         ActiveRecord::Base
           .connection_pool
-          .with_connection { |con| con.active? }
-      rescue
+          .with_connection(&:active?)
+      rescue StandardError
         false
       end
     end

data/lib/phobos_db_checkpoint/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   class PhobosDBCheckpointError < StandardError; end
   class ListenerNotFoundError < PhobosDBCheckpointError

data/lib/phobos_db_checkpoint/event.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   class Event < ActiveRecord::Base
     include PhobosDBCheckpoint::EventHelper
     after_initialize :assign_checksum
 
-    scope :order_by_event_time_and_created_at, -> {
+    scope :order_by_event_time_and_created_at, lambda {
       order('event_time desc nulls last', 'created_at desc nulls last')
     }
 

data/lib/phobos_db_checkpoint/event_actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   Ack = Struct.new(:entity_id, :event_time, :event_type, :event_version)
 end

data/lib/phobos_db_checkpoint/event_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   module EventHelper
     def configured_listener
       listener = Phobos
-        .config
-        .listeners
-        .find { |l| l.group_id == self.group_id }
+                 .config
+                 .listeners
+                 .find { |l| l.group_id == group_id }
 
-      raise(ListenerNotFoundError, self.group_id) unless listener
+      raise(ListenerNotFoundError, group_id) unless listener
 
       listener
     end
@@ -17,15 +19,18 @@ module PhobosDBCheckpoint
         .constantize
     end
 
-    def method_missing(m, *args, &block)
-      rex = m.to_s.match /^fetch_(.+)/
-
-      if rex
+    def method_missing(method_name, *args, &block)
+      if method_name.to_s =~ /^fetch_(.*)/
+        method = Regexp.last_match(1)
         handler = configured_handler.new
-        return handler.send(rex[1], payload) if handler.respond_to?(rex[1])
+        handler.send(method, payload) if handler.respond_to?(method)
       else
         super
       end
     end
+
+    def respond_to_missing?(method_name, include_private = false)
+      method_name.to_s.start_with?('fetch_') || super
+    end
   end
 end

data/lib/phobos_db_checkpoint/events_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'rack'
 require 'sinatra/base'
@@ -25,7 +27,7 @@ module PhobosDBCheckpoint
       case exception
       when ActiveRecord::RecordNotFound
         status 404
-        type = env['sinatra.route'].match(/\/.+\/(.+)\/:/)[1].chop
+        type = env['sinatra.route'].match(%r{\/.+\/(.+)\/:})[1].chop
         { error: true, message: "#{type} not found" }.to_json
       else
         status 500
@@ -84,8 +86,8 @@ module PhobosDBCheckpoint
     get "/#{VERSION}/failures/count" do
       content_type :json
       count = PhobosDBCheckpoint::Failure
-        .all
-        .count
+              .all
+              .count
 
       { count: count }.to_json
     end
@@ -116,7 +118,7 @@ module PhobosDBCheckpoint
           PhobosDBCheckpoint::RetryFailure
             .new(failure)
             .perform
-        rescue => e
+        rescue StandardError => e
           status 422
           return { error: true, message: e.message }.to_json
         end

data/lib/phobos_db_checkpoint/failure.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   class Failure < ActiveRecord::Base
     include PhobosDBCheckpoint::EventHelper
 
-    scope :order_by_event_time_and_created_at, -> {
+    scope :order_by_event_time_and_created_at, lambda {
       order('event_time desc nulls last', 'created_at desc nulls last')
     }
 

data/lib/phobos_db_checkpoint/handler.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   module Handler
     include Phobos::Handler
+    include Phobos::Instrumentation
 
     def self.included(base)
       base.extend(ClassMethods)
@@ -10,57 +13,52 @@ module PhobosDBCheckpoint
       PhobosDBCheckpoint::Ack.new(entity_id, event_time, event_type, event_version)
     end
 
-    module ClassMethods
-      include Phobos::Instrumentation
-      include Phobos::Handler::ClassMethods
+    def retry_consume?(_event, event_metadata, _exception)
+      return true unless Phobos.config&.db_checkpoint&.max_retries
+      event_metadata[:retry_count] < Phobos.config&.db_checkpoint&.max_retries
+    end
 
-      def retry_consume?(event, event_metadata, exception)
-        return true unless Phobos.config&.db_checkpoint&.max_retries
-        event_metadata[:retry_count] < Phobos.config&.db_checkpoint&.max_retries
-      end
+    # rubocop:disable Style/RedundantBegin
+    def around_consume(payload, metadata)
+      event = PhobosDBCheckpoint::Event.new(
+        topic: metadata[:topic],
+        group_id: metadata[:group_id],
+        payload: payload
+      )
 
-      def around_consume(payload, metadata)
-        event = PhobosDBCheckpoint::Event.new(
-          topic: metadata[:topic],
-          group_id: metadata[:group_id],
-          payload: payload
-        )
+      event_metadata = { checksum: event.checksum }.merge(metadata)
 
-        event_metadata = { checksum: event.checksum }.merge(metadata)
+      instrument('db_checkpoint.around_consume', event_metadata) do
+        event_exists = instrument('db_checkpoint.event_already_exists_check', event_metadata) { event.exists? }
+        if event_exists
+          instrument('db_checkpoint.event_already_consumed', event_metadata)
+          return
+        end
 
-        instrument('db_checkpoint.around_consume', event_metadata) do
-          event_exists = instrument('db_checkpoint.event_already_exists_check', event_metadata) { event.exists? }
-          if event_exists
-            instrument('db_checkpoint.event_already_consumed', event_metadata)
-            return
-          end
+        event_action = instrument('db_checkpoint.event_action', event_metadata) do
+          begin
+            yield
+          rescue StandardError => e
+            raise e if retry_consume?(event, event_metadata, e)
 
-          event_action = instrument('db_checkpoint.event_action', event_metadata) do
-            begin
-              yield
-            rescue => e
-              if retry_consume?(event, event_metadata, e)
-                raise e
-              else
-                Failure.record(event: event, event_metadata: event_metadata, exception: e)
-              end
-            end
+            Failure.record(event: event, event_metadata: event_metadata, exception: e)
           end
+        end
 
-          case event_action
-          when PhobosDBCheckpoint::Ack
-            instrument('db_checkpoint.event_acknowledged', event_metadata) do
-              event.acknowledge!(event_action)
-            end
-          else
-            instrument('db_checkpoint.event_skipped', event_metadata)
+        case event_action
+        when PhobosDBCheckpoint::Ack
+          instrument('db_checkpoint.event_acknowledged', event_metadata) do
+            event.acknowledge!(event_action)
           end
+        else
+          instrument('db_checkpoint.event_skipped', event_metadata)
         end
-      ensure
-        # Returns any connections in use by the current thread back to the pool, and also returns
-        # connections to the pool cached by threads that are no longer alive.
-        ActiveRecord::Base.clear_active_connections!
       end
+    ensure
+      # Returns any connections in use by the current thread back to the pool, and also returns
+      # connections to the pool cached by threads that are no longer alive.
+      ActiveRecord::Base.clear_active_connections!
     end
+    # rubocop:enable Style/RedundantBegin
   end
 end

data/lib/phobos_db_checkpoint/middleware/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
   module Middleware
     class Database

data/lib/phobos_db_checkpoint/middleware/logger.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 module PhobosDBCheckpoint
   module Middleware
     class Logger
-      RACK_LOGGER    = 'rack.logger'.freeze
-      SINATRA_ERROR  = 'sinatra.error'.freeze
-      HTTP_VERSION   = 'HTTP_VERSION'.freeze
-      PATH_INFO      = 'PATH_INFO'.freeze
-      REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-      QUERY_STRING   = 'QUERY_STRING'.freeze
-      CONTENT_LENGTH = 'Content-Length'.freeze
+      RACK_LOGGER    = 'rack.logger'
+      SINATRA_ERROR  = 'sinatra.error'
+      HTTP_VERSION   = 'HTTP_VERSION'
+      PATH_INFO      = 'PATH_INFO'
+      REQUEST_METHOD = 'REQUEST_METHOD'
+      QUERY_STRING   = 'QUERY_STRING'
+      CONTENT_LENGTH = 'Content-Length'
 
       def initialize(app, options = {})
         @app = app
@@ -46,21 +48,21 @@ module PhobosDBCheckpoint
 
         if error
           Phobos.logger.error(message.merge(
-            exception_class: error.class.to_s,
-            exception_message: error.message,
-            backtrace: error.backtrace
-          ))
+                                exception_class: error.class.to_s,
+                                exception_message: error.message,
+                                backtrace: error.backtrace
+                              ))
         else
           Phobos.logger.info(message)
         end
       end
 
       def extract_path(request_env)
-        "#{request_env[PATH_INFO]}#{request_env[QUERY_STRING].empty? ? "" : "?#{request_env[QUERY_STRING]}"} #{request_env[HTTP_VERSION]}"
+        "#{request_env[PATH_INFO]}#{request_env[QUERY_STRING].empty? ? '' : "?#{request_env[QUERY_STRING]}"} #{request_env[HTTP_VERSION]}"
       end
 
       def extract_content_length(headers)
-        value = headers[CONTENT_LENGTH] or return
+        (value = headers[CONTENT_LENGTH]) || return
         value.to_s == '0' ? nil : value
       end
     end

data/lib/phobos_db_checkpoint/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 module PhobosDBCheckpoint

data/lib/phobos_db_checkpoint/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PhobosDBCheckpoint
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

data/phobos_db_checkpoint.gemspec

@@ -1,5 +1,7 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'phobos_db_checkpoint/version'
 
@@ -15,7 +17,7 @@ Gem::Specification.new do |spec|
     'Francisco Juan',
     'Tommy Gustafsson'
   ]
-  spec.email         = [
+  spec.email = [
     'ornelas.tulio@gmail.com',
     'mathias.klippinge@gmail.com',
     'sergey.evstifeev@gmail.com',
@@ -25,9 +27,9 @@ Gem::Specification.new do |spec|
     'tommydgustafsson@gmail.com'
   ]
 
-  spec.summary       = %q{Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement to Phobos::Handler}
-  spec.description   = %q{Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement to Phobos::Handler}
-  spec.homepage      = "https://github.com/klarna/phobos_db_checkpoint"
+  spec.summary       = 'Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement to Phobos::Handler'
+  spec.description   = 'Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement to Phobos::Handler'
+  spec.homepage      = 'https://github.com/klarna/phobos_db_checkpoint'
   spec.license       = 'Apache License Version 2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -44,20 +46,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop_rules'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'rspec_junit_formatter', '0.2.2'
-  spec.add_development_dependency 'rack-test'
 
-  spec.add_dependency 'thor'
-  spec.add_dependency 'rake'
   spec.add_dependency 'activerecord', '>= 4.0.0'
-  spec.add_dependency 'phobos', '>= 1.5.0'
+  spec.add_dependency 'phobos', '>= 1.8.0'
+  spec.add_dependency 'rake'
   spec.add_dependency 'sinatra'
+  spec.add_dependency 'thor'
 end

data/templates/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'phobos_db_checkpoint'
 require 'phobos_db_checkpoint/events_api'

data/templates/phobos_boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'phobos_db_checkpoint'
 PhobosDBCheckpoint.configure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos_db_checkpoint
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,50 +14,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,35 +87,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rubocop_rules
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,21 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: rack-test
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,63 +143,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: phobos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: phobos
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,10 +227,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_common.yml"
+- ".rubocop_todo.yml"
+- ".rubosync.yml"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -252,7 +245,7 @@ files:
 - bin/console
 - bin/phobos_db_checkpoint
 - bin/setup
-- circle.yml
+- docker-compose.yml
 - lib/phobos_db_checkpoint.rb
 - lib/phobos_db_checkpoint/actions/retry_failure.rb
 - lib/phobos_db_checkpoint/cli.rb

data/circle.yml

@@ -1,29 +0,0 @@
-machine:
-  pre:
-    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
-  services:
-    - docker
-  environment:
-    LOG_LEVEL: DEBUG
-    CI: true
-  ruby:
-    version: 2.3.1
-
-# Ignores circle ci default database setup
-database:
-  override:
-    - echo "overrides circle CI commands"
-
-dependencies:
-  pre:
-    - docker -v
-    - docker pull postgres:9.5.4
-    - gem install bundler -v 1.9.5
-    - bundle install
-
-test:
-  override:
-    - docker run -d -p 5432:5432 --name db postgres; sleep 5
-    - bundle exec rspec -r rspec_junit_formatter --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec/unit.xml
-  post:
-    - cp log/*.log $CIRCLE_ARTIFACTS/ || true