bbk-app 1.1.3.335065 → 1.1.4.345332

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +43 -24
  3. data/lib/bbk/app/dispatcher.rb +13 -3
  4. data/lib/bbk/app/version.rb +1 -1
  5. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6cdea79b7c72b3ee5dda38ac8d1091453efc32ca5b02609947aa8410935c08e2
4
- data.tar.gz: 90b2a70fbe5e4e9d8327b2a3c99b27547bbbcbf240ef800101f3364afdeb56c6
3
+ metadata.gz: 87931a48d5e917751e4c6508de253145f7a69573921dd7d6da8bcf5ebe31b015
4
+ data.tar.gz: b874ebd5c2c98aaf7d081bb3f40f00607c2dfe9e518e355e15992c381a1e6308
5
5
  SHA512:
6
- metadata.gz: 0ae86e986da874fb89cbf2dee340ddc3b79e0565e35bb0d9c02d3b4fb06ec1632ab5c94df0063c9339f2b672cf857ddadf75fab5331febd44ea5de394a162998
7
- data.tar.gz: def70137bdcbf862088d2a9907b0dc38560b5bc4b2c8762c6e74703c25bc7e22ea79f365d466e26f78c15b3fbcd7a3f56dee113a80e2d31f42810bb0ce492fce
6
+ metadata.gz: 9b78c371aca7a1d4319b9180e4050a842093e2529f385e33757a3e62b13bf00921bb198cf1cf0f65b48228a68dbd514e6254d716c351e0a199bfaa40023393cd
7
+ data.tar.gz: f780738ccae53c5602e28682c381fdbdbf44b38d75d366d90d7f093a19739a6f951d29788e6b87e1cdcc8c3f9b8163fb7662427892116c72af9b1cd2ce760748
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- bbk-app (1.1.3.335065)
5
- activesupport (>= 6.0)
4
+ bbk-app (1.1.4)
5
+ activesupport (~> 7.1)
6
6
  bbk-utils (> 1.0.1)
7
7
  oj
8
8
  timeouter
@@ -10,17 +10,24 @@ PATH
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- activemodel (6.1.4.4)
14
- activesupport (= 6.1.4.4)
15
- activerecord (6.1.4.4)
16
- activemodel (= 6.1.4.4)
17
- activesupport (= 6.1.4.4)
18
- activesupport (6.1.4.4)
19
- concurrent-ruby (~> 1.0, >= 1.0.2)
13
+ activemodel (7.2.3)
14
+ activesupport (= 7.2.3)
15
+ activerecord (7.2.3)
16
+ activemodel (= 7.2.3)
17
+ activesupport (= 7.2.3)
18
+ timeout (>= 0.4.0)
19
+ activesupport (7.2.3)
20
+ base64
21
+ benchmark (>= 0.3)
22
+ bigdecimal
23
+ concurrent-ruby (~> 1.0, >= 1.3.1)
24
+ connection_pool (>= 2.2.5)
25
+ drb
20
26
  i18n (>= 1.6, < 2)
27
+ logger (>= 1.4.2)
21
28
  minitest (>= 5.1)
22
- tzinfo (~> 2.0)
23
- zeitwerk (~> 2.3)
29
+ securerandom (>= 0.3)
30
+ tzinfo (~> 2.0, >= 2.0.5)
24
31
  addressable (2.8.0)
25
32
  public_suffix (>= 2.0.2, < 5.0)
26
33
  amq-protocol (2.3.2)
@@ -30,9 +37,11 @@ GEM
30
37
  descendants_tracker (~> 0.0.4)
31
38
  ice_nine (~> 0.11.0)
32
39
  thread_safe (~> 0.3, >= 0.3.1)
40
+ base64 (0.3.0)
33
41
  bbk-utils (1.0.1.147183)
34
42
  activesupport (>= 6.0)
35
43
  russian
44
+ benchmark (0.5.0)
36
45
  bigdecimal (3.3.1)
37
46
  bunny (2.19.0)
38
47
  amq-protocol (~> 2.3, >= 2.3.1)
@@ -42,12 +51,19 @@ GEM
42
51
  byebug (11.1.3)
43
52
  coercible (1.0.0)
44
53
  descendants_tracker (~> 0.0.1)
45
- concurrent-ruby (1.1.9)
46
- database_cleaner (1.99.0)
54
+ concurrent-ruby (1.3.5)
55
+ connection_pool (3.0.1)
56
+ database_cleaner (2.1.0)
57
+ database_cleaner-active_record (>= 2, < 3)
58
+ database_cleaner-active_record (2.2.2)
59
+ activerecord (>= 5.a)
60
+ database_cleaner-core (~> 2.0)
61
+ database_cleaner-core (2.0.1)
47
62
  descendants_tracker (0.0.4)
48
63
  thread_safe (~> 0.3, >= 0.3.1)
49
64
  diff-lcs (1.5.0)
50
65
  docile (1.4.0)
66
+ drb (2.2.3)
51
67
  equalizer (0.0.11)
52
68
  erubis (2.7.0)
53
69
  faker (2.19.0)
@@ -61,15 +77,16 @@ GEM
61
77
  path_expander (~> 1.0)
62
78
  ruby_parser (~> 3.1, > 3.1.0)
63
79
  sexp_processor (~> 4.8)
64
- i18n (1.8.11)
80
+ i18n (1.14.7)
65
81
  concurrent-ruby (~> 1.0)
66
82
  ice_nine (0.11.2)
67
83
  kwalify (0.7.2)
68
84
  launchy (2.5.0)
69
85
  addressable (~> 2.7)
70
- mini_portile2 (2.8.8)
71
- minitest (5.15.0)
72
- oj (3.16.12)
86
+ logger (1.7.0)
87
+ mini_portile2 (2.8.9)
88
+ minitest (5.26.2)
89
+ oj (3.16.13)
73
90
  bigdecimal (>= 3.0)
74
91
  ostruct (>= 0.2)
75
92
  ostruct (0.6.3)
@@ -129,6 +146,7 @@ GEM
129
146
  virtus (~> 1.0)
130
147
  russian (0.6.0)
131
148
  i18n (>= 0.5.0)
149
+ securerandom (0.4.1)
132
150
  set (1.1.0)
133
151
  sexp_processor (4.16.0)
134
152
  simplecov (0.21.2)
@@ -144,15 +162,17 @@ GEM
144
162
  sorted_set (1.0.3)
145
163
  rbtree
146
164
  set (~> 1.0)
147
- sqlite3 (1.7.3)
165
+ sqlite3 (2.0.4)
148
166
  mini_portile2 (~> 2.8.0)
149
- sqlite3 (1.7.3-x86_64-linux)
167
+ sqlite3 (2.0.4-x86_64-linux-gnu)
168
+ sqlite3 (2.0.4-x86_64-linux-musl)
150
169
  terminal-table (3.0.2)
151
170
  unicode-display_width (>= 1.1.1, < 3)
152
171
  thread_safe (0.3.6)
172
+ timeout (0.4.4)
153
173
  timeouter (0.1.3.38794)
154
174
  tty-which (0.4.2)
155
- tzinfo (2.0.4)
175
+ tzinfo (2.0.6)
156
176
  concurrent-ruby (~> 1.0)
157
177
  unicode-display_width (2.1.0)
158
178
  virtus (1.0.5)
@@ -160,7 +180,6 @@ GEM
160
180
  coercible (~> 1.0)
161
181
  descendants_tracker (~> 0.0, >= 0.0.3)
162
182
  equalizer (~> 0.0, >= 0.0.9)
163
- zeitwerk (2.5.3)
164
183
 
165
184
  PLATFORMS
166
185
  ruby
@@ -168,12 +187,12 @@ PLATFORMS
168
187
  x86_64-linux-musl
169
188
 
170
189
  DEPENDENCIES
171
- activerecord (~> 6.0)
190
+ activerecord (~> 7.1)
172
191
  bbk-app!
173
192
  bundler (~> 2.0)
174
193
  bunny-mock (~> 1.7.0)
175
194
  byebug
176
- database_cleaner (~> 1.7)
195
+ database_cleaner (~> 2.1.0)
177
196
  faker (~> 2)
178
197
  rake (~> 12.0)
179
198
  rspec (~> 3.0)
@@ -182,7 +201,7 @@ DEPENDENCIES
182
201
  rubycritic
183
202
  simplecov
184
203
  simplecov-console
185
- sqlite3 (~> 1.4)
204
+ sqlite3 (~> 2.0.0)
186
205
 
187
206
  BUNDLED WITH
188
207
  2.2.33
data/lib/bbk/app/dispatcher.rb CHANGED
@@ -89,8 +89,9 @@ module BBK
89
89
  # 2. остановить прием новых сообщений - @stream.close
90
90
  # 3. дождаться обработки всего в очереди или таймаут
91
91
  # 4. остановить потоки
92
- # 5. остановить паблишеры
93
- def close(_timeout = 5)
92
+ # 5. остановить middlewares если они имеют метод stop
93
+ # 6. остановить паблишеры
94
+ def close(timeout = 5)
94
95
  ActiveSupport::Notifications.instrument 'dispatcher.close', dispatcher: self
95
96
  consumers.each do |cons|
96
97
  begin
@@ -101,7 +102,7 @@ module BBK
101
102
  end
102
103
  end
103
104
 
104
- @stream_strategy&.stop(5)
105
+ @stream_strategy&.stop(timeout)
105
106
 
106
107
  consumers.each do |cons|
107
108
  begin
@@ -112,6 +113,15 @@ module BBK
112
113
  end
113
114
  end
114
115
 
116
+ # останавливаем middlewares
117
+ middlewares.each do |m|
118
+ next unless m.respond_to?(:stop)
119
+ m.stop
120
+ rescue StandardError => e
121
+ logger.error "Middlware #{m} stop error: #{e}"
122
+ logger.debug e.backtrace
123
+ end
124
+
115
125
  publishers.each do |pub|
116
126
  begin
117
127
  pub.close
data/lib/bbk/app/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module BBK
2
2
  module App
3
3
 
4
- VERSION = '1.1.3'
4
+ VERSION = '1.1.4'.freeze
5
5
 
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bbk-app
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3.335065
4
+ version: 1.1.4.345332
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samoilenko Yuri
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-10-31 00:00:00.000000000 Z
11
+ date: 2025-12-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -70,14 +70,14 @@ dependencies:
70
70
  name: activerecord
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '6.0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '6.0'
83
83
  - !ruby/object:Gem::Dependency
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '1.7'
117
+ version: 2.1.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '1.7'
124
+ version: 2.1.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: faker
127
127
  requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: '1.4'
173
+ version: 2.0.0
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: '1.4'
180
+ version: 2.0.0
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: byebug
183
183
  requirement: !ruby/object:Gem::Requirement