cyclone_lariat 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cebf79d1deb7a107446827a619897bf59364b89e8745fd767ed001bea3d6272
-  data.tar.gz: 6ff840519d31a46ab2f2ae6615176489041154213093052d5f924495dd537a20
+  metadata.gz: 1fcb758ada2c6be765e0ff3c5fc3475d88035797a5c36c79b02e7dd284a91da5
+  data.tar.gz: 4c9a529a78f69cce1b66d173aeba69e2718fa45993f1cdc1ccd76cffb1458d6c
 SHA512:
-  metadata.gz: 45eab91fdef2c3c97d6638bf2ec0bf5d83dbaa54b18037a8245d25f2142b4582d60cd771c758f6d9300b2ed51977ce430864606f9155b2a235592470e92db539
-  data.tar.gz: 2f58eef796c7e0c52b6f3b8e4341466f7c8baf77ca3a6ff482e4435bd4aad73c04e1a667f39a11d820e774421c58b0519ce8401bdd1984ad872178a85d92a034
+  metadata.gz: 9b8a779be033da93f19b757934de2f9637c5f1dba3c97e300c20750e41000fee5d254d38973f934080176ba238636d2cd2d7c01c3ca5d8bbced1a68e352e882e
+  data.tar.gz: 787adf37f5ade39c034346c7dc84a1041f8b75404b15df7ba8cd3d5c5c926e62c580b45d1bf49e43a5681550dc299a592957a5c4ac30aac7cad76d04cdc32dc7

data/.gitignore

@@ -16,3 +16,7 @@ config/db.rb
 
 # gem builds
 *.gem
+
+# docker-compose
+/local/
+/privatekey

data/.rubocop.yml

@@ -7,7 +7,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
   Exclude:
     - Rakefile
   UseCache: true

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.0
+ruby-2.4.6

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.6] - 2022-02-09
+Changed
+- Downgrade minimum ruby version to 2.4.0
+
+## [0.3.3] - 2021-07-14
+Changed
+- Bugfix of message equality check
+
 ## [0.3.2] - 2021-06-11
 Changed
 - Bugfix

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.6.5-buster
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        postgresql-client
+WORKDIR /gem
+COPY lib/cyclone_lariat/version.rb ./lib/cyclone_lariat/version.rb
+COPY cyclone_lariat.gemspec ./
+COPY Gemfile* ./
+RUN bundle install --jobs 20 --retry 5
+CMD ["rake"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyclone_lariat (0.3.2)
+    cyclone_lariat (0.3.6)
       aws-sdk-sns
       aws-sdk-sqs
       luna_park (~> 0.11)
@@ -9,75 +9,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.462.0)
-    aws-sdk-core (3.114.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.553.0)
+    aws-sdk-core (3.126.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sns (1.40.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sns (1.51.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.39.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sqs (1.50.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
     crack (0.4.5)
       rexml
     database_cleaner-core (2.0.1)
     database_cleaner-sequel (2.0.0)
       database_cleaner-core (~> 2.0.0)
       sequel
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    dry-configurable (0.12.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.6.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.6.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
-      dry-initializer (~> 3.0)
-      dry-schema (~> 1.5, >= 1.5.2)
+    diff-lcs (1.5.0)
+    docile (1.3.5)
     hashdiff (1.0.1)
-    jmespath (1.4.0)
+    jmespath (1.5.0)
     luna_park (0.11.1)
     method_source (1.0.0)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     pry (0.13.1)
@@ -87,23 +52,23 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -113,33 +78,32 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    sequel (5.44.0)
-    simplecov (0.21.2)
+    sequel (5.53.0)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
     timecop (0.9.4)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.26)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
-  bundler (~> 2.1)
+  bundler (~> 1.17)
   byebug (~> 11.1)
   cyclone_lariat!
   database_cleaner-sequel (~> 2.0)
-  dry-validation (~> 1.1)
   pg (~> 1.2)
   pry (~> 0.13)
   pry-byebug (~> 3.9)
@@ -152,4 +116,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.19
+   1.17.3

data/README.md

@@ -147,6 +147,7 @@ If you use middleware:
 ```ruby
 require 'cyclone_lariat/middleware' # If require: false in Gemfile
 
+
 class Receiver
   include Shoryuken::Worker
   

data/Rakefile

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require 'rake'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
 
 # tasks from lib directory
 Dir[File.expand_path('lib/tasks/**/*.rake', __dir__)].each do |entity|
-  puts entity
-  load entity
+  print "#{entity} : "
+  puts load entity
 end
 
 task default: %i[spec] # rubocop]

data/bin/docker/diff

@@ -0,0 +1,3 @@
+# Show differences between local Dockerfile and production Dockerfile
+
+diff Dockerfile local.Dockerfile -aBw

data/bin/docker/init

@@ -0,0 +1,38 @@
+# Initialize project to use Docker and prepare app in Docker
+#
+# WARNING
+#   if your default ssh key `id_rsa` is protected by password,
+#   you need to create a new key without password only for Github (and authorize this key in github)
+#   @example
+#     `ssh-keygen -b 4096 -f ~/.ssh/id_rsa_git -N ""`
+#
+#   And define a name of new key when calling this script.
+#   @example:
+#     `bin/docker-init id_rsa_git`
+
+bin/docker-privatekey $@
+
+echo "> Preparing volume directories"
+mkdir local
+mkdir local/postgres
+mkdir local/postgres/pgdata
+grep -q "# docker-compose" .gitignore || echo "\n# docker-compose\n/local/\n/privatekey" >> .gitignore
+
+echo "> Build"
+docker compose down
+docker compose build
+docker compose up -d
+
+# Restart because of some problems with PG first startup
+echo "> Restart"
+docker compose down
+docker compose up -d
+
+echo "> Wait for pg startup"
+sleep 10
+
+echo "> Create databases"
+docker compose exec app rake db:create
+docker compose exec app rake db:create INSTANCE=test
+docker compose exec app rake db:migrate
+docker compose exec app rake db:migrate INSTANCE=test

data/bin/docker/privatekey

@@ -0,0 +1,17 @@
+# Note:
+#   Docker needs for ssh privatekey to fetch data from github
+#   To do that, this script creates hardlink to privatekey
+#
+# WARNING
+#   privatekey MUST NOT be protected by password
+#   If your `id_rsa` is protected by password, you need to create new key without password (for example, `id_rsa_git`)
+#   And use that key when running this script:
+#     `bin/docker-init id_rsa_git`
+
+if test "$@"
+then privatekey_name="$@"
+else privatekey_name="id_rsa"
+fi
+
+echo "> Trying to create link 'privatekey'"
+ln ~/.ssh/$privatekey_name privatekey && echo "> Created link to '~/.ssh/$privatekey_name' named 'privatekey'"

data/bin/docker/rm

@@ -0,0 +1,5 @@
+# Remove Doсker local files created by docker-init
+
+docker compose down
+rm -rf local
+rm privatekey

data/config/db.example.rb

@@ -2,8 +2,8 @@
 
 DB_CONF = {
   adapter: 'postgresql',
-  host: 'host',
-  username: 'postgres',
-  password: 'password',
-  database: 'cyclone-lariat-test'
+  host: ENV.fetch('DB_HOST', 'host'),
+  username: ENV.fetch('DB_USER', 'postgres'),
+  password: ENV.fetch('DB_PASSWORD', 'password'),
+  database: ENV.fetch('DB_NAME', 'cyclone-lariat-test')
 }.freeze

data/cyclone_lariat.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Shoryuken middleware for LunaPark based application.'
   spec.homepage      = 'https://am-team.github.io/cyclone_lariat/#/'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -36,10 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-sqs'
   spec.add_dependency 'luna_park', '~> 0.11'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'byebug', '~> 11.1'
   spec.add_development_dependency 'database_cleaner-sequel', '~> 2.0'
-  spec.add_development_dependency 'dry-validation', '~> 1.1'
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'pry', '~> 0.13'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'

data/docker-compose.yml

@@ -0,0 +1,24 @@
+version: "3.9"
+
+services:
+  app:
+    build: .
+    volumes:
+        - .:/gem
+    command: /bin/bash -c "while true; do sleep 1; done"
+    links:
+      - pg
+    environment:
+      - DB_HOST=pg
+      - DB_USER=ruby
+      - DB_PASSWORD=ruby
+    restart: always
+
+  pg:
+    image: postgres
+    volumes:
+      - ./local/postgres/pgdata:/var/lib/postgresql/data/pgdata
+    environment:
+      POSTGRES_USER: ruby
+      POSTGRES_PASSWORD: ruby
+      PGDATA: /var/lib/postgresql/data/pgdata

data/lib/cyclone_lariat/abstract/message.rb

@@ -56,11 +56,10 @@ module CycloneLariat
           publisher == other.publisher &&
           type == other.type &&
           client_error&.message == other.client_error&.message &&
-          client_error&.details == other.client_error&.details &&
           version == other.version &&
           sent_at.to_i == other.sent_at.to_i &&
-          received_at.to_i == other.received_at.to_i
-        processed_at.to_i == other.processed_at.to_i
+          received_at.to_i == other.received_at.to_i &&
+          processed_at.to_i == other.processed_at.to_i
       end
 
       def to_json(*args)

data/lib/cyclone_lariat/messages_mapper.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module CycloneLariat
+  class MessagesMapper
+    class << self
+      def from_row(row)
+        return if row.nil?
+
+        row[:data] = hash_from_json_column(row[:data])
+        row[:client_error_details] = hash_from_json_column(row[:client_error_details]) if row[:client_error_details]
+        row
+      end
+
+      def to_row(input)
+        {
+          uuid: input.uuid,
+          kind: input.kind,
+          type: input.type,
+          publisher: input.publisher,
+          data: JSON.generate(input.data),
+          client_error_message: input.client_error&.message,
+          client_error_details: JSON.generate(input.client_error&.details),
+          version: input.version,
+          sent_at: input.sent_at
+        }
+      end
+
+      private
+
+      def hash_from_json_column(data)
+        return JSON.parse(data) if data.is_a?(String)
+
+        if pg_json_extension_enabled?
+          return data.to_h             if data.is_a?(Sequel::Postgres::JSONHash)
+          return JSON.parse(data.to_s) if data.is_a?(Sequel::Postgres::JSONString)
+        end
+
+        raise ArgumentError, "Unknown type of `#{data}`"
+      end
+
+      def pg_json_extension_enabled?
+        Object.const_defined?('Sequel::Postgres::JSONHash')
+      end
+    end
+  end
+end

data/lib/cyclone_lariat/messages_repo.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'event'
+require_relative 'messages_mapper'
 
 module CycloneLariat
   class MessagesRepo
@@ -11,17 +12,7 @@ module CycloneLariat
     end
 
     def create(msg)
-      dataset.insert(
-        uuid: msg.uuid,
-        kind: msg.kind,
-        type: msg.type,
-        publisher: msg.publisher,
-        data: JSON.generate(msg.data),
-        client_error_message: msg.client_error&.message,
-        client_error_details: JSON.generate(msg.client_error&.details),
-        version: msg.version,
-        sent_at: msg.sent_at
-      )
+      dataset.insert MessagesMapper.to_row(msg)
     end
 
     def exists?(uuid:)
@@ -36,34 +27,22 @@ module CycloneLariat
     end
 
     def find(uuid:)
-      raw = dataset.where(uuid: uuid).first
-      return nil unless raw
+      row = dataset.where(uuid: uuid).first
+      return if row.nil?
 
-      raw[:data] = JSON.parse(raw[:data], symbolize_names: true)
-      if raw[:client_error_details]
-        raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-      end
-      build raw
+      build MessagesMapper.from_row(row)
     end
 
     def each_unprocessed
-      dataset.where(processed_at: nil).each do |raw|
-        raw[:data]                 = JSON.parse(raw[:data], symbolize_names: true)
-        if raw[:client_error_details]
-          raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-        end
-        msg = build raw
+      dataset.where(processed_at: nil).each do |row|
+        msg = build MessagesMapper.from_row(row)
         yield(msg)
       end
     end
 
     def each_with_client_errors
-      dataset.where { (processed_at !~ nil) & (client_error_message !~ nil) }.each do |raw|
-        raw[:data] = JSON.parse(raw[:data], symbolize_names: true)
-        if raw[:client_error_details]
-          raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-        end
-        msg = build raw
+      dataset.where { (processed_at !~ nil) & (client_error_message !~ nil) }.each do |row|
+        msg = build MessagesMapper.from_row(row)
         yield(msg)
       end
     end

data/lib/cyclone_lariat/middleware.rb

@@ -31,7 +31,7 @@ module CycloneLariat
     attr_reader :errors_notifier, :message_notifier, :events_repo
 
     def receive_message(body)
-      body[:Message] ? JSON.parse(body[:Message], symbolize_names: true ) : body
+      body[:Message] ? JSON.parse(body[:Message], symbolize_names: true) : body
     end
 
     def store_in_dataset(event)

data/lib/cyclone_lariat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CycloneLariat
-  VERSION = '0.3.2'
+  VERSION = '0.3.6'
 end

data/lib/cyclone_lariat.rb

@@ -3,6 +3,7 @@
 require_relative 'cyclone_lariat/sns_client'
 require_relative 'cyclone_lariat/errors'
 require_relative 'cyclone_lariat/event'
+require_relative 'cyclone_lariat/messages_mapper'
 require_relative 'cyclone_lariat/messages_repo'
 require_relative 'cyclone_lariat/middleware'
 require_relative 'cyclone_lariat/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyclone_lariat
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: dry-validation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -263,14 +249,20 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/docker/diff
+- bin/docker/init
+- bin/docker/privatekey
+- bin/docker/rm
 - config/db.example.rb
 - cyclone_lariat.gemspec
 - db/migrate/01_add_uuid_extensions.rb
 - db/migrate/02_add_events.rb
+- docker-compose.yml
 - docs/_imgs/diagram.png
 - docs/_imgs/lariat.jpg
 - lib/cyclone_lariat.rb
@@ -279,6 +271,7 @@ files:
 - lib/cyclone_lariat/command.rb
 - lib/cyclone_lariat/errors.rb
 - lib/cyclone_lariat/event.rb
+- lib/cyclone_lariat/messages_mapper.rb
 - lib/cyclone_lariat/messages_repo.rb
 - lib/cyclone_lariat/middleware.rb
 - lib/cyclone_lariat/sns_client.rb
@@ -298,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="