sqm2json 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02cdf58b8fca45cb20db6981aa66a4dae32f0e6dfd56ec930002a9d65b3cb54
-  data.tar.gz: 123c9d72a99bd1fa376b17b278618fd243c09b327fedabaf05ac491354519bec
+  metadata.gz: f722dfb641b8674f1e73d490ce62a8b7c1ec426981d704f731c98642b43bd4ac
+  data.tar.gz: d3644e0ad66ddff412c1b52609e20ec05ff795ac5b8e4244b22cfd993d6d1edb
 SHA512:
-  metadata.gz: aefc059a1453d1c58b3cd9e06b6dc35b8e44a2fb0e15897620f14f93e2c0ba48065c8136ef8bd44570443a21cca4bc6208d4a7b623949496bbc5b17cf80c4df9
-  data.tar.gz: e97debfc0d9286cc562fb3e5aa0dc0a00147d63f2aae122a8cab100c926cf9389e9ee5657b8eb29321ad7873d41e241acee8fbb5a4a228ef590e9052dedac49d
+  metadata.gz: 9f2e069d53a0efe9942b6fba3060ac9584c501374e411be08b58c465701506e20fcd1c8dd9529cc49a6c88402960f92b1b24937e93b6a3f9f2a37b651f4c4ca4
+  data.tar.gz: 41ecb4372cce08f1b1d2657bf43b872f6cb0e0f089df3b3bda1c5764e4dd8757786999009ce5188f06e39774d526a1ffc3f30558d8e75d4d40f6814a7c20ec40

data/lib/sqm2json/json2sqm.rb

@@ -1,4 +1,6 @@
+
 module Sqm2Json
+  # Provide JSON => SQM conversion
   module Reverse
 
     # Generate a SQM formatted output from given JSON document
@@ -6,13 +8,10 @@ module Sqm2Json
     # @return [String] SQM document as string
     def to_sqm(json)
       content = ''
-      json.each { |k,v|
-        content += get_element(k, v, 0)
-      }
+      json.each { |k, v| content += get_element(k, v, 0) }
       content
     end
 
-
     # Convert any JSON element to SQM equivalent
     # @param [Object] key of JSON element
     # @param [Object] value of JSON element
@@ -20,28 +19,30 @@ module Sqm2Json
     # @return [String] SQM formatted element
     def get_element(key, value, level)
       content = ''
-      level.times { content << "\t"}
+      level.times { content << "\t" }
 
-      if value.is_a?(::Numeric)
-        content << "#{key.to_s}=#{get_numeric(value)};\r\n"
-      elsif value.is_a?(::String)
-        content << "#{key.to_s}=\"#{value.gsub(/"/, '""').to_s}\";\r\n"
-      elsif value.is_a?(::Array)
+      case value
+      when ::Numeric
+        content << "#{key}=#{get_numeric(value)};\r\n"
+      when ::String
+        content << "#{key}=\"#{value}\";\r\n"
+      when ::Array
         content << get_array(key, value, level)
-      elsif value.is_a?(::Hash)
-        content << "class #{key.to_s}\r\n"
-        level.times { content << "\t"}
+      when ::Hash
+        content << "class #{key}\r\n"
+        level.times { content << "\t" }
         content << "{\r\n"
-        value.each{ |k,v|
+        value.each { |k, v|
           content << get_element(k, v, level + 1)
         }
-        level.times { content << "\t"}
+        level.times { content << "\t" }
         content << "};\r\n"
+      else
+        raise "Invalid JSON element type: #{value.class}"
       end
       content
     end
 
-
     # Convert a JSON value array in SQM equivalent
     # @param [Object] key of JSON element
     # @param [Array] values of JSON element
@@ -49,43 +50,41 @@ module Sqm2Json
     # @return [String] SQM formatted array
     def get_array(key, values, level)
       content = ''
-      content << "#{key.to_s}[]="
+      content << "#{key}[]="
       if values[0].is_a?(::Numeric)
         content << '{'
         values.each { |v|
           content << "#{get_numeric(v)},"
         }
         content.chomp!(',')
-        content << "};\r\n"
       else
         content << "\r\n"
-        level.times { content << "\t"}
+        level.times { content << "\t" }
         content << "{\r\n"
-        values.each { |v|
-          (level + 1).times {content << "\t"}
+        values.each do |v|
+          (level + 1).times {content << "\t" }
           content << "\"#{v.to_s}\",\r\n"
-        }
+        end
         content.chomp!(",\r\n")
         content << "\r\n"
-        level.times { content << "\t"}
-        content << "};\r\n"
+        level.times { content << "\t" }
       end
+      content << "};\r\n"
       content
     end
 
-
     # Convert a JSON numeric value in SQM equivalent
     # @param [Object] value of JSON element
     # @return [String] SQM formatted numeric value
     def get_numeric(value)
-      value.to_s.gsub(/(?<val>[0-9\.]+e[-\+]?)(?<exp>[0-9]+)/) { |m|
+      value.to_s.gsub(/(?<val>[0-9\.]+e[-\+]?)(?<exp>[0-9]+)/) do |m|
         arr = m.split(/e/)
         if arr[1][0] =~ /[0-9]/
           "#{arr[0]}e#{arr[1].rjust(3,'0')}"
         else
-          "#{arr[0]}e#{arr[1][0]}#{arr[1][1..-1].rjust(3,'0')}"
+          "#{arr[0]}e#{arr[1][0]}#{arr[1][1..].rjust(3,'0')}"
         end
-      }.to_s
+      end.to_s
     end
 
   end

data/lib/sqm2json/sqm2json.rb

@@ -1,3 +1,4 @@
+# Provide SQM =>> JSON conversion
 module Sqm2Json
 
   # Parse a given SQM file to JSON document
@@ -6,28 +7,30 @@ module Sqm2Json
   # @return [Hash] JSON document
   def to_json(sqm_document)
     content = sqm_document.delete("\r\n").delete("\t")
-
-    content.gsub!(/(?<key>\w*)(\s)*=(\s)*(?<val>"");/, '\k<key>="ʉ";') # replace empty string values
-    content.gsub!('""', '\"') # 2x" in init fields replaced by \"
-
-    content.gsub!(/(?<key>[\w]+)(\[\])?=(?<val>".{0,}?([^\\]\";))/) { |m|
-      pairs = m.split('=', 2)
-      "\"#{pairs[0]}\": #{pairs[1].gsub(/;/,'ʊ').gsub(/,/,'ʎ').chomp('ʊ').gsub('""','\"').gsub(/\\([^"])/, '\\\\\\\\\1')},"
-    }
-
+    content.gsub!(/(?<key>\w*)\s*=\s*(?<val>"");/, '\k<key>="ʉ";') # replace empty string values
+    protect_special_chars_into_values(content)
     content.gsub!(/class (?<val>\w+)\s*\{/, '"\k<val>" : {')
     content.gsub!(/(?<key>\w*)=(?<val>[\w#+\-0-9 .,]+);/, '"\k<key>" : \k<val>,')
     content.gsub!(/(?<key>\w*)\[\]\s*=\s*\{(?<val>[\w#\+\-0-9 .,"]+)\};/, '"\k<key>" : [\k<val>],')
     content.gsub!(/\};/, '},')
     content.gsub!(/,\}/, '}')
     content.gsub!(/\}[;,]\}/, '}}')
-    content.gsub!(/ʊ/, ';') if content.include? 'ʊ'
-    content.gsub!(/ʎ/, ',') if content.include? 'ʎ'
-    content.gsub!(/ʉ/, '') if content.include? 'ʉ'
-    content.gsub!(/ɣ/, '\'') if content.include? 'ɣ'
-    content = "{#{content.chomp('"').chomp(',')}}"
+    recover_special_chars_into_values(content)
+    ::JSON.parse("{#{content.chomp('"').chomp(',')}}", symbolize_names: true)
+  end
+
+  # Replace special characters into init-like fields before processing the structure
+  def protect_special_chars_into_values(content)
+    content.gsub!(/(\w+)(\[\])?\s*=\s*"(.{0,}?([^\\]))";/) do
+      "\"#{$1}\": \"#{$3.gsub(/;/, 'ʊ').gsub(/,/, 'ʎ').gsub('"', 'ƛ').gsub(/'/, 'ɣ').gsub(/\\([^"])/, '\\\\\\\\\1')}\","
+    end
+  end
 
-    ::JSON.parse(content, symbolize_names: true)
+  # Recover protected special characters into init-like fields after processing the structure
+  def recover_special_chars_into_values(content)
+    content.gsub!(/"(\w+)(\[\])?"\s*:\s*"(.{0,}?([^\\])*)"(,)?/) do
+      "\"#{$1}\" : \"#{$3.gsub(/ʊ/, ';').gsub(/ʎ/, ',').gsub(/ƛ/, '\"').gsub(/ɣ/, '\'').gsub(/ʉ/, '')}#{$4}\""
+    end
   end
 
 end

data/lib/sqm2json/version.rb

@@ -1,11 +1,11 @@
 module Sqm2Json
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   def self.get_supported_versions
-    [12,51,52,54]
+    [12, 51, 52, 54]
   end
 
-  def self.is_version_supported?(version)
+  def self.version_supported?(version)
     get_supported_versions.include?(version)
   end
 

data/lib/sqm2json.rb

@@ -1,4 +1,4 @@
 require 'json'
 require 'sqm2json/json2sqm'
 require 'sqm2json/sqm2json'
-require 'sqm2json/version'
+require 'sqm2json/version'

data/sqm2json.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'rake', '~> 13.2'
   spec.add_development_dependency 'rspec', '~> 3.13'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 1.70'
   spec.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqm2json
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nicolas FLINOIS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.70'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.70'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: This library aims at converting Arma's missions SQM format to JSON and vice-versa