stduritemplate 0.0.39.pre.RC4 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9dcc075a125cf144d83ba226e8b247b9a07026d0328c489f5aedefbdb99f4b
-  data.tar.gz: 3b799f719dcae7ffc7d85696a4719d9d8435afcde722bb4d5978988ff1f64b36
+  metadata.gz: f8efa6481a69bb31c06154ce5f3193acf9c4a4ea1cb36b2c4247180a203d3872
+  data.tar.gz: 490c842eacdedc77dbc711e72c6eb36b8fa8487be15c31793057a5b6716665a0
 SHA512:
-  metadata.gz: 8c7a1b466c37931fabfbc25d21b032ca2287f6c9e678431f0af4243837cc12a0f8dbcec2db78d109cd541550e63a06a4c37622d8c7cfeb6fb674656feb141da9
-  data.tar.gz: 31615f53c0d889b293ec7017f740e38391978d6e98cecea1f40ba7451c0d6fbf5b00f8871c482f1dd96ac348d762cd53f28196c8cf58c0aa0471197c62848c11
+  metadata.gz: 990ccb2e37e117856cca2bff247fea4fa01bbdeed93c19072fb6254345d6bf4b97f381f61c8d68c2f574058f9e490e4fbacc1cb360f530c16b1e25522a591799
+  data.tar.gz: c724e45e47e788d6060b213a7b9f600bdb5ed8ba86a21a14c06e75ea705eaee67d6eb6bc28c22944259119e378e65ef08db5c07d699af7045d0d3c44bf9a932e

data/lib/stduritemplate.rb

@@ -10,15 +10,15 @@ module StdUriTemplate
   # Private implementation
   private
 
-  module Modifier
-    NO_MOD = :no_mod
+  module Operator
+    NO_OP = :no_op
     PLUS = :plus
-    DASH = :dash
+    HASH = :hash
     DOT = :dot
     SLASH = :slash
     SEMICOLON = :semicolon
     QUESTION_MARK = :question_mark
-    AT = :at
+    AMP = :amp
   end
 
   def self.validate_literal(c, col)
@@ -44,33 +44,33 @@ module StdUriTemplate
     end
   end
 
-  def self.get_modifier(c, token, col)
+  def self.get_operator(c, token, col)
     case c
     when '+'
-      Modifier::PLUS
+      Operator::PLUS
     when '#'
-      Modifier::DASH
+      Operator::HASH
     when '.'
-      Modifier::DOT
+      Operator::DOT
     when '/'
-      Modifier::SLASH
+      Operator::SLASH
     when ';'
-      Modifier::SEMICOLON
+      Operator::SEMICOLON
     when '?'
-      Modifier::QUESTION_MARK
+      Operator::QUESTION_MARK
     when '&'
-      Modifier::AT
+      Operator::AMP
     else
       validate_literal(c, col)
       token << c
-      Modifier::NO_MOD
+      Operator::NO_OP
     end
   end
 
   def self.expand_impl(str, substitutions)
     result = ''
     token = nil
-    modifier = nil
+    operator = nil
     composite = false
     max_char_buffer = nil
     first_token = true
@@ -82,10 +82,10 @@ module StdUriTemplate
         first_token = true
       when '}'
         if token
-          expanded = expand_token(modifier, token, composite, get_max_char(max_char_buffer, i), first_token, substitutions, result, i)
+          expanded = expand_token(operator, token, composite, get_max_char(max_char_buffer, i), first_token, substitutions, result, i)
           first_token = false if expanded && first_token
           token = nil
-          modifier = nil
+          operator = nil
           composite = false
           max_char_buffer = nil
         else
@@ -93,7 +93,7 @@ module StdUriTemplate
         end
       when ','
         if token
-          expanded = expand_token(modifier, token, composite, get_max_char(max_char_buffer, i), first_token, substitutions, result, i)
+          expanded = expand_token(operator, token, composite, get_max_char(max_char_buffer, i), first_token, substitutions, result, i)
           first_token = false if expanded && first_token
           token = ''
           composite = false
@@ -101,8 +101,8 @@ module StdUriTemplate
         end
       else
         if token
-          if modifier.nil?
-            modifier = get_modifier(character, token, i)
+          if operator.nil?
+            operator = get_operator(character, token, i)
           elsif max_char_buffer
             if character =~ /\d/
               max_char_buffer << character
@@ -132,59 +132,59 @@ module StdUriTemplate
     end
   end
 
-  def self.add_prefix(mod, result)
-    case mod
-    when Modifier::DASH
+  def self.add_prefix(op, result)
+    case op
+    when Operator::HASH
       result << '#'
-    when Modifier::DOT
+    when Operator::DOT
       result << '.'
-    when Modifier::SLASH
+    when Operator::SLASH
       result << '/'
-    when Modifier::SEMICOLON
+    when Operator::SEMICOLON
       result << ';'
-    when Modifier::QUESTION_MARK
+    when Operator::QUESTION_MARK
       result << '?'
-    when Modifier::AT
+    when Operator::AMP
       result << '&'
     end
   end
 
-  def self.add_separator(mod, result)
-    case mod
-    when Modifier::DOT
+  def self.add_separator(op, result)
+    case op
+    when Operator::DOT
       result << '.'
-    when Modifier::SLASH
+    when Operator::SLASH
       result << '/'
-    when Modifier::SEMICOLON
+    when Operator::SEMICOLON
       result << ';'
-    when Modifier::QUESTION_MARK, Modifier::AT
+    when Operator::QUESTION_MARK, Operator::AMP
       result << '&'
     else
       result << ','
     end
   end
 
-  def self.add_value(mod, token, value, result, max_char)
-    case mod
-    when Modifier::PLUS, Modifier::DASH
+  def self.add_value(op, token, value, result, max_char)
+    case op
+    when Operator::PLUS, Operator::HASH
       add_expanded_value(value, result, max_char, false)
-    when Modifier::QUESTION_MARK, Modifier::AT
+    when Operator::QUESTION_MARK, Operator::AMP
       result << token + '='
       add_expanded_value(value, result, max_char, true)
-    when Modifier::SEMICOLON
+    when Operator::SEMICOLON
       result << token
       result << '=' unless value.empty?
       add_expanded_value(value, result, max_char, true)
-    when Modifier::DOT, Modifier::SLASH, Modifier::NO_MOD
+    when Operator::DOT, Operator::SLASH, Operator::NO_OP
       add_expanded_value(value, result, max_char, true)
     end
   end
 
-  def self.add_value_element(mod, token, value, result, max_char)
-    case mod
-    when Modifier::PLUS, Modifier::DASH
+  def self.add_value_element(op, token, value, result, max_char)
+    case op
+    when Operator::PLUS, Operator::HASH
       add_expanded_value(value, result, max_char, false)
-    when Modifier::QUESTION_MARK, Modifier::AT, Modifier::SEMICOLON, Modifier::DOT, Modifier::SLASH, Modifier::NO_MOD
+    when Operator::QUESTION_MARK, Operator::AMP, Operator::SEMICOLON, Operator::DOT, Operator::SLASH, Operator::NO_OP
       add_expanded_value(value, result, max_char, true)
     end
   end
@@ -284,7 +284,7 @@ module StdUriTemplate
     end
   end
 
-  def self.expand_token(modifier, token, composite, max_char, first_token, substitutions, result, col)
+  def self.expand_token(operator, token, composite, max_char, first_token, substitutions, result, col)
     raise ArgumentError, "Found an empty token at col:#{col}" if token.empty?
 
     value = substitutions[token]
@@ -295,65 +295,65 @@ module StdUriTemplate
     return false if empty?(subst_type, value)
 
     if first_token
-      add_prefix(modifier, result)
+      add_prefix(operator, result)
     else
-      add_separator(modifier, result)
+      add_separator(operator, result)
     end
 
     case subst_type
     when SubstitutionType::STRING
-      add_string_value(modifier, token, value.to_s, result, max_char)
+      add_string_value(operator, token, value.to_s, result, max_char)
     when SubstitutionType::LIST
-      add_list_value(modifier, token, value, result, max_char, composite)
+      add_list_value(operator, token, value, result, max_char, composite)
     when SubstitutionType::MAP
-      add_map_value(modifier, token, value, result, max_char, composite)
+      add_map_value(operator, token, value, result, max_char, composite)
     end
 
     true
   end
 
-  def self.add_string_value(modifier, token, value, result, max_char)
-    add_value(modifier, token, value, result, max_char)
+  def self.add_string_value(operator, token, value, result, max_char)
+    add_value(operator, token, value, result, max_char)
   end
 
-  def self.add_list_value(modifier, token, value, result, max_char, composite)
+  def self.add_list_value(operator, token, value, result, max_char, composite)
     first = true
     value.each do |v|
       if first
-        add_value(modifier, token, v.to_s, result, max_char)
+        add_value(operator, token, v.to_s, result, max_char)
         first = false
       else
         if composite
-          add_separator(modifier, result)
-          add_value(modifier, token, v.to_s, result, max_char)
+          add_separator(operator, result)
+          add_value(operator, token, v.to_s, result, max_char)
         else
           result << ','
-          add_value_element(modifier, token, v.to_s, result, max_char)
+          add_value_element(operator, token, v.to_s, result, max_char)
         end
       end
     end
     !first
   end
 
-  def self.add_map_value(modifier, token, value, result, max_char, composite)
+  def self.add_map_value(operator, token, value, result, max_char, composite)
     first = true
     raise ArgumentError, 'Value trimming is not allowed on Maps' if max_char != -1
 
     value.each do |key, val|
       if composite
-        add_separator(modifier, result) unless first
-        add_value_element(modifier, token, key.to_s, result, max_char)
+        add_separator(operator, result) unless first
+        add_value_element(operator, token, key.to_s, result, max_char)
         result << '='
       else
         if first
-          add_value(modifier, token, key.to_s, result, max_char)
+          add_value(operator, token, key.to_s, result, max_char)
         else
           result << ','
-          add_value_element(modifier, token, key.to_s, result, max_char)
+          add_value_element(operator, token, key.to_s, result, max_char)
         end
         result << ','
       end
-      add_value_element(modifier, token, val.to_s, result, max_char)
+      add_value_element(operator, token, val.to_s, result, max_char)
       first = false
     end
     !first

data/stduritemplate.gemspec

@@ -1,14 +1,13 @@
 Gem::Specification.new do |s|
-  s.name        = "stduritemplate"
-  s.version     = ENV['VERSION'] || "0.0.0"
-  s.summary     = "stduritemplate"
-  s.description = "std-uritemplate implementation for Ruby"
-  s.authors     = ["Andrea Peruffo"]
-  s.email       = "andrea.peruffo1982@gmail.com"
-  s.files       = ["stduritemplate.gemspec", "lib/stduritemplate.rb", "Gemfile"]
-  s.homepage    =
-    "https://github.com/std-uritemplate/std-uritemplate"
+  s.name          = "stduritemplate"
+  s.version       = ENV['VERSION'] || "0.0.0"
+  s.summary       = "stduritemplate"
+  s.description   = "std-uritemplate implementation for Ruby"
+  s.authors       = ["Andrea Peruffo"]
+  s.email         = "andrea.peruffo1982@gmail.com"
+  s.files         = ["stduritemplate.gemspec", "lib/stduritemplate.rb", "Gemfile"]
+  s.homepage      = "https://github.com/std-uritemplate/std-uritemplate"
   s.license       = "APACHE-2"
-  s.platform = Gem::Platform::RUBY
+  s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stduritemplate
 version: !ruby/object:Gem::Version
-  version: 0.0.39.pre.RC4
+  version: 0.0.40
 platform: ruby
 authors:
 - Andrea Peruffo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies: []
 description: std-uritemplate implementation for Ruby
 email: andrea.peruffo1982@gmail.com
@@ -23,7 +23,7 @@ homepage: https://github.com/std-uritemplate/std-uritemplate
 licenses:
 - APACHE-2
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -34,12 +34,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.2.33
+signing_key: 
 specification_version: 4
 summary: stduritemplate
 test_files: []