gwtools 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001eef35553a92118abccc74a73ef133fce57509e775e9cb7361b014a2bc6436
-  data.tar.gz: 35ed21f791aee545295149c39b747b789d02057616b7c0e747861e9fb6f9ff14
+  metadata.gz: a0d8d1c08e191ea5994386b5ffa6ff37ead560cf421bacf85bc5378cabbff27d
+  data.tar.gz: 72b8d9b5c16ca85bc8dd2ae93451f03b09aea284fd617554647eb74c9ba52df9
 SHA512:
-  metadata.gz: dd259aa0fde7b6c9c958b5b49b8bd83dc70d4cfde0dc3eafea2265f1b6976a657ebd4beee4c559b866e25e133e02d58b704312babed58cfac442bf010c78d229
-  data.tar.gz: 2e8e27d43e284ccf7301d0ce5eff6b3e9b49cd18908ce32e4c87dadded65104da415d5cb8bb753b1b87f5992e58020278f4a0dd3d08e8f806970f797b77d5a38
+  metadata.gz: 6a8bfa15a1f9f640e62796a01c1cb0475705a62b4ab5860ed9e6d98fb4c2f9f039f6b84951961b63c3cb155a6cb7333cb295764c4c4270647eeef83a7a91a267
+  data.tar.gz: b79801bece0b7663e9ff5cc3048147964d89df2a6531473fcf1670a7b4ad300ad9e4aae1ae3a368f852570085056394afaedf5a09d3ca1ce522d92cd9b8a1f58

data/lib/gwtools/analysis/file_handler.rb

@@ -32,32 +32,41 @@ module Gwtools
 #       """
 
       makeDirAndFile(@url)
-      # # 生成对应Model文件
-      # Generate::Swift.createModelAndRequest(@target_path, @responseJson)
-
     end
 
     def makeDirAndFile(url)
       uri = URI(url)
       path = uri.path
+      file_name = 'restful'
 
       # remove leading '/'
       path = path[1..-1] if path.start_with? '/'
 
       # split path by '/' and create directories
-      dirs = path.split('/').map { |part| part.gsub(/[.-]/, "_") } + ['restful']
+      dirs = path.split('/').map { |part| part.gsub(/[.-]/, "_") } + [file_name]
+
+      # 先判断路径下是否存在restful.swift
+      puts "文件已存在: #{@target_path + '/' + dirs.join('/') + '.swift'}" unless !File.exist?(@target_path + '/' + dirs.join('/') + '.swift')
+
       FileUtils.mkdir_p(@target_path) unless File.directory?(@target_path)
       dirs.each_with_index do |dir, index|
         # construct directory path
         dir_path = @target_path + '/' + dirs[0..index].join('/')
 
-        # create directory if it doesn't exist, with out restful
-        if dir != 'restful'
+        # create directory if it doesn't exist, with out file_name
+        if dir != file_name
           FileUtils.mkdir_p(dir_path) unless File.directory?(dir_path)
         end
-
         # create file
-        Generate::Swift.createPathFile(dir_path, dir, dirs, index, @httpMethod, @responseJson, path)
+        Generate::Swift.createPathFile(dir_path, dir, dirs, index,
+                                       path,
+                                       @url,
+                                       @header,
+                                       @httpMethod,
+                                       @parameters,
+                                       @body,
+                                       @responseJson
+                                       )
       end
     end
 

data/lib/gwtools/generate/swift.rb

@@ -38,7 +38,8 @@ extension <%="#{@api_name}"%> {
 
       class ModelReqGenerateConfig
         include(ERB::Util)
-        attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath, :model_name, :model_data, :json_data_is_arr
+        attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath,
+                      :model_name, :model_data, :json_data_is_arr, :readme
 
         # 将 erb 文件的一个实例化，绑定到当前的一个对象的上下文
         def config_file
@@ -52,6 +53,10 @@ import GWUserCenterBase
 import SwiftyUserDefaults
 import HandyJSON
 
+/** 参考代码
+<%="#{@readme}"%>
+ */
+
 public extension <%="#{@api_name}"%> {
 <%="#{@model_data}\n"%>
 }
@@ -92,7 +97,8 @@ public extension <%="#{@api_name}"%> {
           ERB.new(template, nil, '>').result(binding)
         end
 
-        def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath, model_name, model_data, json_data_is_arr)
+        def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath,
+                       model_name, model_data, json_data_is_arr, readme)
           @api_name = api_name
           @httpmethod = httpmethod
           @prefixPath = prefixPath
@@ -101,6 +107,7 @@ public extension <%="#{@api_name}"%> {
           @model_name = model_name
           @model_data = model_data
           @json_data_is_arr = json_data_is_arr
+          @readme = readme
 
           File.open(file_path, 'w+') do |f|
             f.puts(config_file)
@@ -115,16 +122,21 @@ public extension <%="#{@api_name}"%> {
           return prefix_path.gsub(/^\/|\/$/, "") if dir_path.start_with?(prefix_path)
         end
 
+        puts "PrefixPath不在预设数组中, 请检查请求路径中的PrefixPath, 预设 PrefixPath(代码生成终止) \n#{dir_path}\n#{prefixPaths} "
+
         return ''
       end
 
       def self.getModulePath(dir_path, prefixPath)
         modulePaths = %w[content community]
         dir_path = dir_path.gsub(/\A#{prefixPath}/, "").gsub(/^\/|\/$/, "")
+
         modulePaths.each do |modulePath|
-          return modulePath if dir_path.start_with?(modulePath)
+          return modulePath if dir_path.split("/").first == modulePath
         end
 
+        puts "ModulePath不在预设数组中, 请检查请求路径中的ModulePath, 预设 ModulePath \n#{dir_path}\n#{modulePaths} "
+
         return ''
       end
 
@@ -134,31 +146,84 @@ public extension <%="#{@api_name}"%> {
                  .gsub(/^\/|\/$/, "")
       end
 
-      def self.createPathFile(dir_path, dir, dirs, index, http_method, response_json, url_path)
+      def self.createPathFile(dir_path, dir, dirs, index,
+                              url_path,
+                              url,
+                              header,
+                              httpMethod,
+                              parameters,
+                              body,
+                              responseJson)
         app_name = "AppAPI.#{dirs[0..index-1].join('.')}"
         if index == 0
           app_name = "AppAPI"
         end
         if dir == 'restful'
-          swift_model = generate_model("#{http_method.capitalize.chomp}Model", response_json)
+          swift_model = generate_model("#{httpMethod.capitalize.chomp}Model", responseJson)
           prefixPath = getPrefixPath(url_path)
+
+          return unless !prefixPath.empty?
+
           modulePath = getModulePath(url_path, prefixPath)
           detailPath = getDetailPath(url_path, prefixPath, modulePath)
+
+          readme = """
+          请求参数
+          URL = #{url.chomp}
+          HTTPMETHOD = #{httpMethod.chomp}
+
+          ViewModel
+          class <##SomeViewModel##> {
+            let disposeBag = DisposeBag()
+
+            public struct Input {
+                let <##AnyObservable##>: Observable<<##AnyObservableType##>>
+            }
+
+            public struct Output {
+                let data: BehaviorRelay<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}>
+            }
+
+            public func transform(input: Input) -> Output {
+                let outDatas = BehaviorRelay<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}>(value: [])
+                input.<##AnyObservable##>.flatMapLatest({ [weak self] () -> Observable<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}> in
+                    guard let self = self else { return Observable.just([]) }
+                    return self.reqData()
+                }).subscribe(onNext: { (items) in
+                    outDatas.accept(outDatas.value + items)
+                }, onError: { error in
+                    outDatas.accept([])
+                }).disposed(by: disposeBag)
+
+                return Output(data: outDatas)
+            }
+          }
+
+          extension <##SomeViewModel##> {
+              func reqData() -> Observable<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}> {
+                  #{app_name}.#{httpMethod.capitalize.chomp}()
+                      .compactMap { $0 } // 解析出需要的类型
+                      .observeOn(MainScheduler.instance)
+                      .catchErrorJustReturn([])
+              }
+          }
+          """
+
           ModelReqGenerateConfig.new(
             "#{dir_path}.swift",
             app_name,
-            http_method.capitalize.chomp,
+            httpMethod.capitalize.chomp,
             prefixPath,
             modulePath,
             detailPath,
-            "#{http_method.capitalize.chomp}Model",
+            "#{httpMethod.capitalize.chomp}Model",
             swift_model,
-            @json_data_is_arr
+            @json_data_is_arr,
+            readme
           )
 
           `swiftformat --swiftversion 5.0 #{dir_path}.swift`
         else
-
           PathGenerateConfig.new(
             "#{dir_path}.swift",
             app_name,
@@ -168,6 +233,10 @@ public extension <%="#{@api_name}"%> {
 
       end
 
+      def self.capitalize_first_letter(str)
+        str[0].upcase + str[1..-1]
+      end
+
       def self.generate_model(name, json_data, level = 0)
 
         if json_data == nil
@@ -206,15 +275,16 @@ public extension <%="#{@api_name}"%> {
           when String
             swift_model += "  var #{key}: String?\n"
           when Array
+
             if !value.empty?
-              swift_model += "  var #{key}: [#{key.capitalize}] = []\n"
-              swift_model += generate_model("#{key.capitalize}", value.first, level+1)
+              swift_model += "  var #{key}: [#{capitalize_first_letter(key)}] = []\n"
+              swift_model += generate_model("#{capitalize_first_letter(key)}", value.first, level+1)
             else
               swift_model += "  var #{key}: [Any] = []\n"
             end
           when Hash
-            swift_model += "  var #{key}: #{key.capitalize}?\n"
-            swift_model += generate_model("#{key.capitalize}", value, level+1)
+            swift_model += "  var #{key}: #{capitalize_first_letter(key)}?\n"
+            swift_model += generate_model("#{capitalize_first_letter(key)}", value, level+1)
           else
             swift_model += "  var #{key}: #{value.class == String ? 'String' : 'Int'}\n"
           end

data/lib/gwtools/version.rb

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

metadata

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