kennel 1.111.1 → 1.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22d2d6a7199c2d5b565ad42834dc9634ec81fff3eaadf0bc1e31cff307c34fa
-  data.tar.gz: 4ccfa084a8118408b8126fb125c24641741274225817d1fefb593ae69dd0f7b6
+  metadata.gz: d0daaf865eea8c23b97ab763827ecf7a7addbe7cc3f8683d9c2ec0ba2b5115d5
+  data.tar.gz: ffbffb714491fae59ef58738fb90dea0533571b1694a372cfd99269a9c74c321
 SHA512:
-  metadata.gz: ad4d3c2ea98b94a4a178c95b34b4a30ba0bfb66a96ce07f2bbbef2e184abce14a4e509062fd73894f3204f6509ef1a53c05f64d0e2b97d4e8528372b25c667d1
-  data.tar.gz: 0fd84a01af923c6b57b05ad6ad7f7577a30d695d98f1936e65e470ffb41b0b35cdbe5704b7d9526fa86291b230e2a5855ba028c04d6e51328b8f07baf0078357
+  metadata.gz: d59cbb2e220bfc906d3842618704ddd09ed1636eab7923985efd75d5631b9c8a065f5026ec74a77b4da4112190b8798675aa538a6b97a2aecf96d0c90611a532
+  data.tar.gz: 7e55958dc660217e230f5b1670c890d81619b042b181d29f68288115a4f05cf5d7aff9571aabf8937886379c30cb74188d139bbdbc9d7420e3f27c5faad939ec

data/lib/kennel/models/record.rb

@@ -8,6 +8,9 @@ module Kennel
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
         :klass, :tracking_id # added by syncer.rb
       ].freeze
+      ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
+      ALLOWED_KENNEL_ID_FULL = "[#{ALLOWED_KENNEL_ID_CHARS}]+:[#{ALLOWED_KENNEL_ID_CHARS}]+"
+      ALLOWED_KENNEL_ID_REGEX = /\A#{ALLOWED_KENNEL_ID_FULL}\z/.freeze
 
       settings :id, :kennel_id
 
@@ -25,7 +28,7 @@ module Kennel
         end
 
         def parse_tracking_id(a)
-          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (\S+:\S+)/, 1]
+          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (#{ALLOWED_KENNEL_ID_FULL})/, 1]
         end
 
         # TODO: combine with parse into a single method or a single regex
@@ -76,7 +79,9 @@ module Kennel
       def tracking_id
         @tracking_id ||= begin
           id = "#{project.kennel_id}:#{kennel_id}"
-          raise ValidationError, "#{id} kennel_id cannot include whitespace" if id.match?(/\s/) # <-> parse_tracking_id
+          unless id.match?(ALLOWED_KENNEL_ID_REGEX) # <-> parse_tracking_id
+            raise ValidationError, "#{id} must match #{ALLOWED_KENNEL_ID_REGEX}"
+          end
           id
         end
       end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.111.1"
+  VERSION = "1.112.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.111.1
+  version: 1.112.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday