CppUmlClass 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8504de4c9118c846499f11af1ef896b3dc88ff8d4f00d3f6011e52a6b1a79f
-  data.tar.gz: 0d45624d9d2089800b0bd66cc9e58cdcd69409b903fdc7b84b01b1bac1211d6a
+  metadata.gz: a663be325a0c0bc0a2737ee6a80d28e36ceb82e797dd280c7a6dcd2e8622de1f
+  data.tar.gz: f52916b31de6c3bf8c9c2d1ae98d3c64863109a07d2bae0a792bc8dba26e9003
 SHA512:
-  metadata.gz: 569cc2d319a77e8e914af09983071b55b1a6d429fa8dae0ed44127e8320b95402f8cacfca8ce0344d0d6d08fd2d615a0f25aeb8a522cf3dba50bf3394e9fdfad
-  data.tar.gz: 8440742f0a2628cdfccaf195d8a1ed3621ad2841eafdc0e3059f44649d0eb252f4472e8663a4141d891085e5e2e2c0cdd3e6015922e69141f0b2638740bd9571
+  metadata.gz: f12f7c88cce03eb7ab4cbcdcf247c807fb5390d12dc7c7fae4e20bf0147da888a9b5f386e1e54d86e698694ef0adec9e63b2993779498dfe40ce425dd919aba0
+  data.tar.gz: ae7103faad064ddceacd6d5062c401f0d82e7d90a9be860d093bd6fc589735b7c5fca88816afcb4349d446746472638e10ba59093f075750f092325ade11cd8f

data/lib/CppUmlClass/version.rb

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

data/lib/create_uml_class.rb

@@ -181,10 +181,17 @@ def composition_list_create(in_dir, out_list)
 
       # ブロックの開始/終了
       if line.match(/\{/)
-        block_count += 1
+        block_count += line.each_char.select { |c| c == "{" }.size
+        start_block = true
+      else
+        start_block = false
       end
+      # ブロックの終了
       if line.match(/\}/)
-        block_count -= 1
+        block_count -= line.each_char.select { |c| c == "}" }.size
+        end_block = true
+      else
+        end_block = false
       end
       #puts "comp:block_count=#{block_count}"
 
@@ -202,34 +209,24 @@ def composition_list_create(in_dir, out_list)
       end
       # 関数の開始
       #if line =~ /^\S+::\S+/
-      if line.gsub(/<.*>/, "") =~ /^\S.*(\S+)::(\S+).*\(.*{$/ and
+      if line.gsub(/<.*>/, "") =~ /^\S.*(\S+)::(\S+).*\(.*{/ and
          (File.extname(file) == ".cpp" or File.extname(file) == ".hpp")
-        #puts "comp:method start"
-        #class_name = line.match(/(\w+)(?=<\w*,?\s*\w*>?::\w+\(\))/).to_s
-        #class_name = line.match(/(\w+)(?=::\S+\(\))/).to_s if class_name == ""
-        #class_name = line.match(/(\w+(?:::\w+)*)(?=::\w+\(.*\))/).to_s if class_name == ""
-        #class_name = class_name.split("::")[1] if class_name =~ /::/
         line.gsub(/<.*>/, "").match(/(\w+)(?=\S+\()/) do |m|
           #puts "comp:class_name=#{m}"
           cstruct_list.push CStruct.new(:method_start, m.to_s, block_count, [], [], [], [])
           break
         end
-
-        #puts "class_name=[#{class_name}]"
-        #if class_name != ""
-        #  cstruct_list.push CStruct.new(:method_start, class_name, block_count, [], [], [], [])
-        #  next
-        #end
       end
 
       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]
           #pp my_cstruct
@@ -245,6 +242,12 @@ def composition_list_create(in_dir, out_list)
               end
             end
           end
+          if start_block and end_block # 1行関数
+            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
     end
@@ -314,15 +317,8 @@ def create_uml_class(in_dir, out_file)
           puts file
           next
         end
-        #if out_list.size != 0 and out_list[-1].type == :class_start # classが連続している
-        #  class_name = out_list[-1].name + "." + class_name
-        #  out_list[-1].name = class_name
-        #  cstruct_list[-1].name = class_name
-        #else
         out_list.push CStruct.new(:class_start, class_name, block_count, [], [], [], [])
         cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
-        #end
-        #pp line if class_name == ""
         base_name.each do |name|
           name.gsub!(/,/, "")
           #puts "base_name=#{name}"
@@ -453,7 +449,7 @@ if $0 == __FILE__
   #exit
   #buf = update_source(ARGV[0])
   #puts buf
-  @config = { "exclude_path" => "test" }
+  @config = { "exclude_path" => "" }
 
   if true
     puts create_uml_class(ARGV[0], ARGV[1])

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.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masataka Kuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-09 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_app_base