kdl 1.0.6 → 2.0.1

data/lib/kdl/types/base64.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module KDL
   module Types
-    class Base64 < Value
+    class Base64 < Value::Custom
       RGX = /^[A-Za-z0-9+\/=]+$/.freeze
 
       def self.call(value, type = 'base64')

data/lib/kdl/types/country/iso3166_countries.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class Country < Value
+    class Country < Value::Custom
       # From: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
       COUNTRIES3 = {
         'AFG' => { alpha3: 'AFG', alpha2: 'AF', numeric_code: 4, name: 'Afghanistan' }.freeze,

data/lib/kdl/types/country/iso3166_subdivisions.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class CountrySubdivision < Value
+    class CountrySubdivision < Value::Custom
       # From: https://en.wikipedia.org/wiki/ISO_3166-2#Current_codes
       COUNTRY_SUBDIVISIONS = {
         "AD" => {

data/lib/kdl/types/country.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'kdl/types/country/iso3166_countries'
 require 'kdl/types/country/iso3166_subdivisions'
 
 module KDL
   module Types
-    class Country < Value
+    class Country < Value::Custom
       attr_reader :name, :alpha2, :alpha3, :numeric_code
 
       def initialize(value, format: nil, type: 'country-3')
@@ -42,7 +44,7 @@ module KDL
     end
     MAPPING['country-2'] = Country2
 
-    class CountrySubdivision < Value
+    class CountrySubdivision < Value::Custom
       attr_reader :country, :name
 
       def initialize(value, type: 'country-subdivision', country:, name:, **kwargs)

data/lib/kdl/types/currency/iso4217_currencies.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class Currency < Value
+    class Currency < Value::Custom
       # From https://en.wikipedia.org/wiki/ISO_4217#Active_codes
       CURRENCIES = {
         'AED' => { numeric_code: 784, minor_unit: 2, name: 'United Arab Emirates dirham' }.freeze,

data/lib/kdl/types/currency.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'kdl/types/currency/iso4217_currencies'
 
 module KDL
   module Types
-    class Currency < Value
+    class Currency < Value::Custom
       attr_reader :numeric_code, :minor_unit, :name
 
       def initialize(value, format: nil, type: 'currency')

data/lib/kdl/types/date_time.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module KDL
   module Types
-    class DateTime < Value
+    class DateTime < Value::Custom
       def self.call(value, type = 'date-time')
         return nil unless value.is_a? ::KDL::Value::String
 
@@ -12,7 +14,7 @@ module KDL
     end
     MAPPING['date-time'] = DateTime
 
-    class Time < Value
+    class Time < Value::Custom
       # TODO: this is not a perfect ISO8601 time string
       REGEX = /^T?((?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9](?:\.[0-9]+)?(?:Z|[+-]\d\d:\d\d)?)$/
 
@@ -28,7 +30,7 @@ module KDL
     end
     MAPPING['time'] = Time
 
-    class Date < Value
+    class Date < Value::Custom
       def self.call(value, type = 'date')
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/decimal.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class Decimal < Value
+    class Decimal < Value::Custom
       def self.call(value, type = 'decimal')
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/duration/iso8601_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Shamelessly borrowed from https://github.com/rails/rails/tree/main/activesupport
 #
 # Copyright (c) 2005-2021 David Heinemeier Hansson
@@ -25,7 +27,7 @@ require 'strscan'
 
 module KDL
   module Types
-    class Duration < Value
+    class Duration < Value::Custom
       # Parses a string formatted according to ISO 8601 Duration into the hash.
       #
       # See {ISO 8601}[https://en.wikipedia.org/wiki/ISO_8601#Durations] for more information.

data/lib/kdl/types/duration.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'kdl/types/duration/iso8601_parser'
 
 module KDL
   module Types
-    class Duration < Value
+    class Duration < Value::Custom
       attr_reader :years, :months, :weeks, :days, :hours, :minutes, :seconds
 
       def initialize(parts = {}, format: nil, type: 'duration')

data/lib/kdl/types/email/parser.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative '../hostname/validator'
 
 module KDL
   module Types
-    class Email < Value
+    class Email < Value::Custom
       class Parser
         def initialize(string, idn: false)
           @string = string
@@ -11,7 +13,7 @@ module KDL
         end
 
         def parse
-          local = ''
+          local = +''
           unicode_domain = nil
           domain = nil
           context = :start
@@ -23,7 +25,7 @@ module KDL
             when :part
               case context
               when :start, :after_dot
-                local += value
+                local << value
                 context = :after_part
               else
                 raise ArgumentError, "invalid email #{@string} (unexpected part #{value} at #{context})"
@@ -31,7 +33,7 @@ module KDL
             when :dot
               case context
               when :after_part
-                local += value
+                local << value
                 context = :after_dot
               else
                 raise ArgumentError, "invalid email #{@string} (unexpected dot at #{context})"
@@ -91,7 +93,7 @@ module KDL
             end
           end
           @context = nil
-          @buffer = ''
+          @buffer = +''
           loop do
             c = @string[@index]
             return [:end, nil] if c.nil?
@@ -111,7 +113,7 @@ module KDL
                 @index += 1
               when local_part_chars
                 @context = :part
-                @buffer += c
+                @buffer << c
                 @index += 1
               else
                 raise ArgumentError, "invalid email #{@string} (unexpected #{c})"
@@ -119,7 +121,7 @@ module KDL
             when :part
               case c
               when local_part_chars
-                @buffer += c
+                @buffer << c
                 @index += 1
               when '.', '@'
                 return [:part, @buffer]
@@ -135,7 +137,7 @@ module KDL
                 @index += 1
                 return [:part, @buffer]
               else
-                @buffer += c
+                @buffer << c
                 @index += 1
               end
             end

data/lib/kdl/types/email.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative './email/parser'
 
 module KDL
   module Types
-    class Email < Value
+    class Email < Value::Custom
       attr_reader :local, :domain
 
       def initialize(value, local:, domain:, **kwargs)

data/lib/kdl/types/hostname/validator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'simpleidn'
 
 module KDL
   module Types
-    class Hostname < Value
+    class Hostname < Value::Custom
       class Validator
         PART_RGX = /^[a-z0-9_][a-z0-9_\-]{0,62}$/i
 

data/lib/kdl/types/hostname.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative './hostname/validator'
 
 module KDL
   module Types
-    class Hostname < Value
+    class Hostname < Value::Custom
       def self.call(value, type = 'hostname')
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/ip.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class IP < Value
+    class IP < Value::Custom
       def self.call(value, type = ip_type)
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/irl/parser.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class IRLReference < Value
+    class IRLReference < Value::Custom
       class Parser
         RGX = /^(?:(?:([a-z][a-z0-9+.\-]+)):\/\/([^@]+@)?([^\/?#]+)?)?(\/?[^?#]*)?(?:\?([^#]*))?(?:#(.*))?$/i.freeze
         PERCENT_RGX = /%[a-f0-9]{2}/i.freeze
@@ -96,13 +98,13 @@ module KDL
         end
 
         def self.build_uri_string(scheme, auth, domain, path, search, hash)
-          string = ''
-          string += "#{scheme}://" if scheme
-          string += auth if auth
-          string += domain if domain
-          string += path if path
-          string += "?#{search}" if search
-          string += "##{hash}" if hash
+          string = +''
+          string << "#{scheme}://" if scheme
+          string << auth if auth
+          string << domain if domain
+          string << path if path
+          string << "?#{search}" if search
+          string << "##{hash}" if hash
           string
         end
       end

data/lib/kdl/types/irl.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative './irl/parser'
 
 module KDL
   module Types
-    class IRLReference < Value
+    class IRLReference < Value::Custom
       attr_reader :unicode_value,
                   :unicode_domain,
                   :unicode_path,

data/lib/kdl/types/regex.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class Regex < Value
+    class Regex < Value::Custom
       def self.call(value, type = 'regex')
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/url.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class URLReference < Value
+    class URLReference < Value::Custom
       def self.call(value, type = 'url-reference')
         return nil unless value.is_a? ::KDL::Value::String
 

data/lib/kdl/types/url_template.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module KDL
   module Types
-    class URLTemplate < Value
+    class URLTemplate < Value::Custom
       UNRESERVED = /[a-zA-Z0-9\-._~]/.freeze
       RESERVED = %r{[:/?#\[\]@!$&'()*+,;=]}.freeze
 
@@ -39,7 +41,7 @@ module KDL
         end
 
         def next_token
-          buffer = ''
+          buffer = +''
           context = nil
           expansion_type = nil
           loop do
@@ -49,7 +51,7 @@ module KDL
               case c
               when '{'
                 context = :expansion
-                buffer = ''
+                buffer = +''
                 n = @string[@index + 1]
                 expansion_type = case n
                                  when '+' then ReservedExpansion
@@ -64,7 +66,7 @@ module KDL
                 @index += (expansion_type == StringExpansion ? 1 : 2)
               when nil then return nil
               else
-                buffer = c
+                buffer = +c
                 @index += 1
                 context = :literal
               end

data/lib/kdl/types/uuid.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
-    class UUID < Value
+    class UUID < Value::Custom
       RGX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
 
       def self.call(value, type = 'uuid')

data/lib/kdl/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
     MAPPING = {}

data/lib/kdl/v1/document.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module KDL
+  module V1
+    class Document < ::KDL::Document
+      def version
+        1
+      end
+
+      def to_v1
+        self
+      end
+
+      def to_v2
+        ::KDL::Document.new(nodes.map(&:to_v2))
+      end
+    end
+  end
+end