kennel 1.111.1 → 1.112.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kennel/models/record.rb +7 -2
- data/lib/kennel/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d0daaf865eea8c23b97ab763827ecf7a7addbe7cc3f8683d9c2ec0ba2b5115d5
|
4
|
+
data.tar.gz: ffbffb714491fae59ef58738fb90dea0533571b1694a372cfd99269a9c74c321
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d59cbb2e220bfc906d3842618704ddd09ed1636eab7923985efd75d5631b9c8a065f5026ec74a77b4da4112190b8798675aa538a6b97a2aecf96d0c90611a532
|
7
|
+
data.tar.gz: 7e55958dc660217e230f5b1670c890d81619b042b181d29f68288115a4f05cf5d7aff9571aabf8937886379c30cb74188d139bbdbc9d7420e3f27c5faad939ec
|
data/lib/kennel/models/record.rb
CHANGED
@@ -8,6 +8,9 @@ module Kennel
|
|
8
8
|
:deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
|
9
9
|
:klass, :tracking_id # added by syncer.rb
|
10
10
|
].freeze
|
11
|
+
ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
|
12
|
+
ALLOWED_KENNEL_ID_FULL = "[#{ALLOWED_KENNEL_ID_CHARS}]+:[#{ALLOWED_KENNEL_ID_CHARS}]+"
|
13
|
+
ALLOWED_KENNEL_ID_REGEX = /\A#{ALLOWED_KENNEL_ID_FULL}\z/.freeze
|
11
14
|
|
12
15
|
settings :id, :kennel_id
|
13
16
|
|
@@ -25,7 +28,7 @@ module Kennel
|
|
25
28
|
end
|
26
29
|
|
27
30
|
def parse_tracking_id(a)
|
28
|
-
a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (
|
31
|
+
a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (#{ALLOWED_KENNEL_ID_FULL})/, 1]
|
29
32
|
end
|
30
33
|
|
31
34
|
# TODO: combine with parse into a single method or a single regex
|
@@ -76,7 +79,9 @@ module Kennel
|
|
76
79
|
def tracking_id
|
77
80
|
@tracking_id ||= begin
|
78
81
|
id = "#{project.kennel_id}:#{kennel_id}"
|
79
|
-
|
82
|
+
unless id.match?(ALLOWED_KENNEL_ID_REGEX) # <-> parse_tracking_id
|
83
|
+
raise ValidationError, "#{id} must match #{ALLOWED_KENNEL_ID_REGEX}"
|
84
|
+
end
|
80
85
|
id
|
81
86
|
end
|
82
87
|
end
|
data/lib/kennel/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kennel
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.112.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Grosser
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-04-
|
11
|
+
date: 2022-04-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|