gwtools 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e5aaf57e5a1887d0fd602c416c4727a8163296e5cc0cb23c2a3cd6226bcee7
-  data.tar.gz: 72c5d96b01cf73ace17487f392213b6c7e9c186b5c9ecfb82d7884cd11c7d4bf
+  metadata.gz: 623dae2a8da9444e088fb0775b8490beb07a339d1b48e040b28be4c955fb30b1
+  data.tar.gz: 4488cddef5c3b1e72e992f263d38cd23e40951731cc5218aa95e1afb31fb2dd6
 SHA512:
-  metadata.gz: 5ed11c0b2efadafa7c0564431fc8191a70451b1601ef4603a13078e10b570326c0802a44044f15e80596c12c75765c29c94712c58974fd492756275843307890
-  data.tar.gz: f5eda98e671f387149f20d879efa1aaf5698b7c0544b1224c07f52d50200388daff4fb1171755b7947ce700826929a973d5057163e9efdb1d238919770f5c156
+  metadata.gz: c52c6bffb2ff6816c726ab1c6d13fc7430e8d2e7b07c8005683a18b0da6dd7a1c3a9d8b49251234f4285067b7cb3aab92df6255e01297143ce6c942f253d2338
+  data.tar.gz: 46e363b7424217396fc8ca484850eea5a9b4a6a7cc7042adf8a812c4203f1943a13c843bfa16104c4931b8ce15fa579820efa2ee56b27540a9a965b3a5570b4c

data/lib/gwtools/analysis/file_handler.rb

@@ -32,8 +32,8 @@ module Gwtools
 #       """
 
       makeDirAndFile(@url)
-      # 生成对应Model文件
-      Generate::Swift.createModelAndRequest(@target_path, @responseJson)
+      # # 生成对应Model文件
+      # Generate::Swift.createModelAndRequest(@target_path, @responseJson)
 
     end
 
@@ -57,7 +57,7 @@ module Gwtools
         end
 
         # create file
-        Generate::Swift.createPathFile(dir_path, dir, dirs, index)
+        Generate::Swift.createPathFile(dir_path, dir, dirs, index, @httpMethod, @responseJson)
       end
     end
 

data/lib/gwtools/command/generate/req_info.rb

@@ -17,7 +17,7 @@ module Gwtools
         end
 
         def validate!
-          # super TODO: 这里还没检查参数
+          help! 'file_path is required.' unless @file_path
         end
 
         def run

data/lib/gwtools/generate/swift.rb

@@ -39,8 +39,49 @@ extension <%="#{@api_name}"%> {
         include(ERB::Util)
         attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath, :model_name, :model_data
 
+        # 将 erb 文件的一个实例化，绑定到当前的一个对象的上下文
         def config_file
-          ERB.new(File.read('../lib/erb/model_req.swift.erb'), nil, '>').result(binding)
+          # ERB.new(File.read('restful_url.swift.erb'), nil, '>').result(binding)
+          template = <<-ERB
+/// 此文件由代码生成，不要修改任何路径相关参数，仅可对 headerParms 和 parms 做处理
+
+import RxSwift
+import GWNetWork
+import GWUserCenterBase
+import SwiftyUserDefaults
+import HandyJSON
+
+public extension <%="#{@api_name}"%> {
+<%="#{@model_data}\n"%>
+}
+
+public extension <%="#{@api_name}"%> {
+  static func <%="#{@httpmethod}"%>(/*custom_params,*/
+    isCache: Bool = false,
+    isLoading: Bool = false,
+    module: String? = nil,
+    des: String? = nil) -> Observable<Self.<%="#{@httpmethod}"%><%="#{@model_name}"%>> {
+      // ================= 逻辑处理 =================
+      let headerParms: [String : String] = [:]
+      let parms: [String : Any] = [:]
+      // ================= 逻辑处理 =================
+
+      return GWNetworkManager.request(requestType: .<%="#{@httpmethod}"%>,
+        prefixPath: "<%="#{@prefixPath}"%>",
+        modulePath: "<%="#{@modulePath}"%>",
+          detailPath: "<%="#{@detailPath}"%>",
+        parms: parms,
+        headerParms: headerParms,
+        isCache: isCache,
+        isLoading: isLoading,
+        module: module,
+        des: des)
+        .mapHandyJSON(Self.<%="#{@model_name}"%>.self)
+
+        }
+}
+          ERB
+          ERB.new(template, nil, '>').result(binding)
         end
 
         def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath, model_name, model_data)
@@ -58,15 +99,36 @@ extension <%="#{@api_name}"%> {
         end
       end
 
-      def self.createPathFile(dir_path, dir, dirs, index)
+      def self.createPathFile(dir_path, dir, dirs, index, http_method, response_json)
         if index <= 0
           return
         end
-        PathGenerateConfig.new(
-          "#{dir_path}.swift",
-          "AppAPI.#{dirs[0..index-1].join('.')}",
-          dir
-        )
+        if dir == 'restful'
+          puts dir_path
+          puts dir
+          puts dirs.join('/')
+          puts dirs[0..index-1].join('.')
+          swift_model = generate_model("Model", response_json)
+          ModelReqGenerateConfig.new(
+            "#{dir_path}.swift",
+            "AppAPI.#{dirs[0..index-1].join('.')}",
+            http_method.capitalize,
+            'app-api/api/v1.0',
+            'content',
+            '/route/getContentInfo',
+            'GetModel',
+            swift_model
+          )
+
+          `swiftformat --swiftversion 5.0 #{dir_path}.swift`
+        else
+          PathGenerateConfig.new(
+            "#{dir_path}.swift",
+            "AppAPI.#{dirs[0..index-1].join('.')}",
+            dir
+          )
+        end
+
       end
 
       def self.generate_model(name, json_data)
@@ -101,10 +163,10 @@ extension <%="#{@api_name}"%> {
         swift_model + "}\n"
       end
 
-      def self.createModelAndRequest(target_path, responseJson)
-        swift_model = generate_model("Model", responseJson)
-        File.write(target_path + 'Model.swift', swift_model)
-      end
+      # def self.createModelAndRequest(target_path, responseJson)
+      #   swift_model = generate_model("Model", responseJson)
+      #   File.write(target_path + 'Model.swift', swift_model)
+      # end
 
       # 生成 Swift 模型
 

data/lib/gwtools/version.rb

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

metadata

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