lhj-tools 0.1.69 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14aa58ce44752d28082011fef120da1f393585210f16bbae26dbdd97d741b3ff
-  data.tar.gz: fcf24ca4267e6e5b1195880f7f397ef939edaa4ffcedf6898c85d7653951cf39
+  metadata.gz: 016612e3ae63d122d623c3edf0d3d7c2d299c168b65fc00277c21893afb89b69
+  data.tar.gz: 262a3bca5cc53615347fdfd26d8805566ecc2b49fbd2021515448cd0806e4938
 SHA512:
-  metadata.gz: c88954bbf5f6bdd1fcbfdb9ae8f01f9736775775a1fbba6590637c7d26ee93c329b16b9a2956c2386a68ff05d859884e28a310111129bd3d7ef92966a8121e70
-  data.tar.gz: eb1b73442d3bdb83c9ab8284b88d92205f17d29aa9a545d0d8b1acbd3c3b0195e5b753116a9e5d643415f912149659691a1c42f153deb9f0f5da64988cf63f85
+  metadata.gz: 2008b246e8158d34b44db6bdc8fa02a84279c6d387006ebc1df6424ca79de7a664abd1c2788e9647a9a27f8f5fa4a43b45e78d45105eee7e6be435e162d597ed
+  data.tar.gz: 57b1908b366a81aca0e928bf9a57801f1e13673039c75807f3c8256424637c067155d8fceffe60cf6620e6daf17e8ad5735db45d837721ae9e0470abc98a7883

data/lib/lhj/command/yapi.rb

@@ -24,6 +24,7 @@ module Lhj
       def initialize(argv)
         @id = argv.option('id')
         @model_pre_name = argv.option('model-pre')
+        @model_result_name = argv.option('model-name')
         @language = argv.option('lan', 'oc')
         @save = argv.flag?('save', false)
         @sync = argv.flag?('sync', false)
@@ -34,10 +35,9 @@ module Lhj
         @http_headers = []
         @config_id = ''
         @config_model_pre = 'ML'
+        @config_model_name = 'Result'
         @model_default_suffix = 'Model'
         @type_trans = {}
-        @config_model_names = []
-        @model_names = []
         @http_url = ''
         super
       end
@@ -98,15 +98,13 @@ module Lhj
       end
 
       def save_to_file(service_code)
-        @model_names = []
-        model_name = @config_model_names.first
         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")
+        h_file = File.join('.', api_id, sub_folder_name, "#{file_name}.h")
+        m_file = File.join('.', api_id, sub_folder_name, "#{file_name}.m")
+        service_file = File.join('.', api_id, sub_folder_name, "#{model_pre}#{model_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
@@ -145,7 +143,7 @@ module Lhj
         @config_id = config['id']
         @config_model_pre = config['model_pre']
         @config_model_suffix = config['model_suffix']
-        @config_model_names = config['model_names']
+        @config_model_name = config['model_name']
         @type_trans = config['type_trans']
       end
 
@@ -157,6 +155,10 @@ module Lhj
         @model_pre_name || @config_model_pre
       end
 
+      def model_name
+        @model_result_name || @config_model_name
+      end
+
       def model_suffix
         @config_model_suffix || @model_default_suffix
       end
@@ -236,13 +238,9 @@ module Lhj
       end
 
       def gen_model_name(name)
-        n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { $&.upcase }
-        if n.length <= 0
-          n = @config_model_names.detect { |c| @model_names.none? { |na| na.gsub(/#{model_pre}(.*)Model/, '\1').eql?(c) } }
-        end
-        model_name = "#{model_pre}#{n}#{model_suffix}"
-        @model_names << model_name
-        model_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}"
       end
 
       def handle_model(model, &block)
@@ -397,7 +395,7 @@ module Lhj
         return unless data
 
         path = data['path']
-        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('') if path
+        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('') if path
         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.69"
+    VERSION = "0.1.70"
   end
 end

metadata

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