cyclone_lariat 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29f194e1ee444b5621fee3ad9be7547ad612c34acf8cf451d5be0f20976cc4e
-  data.tar.gz: efdedb4530a004672b9c671c02b899fddedaa1d45b9876d28bce672f86f88812
+  metadata.gz: faa3648b8b458ed7430a3c42e24c883e24b4cce473a298fb453ec64a0471c1fd
+  data.tar.gz: 4c02a08f6f20a8c1ef3c43b1c86f953005eff6a1d7acc35d55fdaa66a3e852a6
 SHA512:
-  metadata.gz: 4c784a8c6ec54fef60a529a09d6a45f9dd32bab493e2acabdabed7e2039e743cb547e132a38522ee1b8473a1e2f21644b8d7a25d8bd1daca498e2bef5cd390ee
-  data.tar.gz: 85628b6886b4a82b639aa0f271b199e9cd85db4cbb316d4621637ca062ad996892f8c171ad32367a64f213b1ebcdd5e495e6f7cdb00f518923e87ecfe41a2610
+  metadata.gz: d3c140159b9bfe436de388f6e471f30131bc37d12cc8e8ab37be43657a4c840959d2795ae533521aba73a7b4d518170294f55c46f8693ee026888c0fd971ffc6
+  data.tar.gz: ba1c7d426dc58f5bff1d3e7ee4768f7b5de09e76f244825c1a20338012e83c6eb656f5139a1852dcab23c6a241081b295c029e87565c2539077f2c26e3039877

data/.github/workflows/gem-push.yml

@@ -0,0 +1,45 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/CHANGELOG.md

@@ -4,7 +4,12 @@ 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.2.0] - 2021-06-2
+## [0.2.2] - 2021-06-2
+Changed
+- Fix save to database 
+- Rename error to client error 
+
+## [0.2.1] - 2021-06-2
 Changed
 - Fix can load from database if error_details is nil
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyclone_lariat (0.2.1)
+    cyclone_lariat (0.2.2)
       aws-sdk-sns
       luna_park (~> 0.11)
 

data/README.md

@@ -2,7 +2,7 @@
 
 This is gem work like middleware for [shoryuken](https://github.com/ruby-shoryuken/shoryuken). It save all events to database. And catch and produce all exceptions.  
 
-![Luna Park](docs/_imgs/lariat.jpg)
+![Cyclone lariat](docs/_imgs/lariat.jpg)
 
 
 ```ruby
@@ -15,6 +15,10 @@ gem 'cyclone_lariat', require: false
 gem 'cyclone_lariat'
 ```
 
+## Logic
+
+![diagram](docs/_imgs/diagram.png)
+
 
 ## Client
 
@@ -142,16 +146,34 @@ Sequel.migration do
   change do
     create_table :events do
       column   :uuid, :uuid, primary_key: true
-      String   :type,                     null: false
-      Integer  :version,                  null: false
-      String   :publisher,                null: false
-      column   :data, :json,              null: false
-      String   :error_message,            null: true,  default: nil
-      column   :error_details, :json,     null: true,  default: nil
-      DateTime :sent_at,                  null: true,  default: nil
-      DateTime :received_at,              null: false, default: Sequel::CURRENT_TIMESTAMP
-      DateTime :processed_at,             null: true,  default: nil
+      String   :type,                         null: false
+      Integer  :version,                      null: false
+      String   :publisher,                    null: false
+      column   :data, :json,                  null: false
+      String   :client_error_message,         null: true,  default: nil
+      column   :client_error_details, :json,  null: true,  default: nil
+      DateTime :sent_at,                      null: true,  default: nil
+      DateTime :received_at,                  null: false, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :processed_at,                 null: true,  default: nil
     end
   end
 end
 ```
+
+### Rake tasks
+
+For simplify write some Rake tasks you can use CycloneLariat::Repo.
+
+```ruby
+# For retry all unprocessed
+
+CycloneLariat.new(DB[:events]).each_unprocessed do |event|
+  # Your logic here
+end
+
+# For retry all events with client errors
+
+CycloneLariat.new(DB[:events]).each_with_client_errors do |event|
+  # Your logic here
+end
+```

data/cyclone_lariat.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   # 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.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    # spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
       'public gem pushes.'

data/db/migrate/02_add_events.rb

@@ -4,15 +4,15 @@ Sequel.migration do
   change do
     create_table :events do
       column   :uuid, :uuid, primary_key: true
-      String   :type,                     null: false
-      Integer  :version,                  null: false
-      String   :publisher,                null: false
-      column   :data, :json,              null: false
-      String   :error_message,            null: true,  default: nil
-      column   :error_details, :json,     null: true,  default: nil
-      DateTime :sent_at,                  null: true,  default: nil
-      DateTime :received_at,              null: false, default: Sequel::CURRENT_TIMESTAMP
-      DateTime :processed_at,             null: true,  default: nil
+      String   :type,                        null: false
+      Integer  :version,                     null: false
+      String   :publisher,                   null: false
+      column   :data, :json,                 null: false
+      String   :client_error_message,        null: true,  default: nil
+      column   :client_error_details, :json, null: true,  default: nil
+      DateTime :sent_at,                     null: true,  default: nil
+      DateTime :received_at,                 null: false, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :processed_at,                null: true,  default: nil
     end
   end
 end

data/lib/cyclone_lariat/errors.rb

@@ -9,7 +9,7 @@ module CycloneLariat
       message { |d| "Could not found topic: `#{d[:expected_topic]}`" }
     end
 
-    class ProcessingEventLogic < LunaPark::Errors::Business
+    class ClientError < LunaPark::Errors::Business
       attr_writer :message, :details
 
       def ==(other)

data/lib/cyclone_lariat/event.rb

@@ -10,7 +10,7 @@ module CycloneLariat
     attr :uuid,      String, :new
     attr :publisher, String, :new
     attr :type,      String, :new
-    attr :error
+    attr :client_error
     attr :version
     attr :data
 
@@ -38,14 +38,18 @@ module CycloneLariat
       @processed_at = wrap_time(value)
     end
 
-    def error_message=(txt)
-      @error ||= Errors::ProcessingEventLogic.new
-      @error.message = txt
+    def client_error_message=(txt)
+      return unless txt
+
+      @client_error ||= Errors::ClientError.new
+      @client_error.message = txt
     end
 
-    def error_details=(details)
-      @error ||= Errors::ProcessingEventLogic.new
-      @error.details = details
+    def client_error_details=(details)
+      return unless details
+
+      @client_error ||= Errors::ClientError.new
+      @client_error.details = details
     end
 
     def ==(other)
@@ -53,8 +57,8 @@ module CycloneLariat
         uuid == other.uuid &&
         publisher == other.publisher &&
         type == other.type &&
-        error&.message == other.error&.message &&
-        error&.details == other.error&.details &&
+        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

data/lib/cyclone_lariat/events_repo.rb

@@ -16,8 +16,8 @@ module CycloneLariat
         type: event.type,
         publisher: event.publisher,
         data: JSON.generate(event.data),
-        error_message: event.error&.message,
-        error_details: JSON.generate(event.error&.details),
+        client_error_message: event.client_error&.message,
+        client_error_details: JSON.generate(event.client_error&.details),
         version: event.version,
         sent_at: event.sent_at
       )
@@ -27,21 +27,36 @@ module CycloneLariat
       dataset.where(uuid: uuid).limit(1).any?
     end
 
-    def processed!(uuid:)
-      !dataset.where(uuid: uuid).update(processed_at: Sequel.function(:NOW)).zero?
+    def processed!(uuid:, error: nil)
+      data = { processed_at: Sequel.function(:NOW) }
+      data.merge!(
+        client_error_message: error&.message,
+        client_error_details: JSON.generate(error&.details),
+      ) if error
+
+      !dataset.where(uuid: uuid).update(data).zero?
     end
 
     def find(uuid:)
       raw = dataset.where(uuid: uuid).first
-      raw[:data]          = JSON.parse(raw[:data], symbolize_names: true)
-      raw[:error_details] = JSON.parse(raw[:error_details], symbolize_names: true) if raw[:error_details]
+      raw[:data]                 = JSON.parse(raw[:data], symbolize_names: true)
+      raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true) if raw[:client_error_details]
       Event.wrap raw
     end
 
     def each_unprocessed
       dataset.where(processed_at: nil).each do |raw|
-        raw[:data]          = JSON.parse(raw[:data], symbolize_names: true)
-        raw[:error_details] = JSON.parse(raw[:error_details], symbolize_names: true) if raw[:error_details]
+        raw[:data]                 = JSON.parse(raw[:data], symbolize_names: true)
+        raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true) if raw[:client_error_details]
+        event = Event.wrap(raw)
+        yield(event)
+      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)
+        raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true) if raw[:client_error_details]
         event = Event.wrap(raw)
         yield(event)
       end

data/lib/cyclone_lariat/middleware.rb

@@ -38,13 +38,14 @@ module CycloneLariat
 
       events_repo.create(event)
       yield
-      events_repo.processed! uuid: event.uuid
+      events_repo.processed! uuid: event.uuid, error: event.client_error
     end
 
     def catch_business_error(event)
       yield
     rescue LunaPark::Errors::Business => e
-      errors_notifier&.warning(e, event: event)
+      errors_notifier&.error(e, event: event)
+      event.client_error = e
     end
 
     def catch_standard_error(queue, body)

data/lib/cyclone_lariat/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cyclone_lariat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexander Kudrin
 - Philip Sorokin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -235,13 +235,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description:
+description: 
 email:
 - kudrin.alexander@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -253,10 +254,10 @@ files:
 - README.md
 - Rakefile
 - config/db.example.rb
-- config/db.rb
 - cyclone_lariat.gemspec
 - db/migrate/01_add_uuid_extensions.rb
 - db/migrate/02_add_events.rb
+- docs/_imgs/diagram.png
 - docs/_imgs/lariat.jpg
 - lib/cyclone_lariat.rb
 - lib/cyclone_lariat/client.rb
@@ -270,9 +271,8 @@ homepage: https://am-team.github.io/cyclone_lariat/#/
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
   yard.run: yri
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -287,8 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Shoryuken middleware for LunaPark based application.
 test_files: []

data/config/db.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-DB_CONF = {
-  adapter: 'postgresql',
-  host: 'localhost',
-  username: 'ruby',
-  password: 'ruby',
-  database: 'cyclone-lariat-test'
-}.freeze