Merge pull request #7 from ncbo/master

Sync: ncbo v6.4.0 release

Author: alexskr

.ruby-version

@@ -1 +1 @@
-3.0.6
+3.1.6

Gemfile

@@ -6,7 +6,7 @@ gem "activesupport"
 gem "cube-ruby", require: "cube"
 gem "rake"
 gem "uuid"
-gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
+gem 'sparql-client', github: 'ncbo/sparql-client', tag: 'v6.3.0'
 
 
 group :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/ncbo/sparql-client.git
-  revision: e89c26aa96f184dbe9b52d51e04fb3d9ba998dbc
-  branch: master
+  revision: 512edc320b43e83971835dc046b4923485e8f70e
+  tag: v6.3.0
   specs:
     sparql-client (1.0.1)
       json_pure (>= 1.4)
@@ -36,47 +36,47 @@ GEM
     base64 (0.2.0)
     builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     cube-ruby (0.0.3)
     daemons (1.4.1)
     docile (1.4.1)
     domain_name (0.6.20240107)
     eventmachine (1.2.7)
-    faraday (2.12.1)
+    faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.8.2)
+    json (2.10.1)
     json_pure (2.8.1)
-    logger (1.6.1)
+    logger (1.6.6)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     method_source (1.1.0)
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2025.0304)
     minitest (4.7.5)
     multi_json (1.15.0)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    net-http (0.5.0)
+    net-http (0.6.0)
       uri
     net-http-persistent (2.9.4)
     netrc (0.11.0)
-    pry (0.14.2)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.1)
-    rack (2.2.10)
+    public_suffix (6.0.2)
+    rack (2.2.12)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-post-body-to-params (0.1.8)
@@ -87,9 +87,9 @@ GEM
     rake (13.2.1)
     rdf (1.0.8)
       addressable (>= 2.2)
-    redis (5.3.0)
+    redis (5.4.0)
       redis-client (>= 0.22.0)
-    redis-client (0.22.2)
+    redis-client (0.24.0)
       connection_pool
     request_store (1.7.0)
       rack (>= 1.4)
@@ -98,7 +98,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.9)
+    rexml (3.4.1)
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
@@ -123,9 +123,9 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tilt (2.4.0)
+    tilt (2.6.0)
     tzinfo (0.3.62)
-    uri (1.0.2)
+    uri (1.0.3)
     uuid (2.3.9)
       macaddr (~> 1.0)
 
@@ -153,4 +153,4 @@ DEPENDENCIES
   uuid
 
 BUNDLED WITH
-   2.5.20
+   2.3.27

lib/goo/validators/enforce.rb

@@ -26,13 +26,13 @@ def enforce(inst,attr,value)
             when :existence
               check Goo::Validators::Existence, inst, attr, value, opt
             when :list, Array
-              check Goo::Validators::DataType, inst, attr, value,opt, Array
+              check Goo::Validators::DataType, inst, attr, value, opt, Array
             when :uri, RDF::URI
-              check Goo::Validators::DataType, inst, attr, value,opt, RDF::URI
+              check Goo::Validators::DataType, inst, attr, value, opt, RDF::URI
             when :string, String
-              check Goo::Validators::DataType, inst, attr, value,opt, String
+              check Goo::Validators::DataType, inst, attr, value, opt, String
             when :integer, Integer
-              check Goo::Validators::DataType, inst, attr, value,opt, Integer
+              check Goo::Validators::DataType, inst, attr, value, opt, Integer
             when :boolean
               check Goo::Validators::DataType, inst, attr, value, opt,:boolean
             when :date_time, DateTime
@@ -43,6 +43,8 @@ def enforce(inst,attr,value)
               check Goo::Validators::Symmetric, inst, attr, value, opt
             when :email
               check Goo::Validators::Email, inst, attr, value, opt
+            when :username
+              check Goo::Validators::Username, inst, attr, value, opt
             when /^distinct_of_/
               check Goo::Validators::DistinctOf, inst, attr, value, opt, opt
             when /^superior_equal_to_/
@@ -54,6 +56,8 @@ def enforce(inst,attr,value)
             when /^max_/, /^min_/
               type = opt.to_s.index("max_") ? :max : :min
               check Goo::Validators::ValueRange, inst, attr, value, type, opt.to_s
+            when /^safe_text/
+              check Goo::Validators::SafeText, inst, attr, value, opt, opt.to_s
             else
               if object_type?(opt)
                 check_object_type inst, attr, value, opt

lib/goo/validators/implementations/email.rb

@@ -2,21 +2,48 @@ module Goo
   module Validators
     class Email < ValidatorBase
       include Validator
-      EMAIL_REGEXP = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
+      # Matches reasonably valid emails (no double dots, no leading/trailing dots or hyphens, valid domain)
+      EMAIL_REGEXP = /\A
+      [a-z0-9!#$%&'*+\/=?^_`{|}~-]+             # local part
+      (?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*       # dot-separated continuation in local
+      @
+      (?:(?!-)[a-z0-9-]{1,63}(?<!-)\.)+          # domain labels
+      [a-z]{2,}                                  # top-level domain (at least 2 chars)
+      \z/ix      
+
+      MIN_LENGTH = 6       # Smallest valid email: a@b.cd
+      MAX_LENGTH = 254     # RFC 5321 limits email length to 254 characters 
+      LOCAL_PART_MAX = 64  # Per RFC
+      DOMAIN_PART_MAX = 253
+      
       key :email
 
       error_message ->(obj) {
         if @value.kind_of? Array
-          return "All values in attribute `#{@attr}` must be a valid emails"
+          return "All values in attribute `#{@attr}` must be valid email addresses"
         else
-          return "Attribute `#{@attr}` with the value `#{@value}` must be a valid email"
-
+          return "Attribute `#{@attr}` with the value `#{@value}` must be a valid email address"
         end
       }
 
-      validity_check -> (obj) do
-        @value.nil? || @value.match?(EMAIL_REGEXP)
+      private
+
+      validity_check ->(obj) do
+        return true if @value.nil?
+
+        values = @value.is_a?(Array) ? @value : [@value]
+
+        values.all? do |email|
+          next false unless email.is_a?(String)
+          next false unless email.length.between?(MIN_LENGTH, MAX_LENGTH)
+
+          local, domain = email.split('@', 2)
+          next false if local.nil? || domain.nil?
+          next false if local.length > LOCAL_PART_MAX || domain.length > DOMAIN_PART_MAX
+
+          email.match?(EMAIL_REGEXP)
+        end
       end
     end
   end
-end
+end 

lib/goo/validators/implementations/safe_text.rb

@@ -0,0 +1,54 @@
+module Goo
+  module Validators
+    class SafeText < ValidatorBase
+      include Validator
+
+      SAFE_TEXT_REGEX = /\A[\p{L}\p{N} .,'\-@()&!$%\/\[\]:;*+=?#^_{}|~"]+\z/u.freeze
+      DISALLOWED_UNICODE = /[\u0000-\u001F\u007F\u00A0\u200B-\u200F\u2028-\u202F\u202E\u2066-\u2069]/u.freeze
+
+      key :safe_text
+
+      error_message ->(obj) {
+        # Truncate long string values for clarity
+        truncated_value = if @value.is_a?(String) && @value.length > 60
+                            "#{@value[0...57]}..."
+                          else
+                            @value
+                          end
+
+        prefix = if @value.is_a?(Array)
+                   "All values in attribute `#{@attr}`"
+                 else
+                   "Attribute `#{@attr}` with the value `#{truncated_value}`"
+                 end
+
+        suffix = "must be safe text (no control or invisible Unicode characters, newlines, or disallowed punctuation)"
+        length_note = @max_length ? " and must not exceed #{@max_length} characters" : ""
+
+        "#{prefix} #{suffix}#{length_note}"
+      }
+
+      validity_check ->(obj) do
+        return true if @value.nil?
+
+        Array(@value).all? do |val|
+          next false unless val.is_a?(String)
+
+          length_ok = @max_length.nil? || val.length <= @max_length
+          length_ok &&
+            val !~ /\R/ &&
+            val =~ SAFE_TEXT_REGEX &&
+            val !~ DISALLOWED_UNICODE
+        end
+      end
+
+      def initialize(inst, attr, value, opt)
+        @max_length = nil
+        super(inst, attr, value)
+        match = opt.match(/_(\d+)$/)
+        @max_length = match[1].to_i if match && match[1]
+      end
+
+    end
+  end
+end

lib/goo/validators/implementations/username.rb

@@ -0,0 +1,45 @@
+module Goo
+  module Validators
+    class Username < ValidatorBase
+      include Validator
+
+      RESERVED_NAMES = %w[
+        admin administrator root support system test guest owner user
+        webmaster help contact host mail ftp info api noc security
+      ].freeze
+
+      USERNAME_LENGTH_RANGE = (3..32).freeze
+
+      ASCII_ONLY_REGEX = /\A[\x20-\x7E]+\z/
+      USERNAME_PATTERN = /\A[a-zA-Z](?!.*[._]{2})[a-zA-Z0-9._]{1,30}[a-zA-Z0-9]\z/
+      INVISIBLE_CHARS = /[\u200B-\u200D\uFEFF]/
+
+      key :username
+
+      error_message ->(obj) {
+        base_msg = if @value.is_a?(Array)
+                     "All values in attribute `#{@attr}` must be valid usernames"
+                   else
+                     "Attribute `#{@attr}` with the value `#{@value}` must be a valid username"
+                   end
+        "#{base_msg} (must be 3–32 chars, start with a letter, contain only ASCII letters/digits/dots/underscores, no invisible or reserved terms)"
+      }
+
+      validity_check ->(obj) do
+        return true if @value.nil?
+
+        Array(@value).all? do |username|
+          next false unless username.is_a?(String)
+
+          username = username.strip
+
+          USERNAME_LENGTH_RANGE.cover?(username.length) &&
+            username.match?(ASCII_ONLY_REGEX) &&
+            username.match?(USERNAME_PATTERN) &&
+            !username.match?(INVISIBLE_CHARS) &&
+            !RESERVED_NAMES.include?(username.downcase)
+        end
+      end
+    end
+  end
+end