lhj-tools 0.1.79 → 0.1.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d531d2b9b34e70a9e6405ae37eb2b21e984aa76c82574bb8ce064e5860405e86
-  data.tar.gz: af844a9316314bc4b05a98d5be81fcc759459abe7dc58bf3ffb88887ece5d044
+  metadata.gz: 3b9f5da62956cd6f5be84a8db48b90307c8edde017d5bd84729e6e2d93e2b7c4
+  data.tar.gz: bfd72c52e5c8c10412ed1f99e9d14dce9496d00ff78d20ff89aedbf1b847a782
 SHA512:
-  metadata.gz: df4aebc030070433aa08035fd34eb02737a0255b22c75d3c035a7d510752aad7bd29202833b017dd793b7565689eacae7d376d12b78ee214af9ef00556542fbe
-  data.tar.gz: 55ddb46781f6fb6f723312bdc18702416be3b824ce3e47411fd9b017f921cb11e9111229695a691eb2aa166b6c862f1bcab7be7d9c38f4c70004be4443345c69
+  metadata.gz: bc6a0baac57148b1c5feb71940f460873f3d9bae57683ce2f4a3b74fef03f0542b27047fc353ec44874c2904056499b041091a1599332541625ea6d6534489ec
+  data.tar.gz: 5a1723ddeacce9428df22bf2ed4bf583e3f1eaa05fc4a13accb180db381d1a7ab07735e7b6074892f9df2f8f2c84e19b20be7db68ebb565275ab8f6f468d71ca

data/lib/lhj/command/yapi.rb

@@ -64,13 +64,15 @@ module Lhj
         project_id = res_body['data']['project_id']
         project_info = get_project_info(project_id)
         # 1.print request result
-        print_res_body_model(res_body)
+        res_models = print_res_body_model(res_body)
         # 2.print request json body
-        print_req_body_model(res_body) if res_body['data']['req_body_is_json_schema']
+        req_models = print_req_body_model(res_body) if res_body['data']['req_body_is_json_schema']
         # 3.print request param
         print_req_query(res_body['data']) unless res_body['data']['req_body_is_json_schema']
         # 4.print request method
         service_code = print_http_method(res_body['data'], project_info)
+        # print request mock data
+        print_mock_request_data(req_models) unless req_models.empty?
         # 5.save to file
         file_map = save_to_file(service_code) if @save
         # 6.push to git
@@ -97,6 +99,12 @@ module Lhj
         @m_file_array << str
       end
 
+      def puts_mock(str)
+        puts str.green
+        @req_mock_array ||= []
+        @req_mock_array << str
+      end
+
       def sub_folder_name
         return @sub_folder_name if @sub_folder_name
 
@@ -112,14 +120,19 @@ module Lhj
         h_file = File.join('.', sub_folder_name, "#{file_name}.h")
         m_file = File.join('.', sub_folder_name, "#{file_name}.m")
         service_file = File.join('.', sub_folder_name, "#{model_pre}#{name}Service.m")
+        req_mock_file = File.join('.', sub_folder_name, "#{model_pre}#{name}Mock.m")
+
         File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count.positive?
         File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
         File.write(service_file, service_code) if service_code
+        File.write(req_mock_file, @req_mock_array.join("\n")) if @req_mock_array.count.positive?
+
         puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green if @save && !@notify
         {
           h_file: "#{sub_folder_name}/#{file_name}.h",
           m_file: "#{sub_folder_name}/#{file_name}.m",
-          s_file: "#{sub_folder_name}/#{model_pre}#{name}Service.m"
+          s_file: "#{sub_folder_name}/#{model_pre}#{name}Service.m",
+          req_mock_file: "#{sub_folder_name}/#{model_pre}#{name}Mock.m"
         }
       end
 
@@ -237,7 +250,7 @@ module Lhj
 
         puts "\n<===============打印返回数据模型-Begin=====================>\n".green
         models = []
-        handle_model(res_body) do |model|
+        handle_model(res_body, :res) do |model|
           models << model
         end
         case @language
@@ -248,6 +261,7 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印返回数据模型-End=====================>\n".green
+        models
       end
 
       def print_req_body_model(res_json)
@@ -256,7 +270,7 @@ module Lhj
 
         puts "\n<===============打印请求模型-Begin=====================>\n".green
         models = []
-        handle_model(req_body) do |model|
+        handle_model(req_body, :req) do |model|
           models << model
         end
         case @language
@@ -267,6 +281,7 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印请求模型-End=====================>\n".green
+        models
       end
 
       def fetch_res_boy(res_json)
@@ -304,7 +319,7 @@ module Lhj
         end
       end
 
-      def handle_model(model, &block)
+      def handle_model(model, type, &block)
         p_type = model['type']
         p_name = model['name']
         p_properties = model['properties']
@@ -318,12 +333,12 @@ module Lhj
             c_model = { key: k, type: c_type, description: v['description'], default: '' }
             if v['type'].eql?('object') || v['type'].eql?('array')
               o = v['items'] || v
-              o['name'] = gen_model_name(k)
+              o['name'] = gen_model_name(k, type)
               if v['type'].eql?('array') && v['items']['type'].eql?('string')
                 c_model[:type_name] = 'NSString'
               else
                 c_model[:type_name] = o['name']
-                handle_model(o, &block)
+                handle_model(o, type, &block)
               end
             end
             properties << c_model
@@ -333,7 +348,7 @@ module Lhj
         when 'array'
           t = model['items']
           t['name'] = p_name
-          handle_model(t, &block)
+          handle_model(t, type, &block)
         end
       end
 
@@ -506,6 +521,37 @@ module Lhj
         end
 
       end
+
+      def print_mock_request_data(req_models)
+        puts "\n<===============打印Mock Data-Begin=====================>\n".green
+        req_models.each do |model|
+          model_name = model[:name] || ''
+          model_properties = model[:properties]
+          puts_mock "#{model_name} *mock = [[#{model_name} alloc] init];"
+          model_properties.each do |m|
+            puts_mock "/// #{m[:description]}"
+            type = m[:type]
+            case type
+            when 'integer'
+              puts_mock "mock.#{m[:key]} = 0;"
+            when 'number'
+              puts_mock "mock.#{m[:key]} = 0;"
+            when 'float'
+              puts_mock "mock.#{m[:key]} = 0;"
+            when 'double'
+              puts_mock "mock.#{m[:key]} = 0;"
+            when 'object'
+              puts_mock "mock.#{m[:key]} = @{};"
+            when 'array'
+              puts_mock "mock.#{m[:key]} = @[];"
+            else
+              puts_mock "mock.#{m[:key]} = @\"\";"
+            end
+          end
+          puts_mock "\n\n"
+        end
+        puts "\n<===============打印Mock Data-End=====================>\n".green
+      end
     end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.79"
+    VERSION = "0.1.81"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.79
+  version: 0.1.81
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj