gwtools 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815b48333cc7b62c19b09a7b974d11f4da0a06af2223242df93d41e1f94a45dd
-  data.tar.gz: d05b35e6e038c5ed00a44b167936550fede33a58bdc14d4fe9d75b080e62ad33
+  metadata.gz: 70d808a737fd03e736ac1f86a7af6b840662f983598f6fa3055ef5e02413afb3
+  data.tar.gz: 38a8c1a3c3a3620fbd91e2067114bdb511c23e3ad813ea51d5aeabce3d21a799
 SHA512:
-  metadata.gz: d4c9a8f1ba05cf7a3003f4c6c00d599a978f761953350423baab24b364b0e5c82ab9902fe37297b1a65a0f7983267d6195702b3413917e176758d22c47d4a823
-  data.tar.gz: b519de2f870e800d5a33444e0579bc2a40bfe29536fcdc4bee4b68b41c5c9a86d61e568e6743dcb169ff675d576ba5f581057adbc621bf5f3d0c061ea97e38cf
+  metadata.gz: '08f5e834d9273fd23a5a62f86ce383c5e72a0f5f99c445272d33b64625e79015a743f152e6dd98e50e863485e7380630714de7eb12b0031ce43ae14a9d47d6cb'
+  data.tar.gz: 383d8c48e3a9964354d0e015827010f01e44bff50485e8d7551512a8e5186d4844ddc9e9f806005e109a755a3f0e91b6faf77151c60f6f93cefef4d080fbf987

data/lib/gwtools/analysis/file_handler.rb

@@ -66,24 +66,6 @@ module Gwtools
       # end
     end
 
-    # def createSwiftFile(dir_path)
-    #   File.open("#{dir_path}.swift", "w") do |file|
-    #     # write swift file content
-    #     if index == 0
-    #       file.write("extension AppAPI { \n")
-    #     else
-    #       file.write("extension AppAPI.#{dirs[0..index-1].join('.')} { \n")
-    #     end
-    #     file.write("    public struct #{dir} { } \n")
-    #     file.write("}")
-    #   end
-    #
-    #
-    #   # File.open("#{dir_path}.swift", "w") do |file|
-    #   #
-    #   # end
-    # end
-
     def getURL
       match = /^URL = (.*)$/.match(@data_str)
       if match

data/lib/gwtools/analysis/swift_parser.rb

@@ -96,7 +96,7 @@ module Gwtools
 
     def self.extract_enum_name(content)
       # return content.scan(/^\w+\s+extension\s+(\w+)\s+\{/).flatten + content.scan(/^\w+\s+enum\s+(\w+)\s+\{/).flatten
-      return (content.scan(/enum\s+(\w+)\s+\{/).flatten + content.scan(/extension\s+(\w+)\s+\{/).flatten).first
+      return (content.scan(/enum\s+([\w.]+)\s+\{/).flatten + content.scan(/extension\s+([\w.]+)\s+\{/).flatten).first
     end
 
     # 根据括号匹配enums内容
@@ -127,6 +127,7 @@ module Gwtools
     end
 
     def self.extract_enum(content, parent_enum = nil)
+      content.gsub!('`','')
       level = parent_enum.nil? ? 0 : parent_enum.level
       pre_name = parent_enum.nil? ? '' : "#{parent_enum.path}."
       enum_codes = extract_enums_content(content)
@@ -194,13 +195,31 @@ module Gwtools
       enum
     end
 
+    def add_quotes(array1, array2)
+      array1.map do |element|
+        if array2.include?(element)
+          "#{element}_"
+        else
+          element
+        end
+      end
+    end
+
+    def output_content(config_file)
+      # 处理特殊字符
+      this_name = Parser.extract_enum_name(config_file)
+      array1 = this_name.split(".")
+      array2 = %w[enum struct class protocol extension self]
+      return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+    end
+
     def to_swift()
       content_str = "public enum #{@enum_name} {\n"
       @sub_enums.each do |key, value|
         content_str += value.to_swift()
       end
       content_str += "}\n"
-      return content_str
+      return output_content(content_str)
     end
 
     def write_to_file(file_path)

data/lib/gwtools/generate/swift.rb

@@ -68,6 +68,24 @@ public extension <%="#{@api_name}"%> {
           ERB.new(template, nil, '>').result(binding)
         end
 
+        def add_quotes(array1, array2)
+          array1.map do |element|
+            if array2.include?(element)
+              "#{element}_"
+            else
+              element
+            end
+          end
+        end
+
+        def output_content(config_file)
+          # 处理特殊字符
+          this_name = Parser.extract_enum_name(config_file)
+          array1 = this_name.split(".")
+          array2 = %w[enum struct class protocol extension self]
+          return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+        end
+
         def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath,
                        model_name, model_data, json_data_is_arr, readme)
           @api_name = api_name
@@ -81,7 +99,8 @@ public extension <%="#{@api_name}"%> {
           @readme = readme
           puts "write to ==> #{file_path}"
           File.open(file_path, 'w+') do |f|
-            f.puts(config_file)
+            puts output_content(config_file)
+            f.puts(output_content(config_file))
           end
         end
       end
@@ -100,7 +119,7 @@ public extension <%="#{@api_name}"%> {
       end
 
       def self.getModulePath(dir_path, prefixPath)
-        modulePaths = %w[content community]
+        modulePaths = %w[content community complaintsComments technician]
         dir_path = dir_path.gsub(/\A#{prefixPath}/, "").gsub(/^\/|\/$/, "")
 
         modulePaths.each do |modulePath|

data/lib/gwtools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gwtools
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - chenglq
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email: