gwtools 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d8d1c08e191ea5994386b5ffa6ff37ead560cf421bacf85bc5378cabbff27d
-  data.tar.gz: 72b8d9b5c16ca85bc8dd2ae93451f03b09aea284fd617554647eb74c9ba52df9
+  metadata.gz: cd2b37aeec182ef52a494b197f0eb4abfe9405e440efa2e2ab3b79b9c810e044
+  data.tar.gz: 3734ca2671df99c5a879ec5a5a5a336fab43f6e96028900f9ecf68baaffa9081
 SHA512:
-  metadata.gz: 6a8bfa15a1f9f640e62796a01c1cb0475705a62b4ab5860ed9e6d98fb4c2f9f039f6b84951961b63c3cb155a6cb7333cb295764c4c4270647eeef83a7a91a267
-  data.tar.gz: b79801bece0b7663e9ff5cc3048147964d89df2a6531473fcf1670a7b4ad300ad9e4aae1ae3a368f852570085056394afaedf5a09d3ca1ce522d92cd9b8a1f58
+  metadata.gz: 259ec36cc9e7cb1ea91f86ac6c646a69375103ccd005e5c9d86629a91ac442cd642804b0c04807c81d5ac0878a541b7eedbafd70417ee2a68910ae0aa914aeab
+  data.tar.gz: ed034226ac174115a66b2e16173b33afb0057c1797453c292010759fa190e4804b55d6f174c1743d35b069a9adcb4cdac303dbaba3091e0f3b6964c22e442b23

data/lib/gwtools/generate/swift.rb

@@ -116,7 +116,7 @@ public extension <%="#{@api_name}"%> {
       end
 
       def self.getPrefixPath(dir_path)
-        prefixPaths = %w[app-api/api/v1.0 app-api/api/v2.0]
+        prefixPaths = %w[app-api/api/v1.0 app-api/api/v2.0 community-app-api/app-api/api/v1.0]
 
         prefixPaths.each do |prefix_path|
           return prefix_path.gsub(/^\/|\/$/, "") if dir_path.start_with?(prefix_path)
@@ -159,7 +159,7 @@ public extension <%="#{@api_name}"%> {
           app_name = "AppAPI"
         end
         if dir == 'restful'
-          swift_model = generate_model("#{httpMethod.capitalize.chomp}Model", responseJson)
+          swift_model = generate_model("#{httpMethod.capitalize.chomp}Model", responseJson, 'data')
           prefixPath = getPrefixPath(url_path)
 
           return unless !prefixPath.empty?
@@ -232,64 +232,69 @@ public extension <%="#{@api_name}"%> {
         end
 
       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
-          return ''
+      def self.generate_model(name, json_data, root_path = '')
+        # 找到真实数据(data)所在位置
+        if !root_path.empty?
+          json_data = json_data[root_path]
+          if json_data.all? { |element| element.is_a?(Hash) }
+            json_data = json_data.inject(:merge)
+          end
         end
 
-        if level == 0
-          # 找到 真正要处理的 data 数据
+        swift_model = ''
+        case json_data
+        when String
+          return "var #{name}: [String] = []\n"
+        when Float
+          return "var #{name}: [Float] = []\n"
+        when Integer
+          return "var #{name}: [Int] = []\n"
+        when Array
+          return ''
+        when Hash
+          swift_model += "struct #{name}: HandyJSON {\n"
+          # generate_model(name, json_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
+            case value
+            when NilClass # nil 对象默认给个Stirng?类型
+              swift_model += "  var #{key}: String?\n"
+            when FalseClass
+              swift_model += "  var #{key}: Bool = false\n"
+            when TrueClass
+              swift_model += "  var #{key}: Bool = false\n"
+            when Float
+              swift_model += "  var #{key}: Float = 0.0\n"
+            when Integer
+              swift_model += "  var #{key}: Int = 0\n"
+            when String
+              swift_model += "  var #{key}: String?\n"
+            when Array
+              if value.count > 0
+                if value.all? { |element| element.is_a?(Hash) }
+                  merged_hash = value.inject(:merge)
+                  swift_model += "var #{key}: [#{capitalize_first_letter(key)}Model]?\n"
+                  swift_model += generate_model("#{capitalize_first_letter(key)}Model", merged_hash)
+                else
+                  swift_model += generate_model(key, value[0])
+                end
+              else
+                swift_model += "var #{key}: [Any]?\n"
               end
-            end
-          end
-        end
-
-        swift_model = "struct #{name}: HandyJSON {\n"
-        json_data.each do |key, value|
-          case value
-          when NilClass # nil 对象默认给个Stirng?类型
-            swift_model += "  var #{key}: String?\n"
-          when FalseClass
-            swift_model += "  var #{key}: Bool = false\n"
-          when TrueClass
-            swift_model += "  var #{key}: Bool = false\n"
-          when Float
-            swift_model += "  var #{key}: Float = 0.0\n"
-          when Integer
-            swift_model += "  var #{key}: Int = 0\n"
-          when String
-            swift_model += "  var #{key}: String?\n"
-          when Array
-
-            if !value.empty?
-              swift_model += "  var #{key}: [#{capitalize_first_letter(key)}] = []\n"
-              swift_model += generate_model("#{capitalize_first_letter(key)}", value.first, level+1)
+            when Hash
+              swift_model += "var #{key}: #{capitalize_first_letter(key)}Model?\n"
+              swift_model += generate_model("#{capitalize_first_letter(key)}Model", value)
             else
-              swift_model += "  var #{key}: [Any] = []\n"
+              swift_model += "var #{key}: #{value.class}?\n"
             end
-          when Hash
-            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
+          swift_model + "public init() {}\n}\n"
+        else
+          return swift_model
         end
-        swift_model + "public init() {}\n}\n"
       end
 
     end

data/lib/gwtools/version.rb

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

metadata

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