lhj-tools 0.1.71 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9994ca666916dfa43e3f9794e85cc6c2c6f0fad59cb7d17cd9ec39338e00ed4
-  data.tar.gz: a77906cc7b4d42cc35a5e44164f37f0b2276894190d516788994bc8ce9511322
+  metadata.gz: ec999ed3fcb4f5fff34b2dc483b5932c77bfd34c59cee78dfcebd7ea1a10fc54
+  data.tar.gz: c0a438db4402ef344ddf83f3acd4f3bca228c9335aa8e8d240bab02ba4745269
 SHA512:
-  metadata.gz: e1bab6ae3305c789e82664f918d8a22e1290ff4cd7fd16eb0b314816ceaf401b932f86164127b3f83cda4c11b97cb6c084fb8eac42da2918679d2ab82c81d737
-  data.tar.gz: 74a00f584c2223ed1a726af3f284047a940dd8d5f02022bf98e2738350759ab0e16d807435281473a8be2c952fe0521390709ca01cf5094bfa50ccb28d7852a6
+  metadata.gz: 9201f7d556c51665acb83d63cbe4978eb6507d99d00b1da5ab92fa064557298242845fec4484d2cf327fc41a6bf1663c3648573627ecb3098338d5c591aa1d04
+  data.tar.gz: 217cc7ee797ee78ab6a074715bf346fc3e044779e2553a20a1b813a63239a3e72611d17e439477912415ba600325ed4f1d597446e213833c6146651419a22a67

data/lib/lhj/command/yapi.rb

@@ -11,12 +11,13 @@ module Lhj
     # generate model from yapi
     class Yapi < Command
       self.summary = '通过yapi接口生成请求'
-      self.description = '更新 ~/.lhj/yapi.yml 文件配置后执行`lhj api`生成接口模型'
+      self.description = '执行`lhj api`生成接口模型'
 
       def self.options
         [
           %w[--id api的id],
           %w[--model-pre 模型的前缀],
+          %w[--model-name 模型的名称],
           %w[--save 保存生成文件]
         ]
       end
@@ -98,13 +99,14 @@ module Lhj
       end
 
       def save_to_file(service_code)
-        file_name = gen_model_name('')
+        name = model_name
+        file_name = gen_model_name
         unless File.exist?(File.expand_path(sub_folder_name, '.'))
           FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.'))
         end
         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}#{model_name}Service.m")
+        service_file = File.join('.', sub_folder_name, "#{model_pre}#{name}Service.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
@@ -159,6 +161,10 @@ module Lhj
         @model_result_name || @config_model_name
       end
 
+      def req_model_name
+        'Param'
+      end
+
       def model_suffix
         @config_model_suffix || @model_default_suffix
       end
@@ -225,7 +231,7 @@ module Lhj
         result = res_body['properties']['detailMsg']
         return unless result['type'] == 'object' || result['type'] == 'array'
 
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name
         result
       end
 
@@ -233,14 +239,18 @@ module Lhj
         return if !res_json || !res_json['data'] || !res_json['data']['req_body_other']
 
         result = JSON.parse(res_json['data']['req_body_other'])
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name(nil, :req)
         result
       end
 
-      def gen_model_name(name)
-        n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
-        n = model_name if n.length <= 0
-        "#{model_pre}#{n}#{model_suffix}"
+      def gen_model_name(property_name = nil, type = :res)
+        name = model_name
+        name = req_model_name if type == :req
+        unless property_name.nil?
+          name = property_name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
+          name = property_name.gsub(/^\w/) { Regexp.last_match(0).upcase } if name.length <= 0
+        end
+        "#{model_pre}#{name}#{model_suffix}"
       end
 
       def handle_model(model, &block)
@@ -395,7 +405,9 @@ module Lhj
         return unless data
 
         path = data['path']
-        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('') if path
+        if path
+          path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('')
+        end
         path_key = "k#{path_name}URL"
         mth = data['method']
         mth = 'JSON' if data['req_body_is_json_schema']

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.71"
+    VERSION = "0.1.73"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.71
+  version: 0.1.73
 platform: ruby
 authors:
 - lihaijian