CppUmlClass 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b11ad34c06240ad72f271823c30efae82d3aa7b0effd4fd54df08e36503620e
-  data.tar.gz: 6937f38c94cea4348fa207e5cea4808730adc1f6ac6562b43f7e306d47df4345
+  metadata.gz: a663be325a0c0bc0a2737ee6a80d28e36ceb82e797dd280c7a6dcd2e8622de1f
+  data.tar.gz: f52916b31de6c3bf8c9c2d1ae98d3c64863109a07d2bae0a792bc8dba26e9003
 SHA512:
-  metadata.gz: e39c4b16f51bbffc4b4a0ae02600fa9376d41529147ec33d7962a4ca31a147936b5d7dd3bd6d509d943f31ff2388b113d096b58f5d20ff746fe07df036117335
-  data.tar.gz: 8cc6b000eb2e3397419c7e6f1ce4243aa77ed50d4a375fe8a3a1c19d36e0e093d0cd750eeaa2c065f2e45730b29a2815170db9fe113cd49b5f09fa889aa60e90
+  metadata.gz: f12f7c88cce03eb7ab4cbcdcf247c807fb5390d12dc7c7fae4e20bf0147da888a9b5f386e1e54d86e698694ef0adec9e63b2993779498dfe40ce425dd919aba0
+  data.tar.gz: ae7103faad064ddceacd6d5062c401f0d82e7d90a9be860d093bd6fc589735b7c5fca88816afcb4349d446746472638e10ba59093f075750f092325ade11cd8f

data/lib/CppUmlClass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CppUmlClass
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/create_uml_class.rb

@@ -220,12 +220,12 @@ def composition_list_create(in_dir, out_list)
 
       if cstruct_list.size != 0
         class_block_count = cstruct_list[-1].block_count
+        #puts "comp:#{File.basename(file)}:#{block_count}:line3=#{line}"
         if block_count == (class_block_count - 1) # block_countが一致
           # 関数の終了
-          #puts "comp:method end #{cstruct_list[-1].name}"
+          #puts "comp:#{File.basename(file)}:comp:method end #{cstruct_list[-1].name}"
           cstruct_list.slice!(-1) # 最後の要素を削除
         else
-          #puts "comp:#{File.basename(file)}:#{block_count}:line3=#{line}"
           #puts "#{start_block} : #{end_block}"
           my_class_name = cstruct_list[-1].name
           my_cstruct = out_list.select { |m| m.name == my_class_name }[1]
@@ -243,8 +243,10 @@ def composition_list_create(in_dir, out_list)
             end
           end
           if start_block and end_block # 1行関数
-            cstruct_list.slice!(-1) # 最後の要素を削除
-            #puts "cstruct size=#{cstruct_list.size}"
+            if block_count == (class_block_count - 1) # block_countが一致
+              cstruct_list.slice!(-1) # 最後の要素を削除
+              #puts "comp:#{File.basename(file)}:cstruct size=#{cstruct_list.size}"
+            end
           end
         end
       end

data/lib/server.rb

@@ -47,20 +47,23 @@ class Search < Sinatra::Base
     puts path
     Dir.glob(path, File::FNM_DOTMATCH).each do |file|
       data = {}
-      if File.basename(file) == "."
-        path = Pathname(File.expand_path(file))
-        data["label"] = ".."
-        data["label"] += "/" if path.parent == "/"
-        data["value"] = path.parent.to_s
-        res.push data
-        next
-      end
+      next if File.basename(file) == "."
       next if kind == "dir" and !File.directory?(file)
       data["label"] = File.basename(file)
       data["label"] += "/" if (File.directory?(file))
       data["value"] = File.expand_path(file)
       res.push data
     end
+    if 0 == res.select { |dir| dir["label"] == "../" }.size
+      data = {}
+      pp = Pathname(File.expand_path("#{dir}/#{file}"))
+      data["label"] = "../"
+      data["label"] += "/" if pp.parent == "/"
+      data["value"] = pp.parent.to_s
+      data["value"] = "/" if data["value"] =~ /^[\/]+$/
+      #puts "value = #{pp.parent.to_s}"
+      res.push data
+    end
     JSON.generate res.sort { |a, b| a["value"] <=> b["value"] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CppUmlClass
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masataka Kuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_app_base