gwtools 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e5aaf57e5a1887d0fd602c416c4727a8163296e5cc0cb23c2a3cd6226bcee7
-  data.tar.gz: 72c5d96b01cf73ace17487f392213b6c7e9c186b5c9ecfb82d7884cd11c7d4bf
+  metadata.gz: 001eef35553a92118abccc74a73ef133fce57509e775e9cb7361b014a2bc6436
+  data.tar.gz: 35ed21f791aee545295149c39b747b789d02057616b7c0e747861e9fb6f9ff14
 SHA512:
-  metadata.gz: 5ed11c0b2efadafa7c0564431fc8191a70451b1601ef4603a13078e10b570326c0802a44044f15e80596c12c75765c29c94712c58974fd492756275843307890
-  data.tar.gz: f5eda98e671f387149f20d879efa1aaf5698b7c0544b1224c07f52d50200388daff4fb1171755b7947ce700826929a973d5057163e9efdb1d238919770f5c156
+  metadata.gz: dd259aa0fde7b6c9c958b5b49b8bd83dc70d4cfde0dc3eafea2265f1b6976a657ebd4beee4c559b866e25e133e02d58b704312babed58cfac442bf010c78d229
+  data.tar.gz: 2e8e27d43e284ccf7301d0ce5eff6b3e9b49cd18908ce32e4c87dadded65104da415d5cb8bb753b1b87f5992e58020278f4a0dd3d08e8f806970f797b77d5a38

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, path)
       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

@@ -2,6 +2,7 @@
 
 require 'erb'
 require 'json'
+require 'pp'
 
 module Gwtools
   class Generate
@@ -37,13 +38,61 @@ extension <%="#{@api_name}"%> {
 
       class ModelReqGenerateConfig
         include(ERB::Util)
-        attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath, :model_name, :model_data
+        attr_accessor :api_name, :httpmethod, :prefixPath, :modulePath, :detailPath, :model_name, :model_data, :json_data_is_arr
 
+        # 将 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,
+    <% if #{@json_data_is_arr} %>
+      des: String? = nil) -> Observable<[Self.<%="#{@model_name}"%>]> {
+    <% else %>
+      des: String? = nil) -> Observable<Self.<%="#{@model_name}"%>> {
+    <% end %>
+      // ================= 逻辑处理 =================
+      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)
+<% if #{@json_data_is_arr} %>
+  .mapHandyJSON2Array(Self.<%="#{@model_name}"%>.self)
+<% else %>
+  .mapHandyJSON(Self.<%="#{@model_name}"%>.self)
+<% end %>
+        }
+}
+          ERB
+          ERB.new(template, nil, '>').result(binding)
         end
 
-        def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath, model_name, model_data)
+        def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath, model_name, model_data, json_data_is_arr)
           @api_name = api_name
           @httpmethod = httpmethod
           @prefixPath = prefixPath
@@ -51,6 +100,7 @@ extension <%="#{@api_name}"%> {
           @detailPath = detailPath
           @model_name = model_name
           @model_data = model_data
+          @json_data_is_arr = json_data_is_arr
 
           File.open(file_path, 'w+') do |f|
             f.puts(config_file)
@@ -58,22 +108,89 @@ extension <%="#{@api_name}"%> {
         end
       end
 
-      def self.createPathFile(dir_path, dir, dirs, index)
-        if index <= 0
-          return
+      def self.getPrefixPath(dir_path)
+        prefixPaths = %w[app-api/api/v1.0 app-api/api/v2.0]
+
+        prefixPaths.each do |prefix_path|
+          return prefix_path.gsub(/^\/|\/$/, "") if dir_path.start_with?(prefix_path)
         end
-        PathGenerateConfig.new(
-          "#{dir_path}.swift",
-          "AppAPI.#{dirs[0..index-1].join('.')}",
-          dir
-        )
+
+        return ''
       end
 
-      def self.generate_model(name, json_data)
-        swift_model = "struct #{name}: HandyJson {\n"
+      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)
+        end
+
+        return ''
+      end
+
+      def self.getDetailPath(dir_path, prefixPath, modulePath)
+        return dir_path.gsub(/^\/|\/$/, "").gsub(/\A#{prefixPath}/, "")
+                 .gsub(/^\/|\/$/, "").gsub(/\A#{modulePath}/, "")
+                 .gsub(/^\/|\/$/, "")
+      end
+
+      def self.createPathFile(dir_path, dir, dirs, index, http_method, response_json, url_path)
+        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)
+          prefixPath = getPrefixPath(url_path)
+          modulePath = getModulePath(url_path, prefixPath)
+          detailPath = getDetailPath(url_path, prefixPath, modulePath)
+          ModelReqGenerateConfig.new(
+            "#{dir_path}.swift",
+            app_name,
+            http_method.capitalize.chomp,
+            prefixPath,
+            modulePath,
+            detailPath,
+            "#{http_method.capitalize.chomp}Model",
+            swift_model,
+            @json_data_is_arr
+          )
+
+          `swiftformat --swiftversion 5.0 #{dir_path}.swift`
+        else
+
+          PathGenerateConfig.new(
+            "#{dir_path}.swift",
+            app_name,
+            dir
+          )
+        end
+
+      end
+
+      def self.generate_model(name, json_data, level = 0)
+
         if json_data == nil
           return ''
         end
+
+        if level == 0
+          # 找到 真正要处理的 data 数据
+          json_data.each do |key, value|
+            if key == 'data'
+              case value
+              when Array
+                json_data = value.first
+                @json_data_is_arr = true
+              when Hash
+                json_data = value
+                @json_data_is_arr = false
+              end
+            end
+          end
+        end
+
+        swift_model = "struct #{name}: HandyJSON {\n"
         json_data.each do |key, value|
           case value
           when NilClass # nil 对象默认给个Stirng?类型
@@ -89,25 +206,22 @@ extension <%="#{@api_name}"%> {
           when String
             swift_model += "  var #{key}: String?\n"
           when Array
-            swift_model += "  var #{key}: [#{key.capitalize}] = []\n"
-            swift_model += generate_model("#{key.capitalize}", value.first)
+            if !value.empty?
+              swift_model += "  var #{key}: [#{key.capitalize}] = []\n"
+              swift_model += generate_model("#{key.capitalize}", 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)
+            swift_model += generate_model("#{key.capitalize}", value, level+1)
           else
             swift_model += "  var #{key}: #{value.class == String ? 'String' : 'Int'}\n"
           end
         end
-        swift_model + "}\n"
+        swift_model + "public init() {}\n}\n"
       end
 
-      def self.createModelAndRequest(target_path, responseJson)
-        swift_model = generate_model("Model", responseJson)
-        File.write(target_path + 'Model.swift', swift_model)
-      end
-
-      # 生成 Swift 模型
-
     end
   end
 end

data/lib/gwtools/version.rb

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

metadata

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