gwtools 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9ac7103f49aa7472021c8a7b66d2937718a43c69753eb679427ec1a211bff7
-  data.tar.gz: 739815ba75420526ea48db985d73fc30f769aa30e8d153ed1b811a373ffa51c2
+  metadata.gz: d9008f2c63bf9819bb028d56605f9f971c9f75e27865a54faae2115d8b1c384f
+  data.tar.gz: cd71025cf2a99576b58686ae67469de00086b571516ca574f3639f7485e5675a
 SHA512:
-  metadata.gz: def094dbfbf093ed45bbbff27000e1686b5f54f8a5a95e2ba217e61f5224bc60ba8559a246146388ad151114cc8df524f33c3d9d5941d214096e85daa3e9a1be
-  data.tar.gz: a7209c21c28ebc0b5be46bba41134758a5c26edc33cd2ce400c1e1f6cb53e3f221204e44e8089379d3f56d3b0536bc089a4fe792c1313e463427817016b7252e
+  metadata.gz: a55cdc1621a3c012d7d40922078af8080ceff67b43f0f9007d08b6f21c4cd473247a071d3d776c0a45d9eafa4c9d9bf68e464734aac6135d3de0167ab00a4068
+  data.tar.gz: 68fd58663f5eecc0a587dcfb80cb62a287b31e51d81262fc8c210584a00aa23e05f237bc695ba1fcc4d5966877f15cfe0118ac0eea76a0c78cb21b3367a63ae1

data/lib/gwtools/analysis/file_handler.rb

@@ -37,13 +37,13 @@ module Gwtools
     def makeDirAndFile(url)
       uri = URI(url)
       path = uri.path
-      file_name = 'restful'
+      # 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(/[.-]/, "_") } + [file_name]
+      dirs = path.split('/').map { |part| part.gsub(/[.-]/, "_") }# + [file_name]
 
       # puts @target_path
       # puts Parser.enum_from_url(url).to_json
@@ -53,24 +53,16 @@ module Gwtools
       #
       FileUtils.mkdir_p(@target_path) unless File.directory?(@target_path)
       Generate::Swift.createFile(@target_path, 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 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,
-      #                                  path,
-      #                                  @url,
-      #                                  @header,
-      #                                  @httpMethod,
-      #                                  @parameters,
-      #                                  @body,
-      #                                  @responseJson
-      #                                  )
+      Generate::Swift.createPathFile(@target_path,
+                                       dirs,
+                                       @url,
+                                       path,
+                                       @header,
+                                       @httpMethod,
+                                       @parameters,
+                                       @body,
+                                       @responseJson
+                                       )
       # end
     end
 

data/lib/gwtools/generate/swift.rb

@@ -7,35 +7,6 @@ require 'pp'
 module Gwtools
   class Generate
     class Swift
-
-      class PathGenerateConfig
-        include(ERB::Util)
-        attr_accessor :api_name, :this_path
-
-        def config_file
-          # ERB.new(File.read('../lib/erb/path_url.swift.erb'), nil, '>').result(binding)
-          template = <<-ERB
-// 此文件由代码生成，不要任何修
-
-extension <%="#{@api_name}"%> {
-  // <%="#{@this_path}\n"%>
-  public struct <%="#{@this_path}"%> { }
-}
-          ERB
-          ERB.new(template, nil, '>').result(binding)
-        end
-
-        def initialize(file_path, api_name, this_path)
-          @api_name = api_name
-          @this_path = this_path
-
-          File.open(file_path, 'w+') do |f|
-            f.puts(config_file)
-          end
-        end
-
-      end
-
       class ModelReqGenerateConfig
         include(ERB::Util)
         attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath,
@@ -108,7 +79,7 @@ public extension <%="#{@api_name}"%> {
           @model_data = model_data
           @json_data_is_arr = json_data_is_arr
           @readme = readme
-
+          puts "write to ==> #{file_path}"
           File.open(file_path, 'w+') do |f|
             f.puts(config_file)
           end
@@ -143,23 +114,21 @@ public extension <%="#{@api_name}"%> {
 
       def self.getDetailPath(dir_path, prefixPath, modulePath)
         return dir_path.gsub(/^\/|\/$/, "").gsub(/\A#{prefixPath}/, "")
-                 .gsub(/^\/|\/$/, "").gsub(/\A#{modulePath}/, "")
-                 .gsub(/^\/|\/$/, "")
+                       .gsub(/^\/|\/$/, "").gsub(/\A#{modulePath}/, "")
+                       .gsub(/^\/|\/$/, "")
       end
 
-
       def self.createFile(target_path, url)
         pre_name = 'pre_path'
         target_swift_file = "#{target_path + "/#{pre_name}"}/#{url.split('/').first}.swift"
         FileUtils.mkdir_p(target_path + "/#{pre_name}") unless File.directory?(target_path + "/#{pre_name}")
 
-        File.open(target_swift_file, "w") do |file|
-          file.write("{}")
-        end
         # 从 .swift 文件读取 enum
-        Parser.extract_from(target_swift_file)
-        json1Hash = JSON.parse(Parser.get_clear_enums.to_json)
-
+        json1Hash = {}
+        if File.exist?(target_swift_file)
+          Parser.extract_from(target_swift_file)
+          json1Hash = JSON.parse(Parser.get_clear_enums.to_json)
+        end
         # 从 url 解析 enum
         url_enum = Parser.enum_from_url(url)
         json2Hash = {url_enum.enum_name.to_sym => url_enum}
@@ -175,92 +144,87 @@ public extension <%="#{@api_name}"%> {
         `swiftformat --swiftversion 5.0 #{target_swift_file}`
       end
 
-      def self.createPathFile(dir_path, dir, dirs, index,
-                              url_path,
-                              url,
+      def self.createPathFile(target_path,
+                              dirs,
+                              full_url,
+                              path,
                               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("#{httpMethod.capitalize.chomp}Model", responseJson, 'data')
-          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,
-            httpMethod.capitalize.chomp,
-            prefixPath,
-            modulePath,
-            detailPath,
-            "#{httpMethod.capitalize.chomp}Model",
-            swift_model,
-            @json_data_is_arr,
-            readme
-          )
-
-          `swiftformat --swiftversion 5.0 #{dir_path}.swift`
-        else
-          PathGenerateConfig.new(
-            "#{dir_path}.swift",
-            app_name,
-            dir
-          )
-        end
+        app_name = dirs.join('.')
+
+        swift_model = generate_model("#{httpMethod.capitalize.chomp}Model", responseJson, 'data')
+        prefixPath = getPrefixPath(path)
+        prefixPath = getPrefixPath(path)
+
+        return unless !prefixPath.empty?
+
+        modulePath = getModulePath(path, prefixPath)
+        detailPath = getDetailPath(path, prefixPath, modulePath)
+
+        readme = """
+请求参数
+URL = #{path.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(
+          "#{target_path + '/' + app_name}.swift",
+          app_name,
+          httpMethod.capitalize.chomp,
+          prefixPath,
+          modulePath,
+          detailPath,
+          "#{httpMethod.capitalize.chomp}Model",
+          swift_model,
+          false,
+          readme
+        )
+
+        `swiftformat --swiftversion 5.0 "#{target_path + '/' + app_name}.swift",`
+
+        # puts target_swift_file = "#{target_path}/#{app_name}.swift"
 
       end
+
       def self.capitalize_first_letter(str)
         str[0].upcase + str[1..-1]
       end
@@ -328,4 +292,4 @@ public extension <%="#{@api_name}"%> {
 
     end
   end
-end
+end

data/lib/gwtools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - chenglq