python_uml_class 0.2.0 → 0.2.1

data/lib/create_uml_class.rb

@@ -10,6 +10,12 @@ CStruct = Struct.new(:type,
                      :inherit_list,
                      :composition_list)
 
+def get_python_path
+  return @config["python_path"] if @config["python_path"].to_s != ""
+
+  "python"
+end
+
 def get_formatter_path
   return @config["formatter_path"] if @config["formatter_path"].to_s != ""
 
@@ -24,7 +30,11 @@ def print_uml(out, out_list)
       out.push "namespace \"#{o_list.name}\" {"
     elsif o_list.type == :class_end
       pp o_list if o_list.name == ""
-      out.push "class \"#{o_list.name}\" {"
+      if @config["color_class_name"].to_s != "" && o_list.name.match?(/#{@config["color_class_name"]}/)
+        out.push "class \"#{o_list.name}\" ##{@config["class_color"]} {"
+      else
+        out.push "class \"#{o_list.name}\" {"
+      end
       # インスタンス変数の出力
       o_list.var_list.uniq.each do |iv|
         out.push iv
@@ -36,11 +46,29 @@ def print_uml(out, out_list)
       out.push "}"
       # 継承リストの出力
       o_list.inherit_list.each do |ih|
-        out.push "\"#{o_list.name}\" -[##{@config["inherit_color"]}]-|> \"#{ih}\""
+        line_color = @config["inherit_color"]
+        if @config["color_class_name"].to_s != ""
+          if ih.match?(/#{@config["color_class_name"]}/)
+            line_color = @config["class_color"]
+            out.push "class \"#{ih}\" ##{@config["class_color"]}"
+          elsif o_list.name.match?(/#{@config["color_class_name"]}/)
+            line_color = @config["class_color"]
+          end
+        end
+        out.push "\"#{o_list.name}\" -[##{line_color}]-|> \"#{ih}\""
       end
       # compo
       o_list.composition_list.uniq.each do |co|
-        out.push "\"#{o_list.name}\" *-[##{@config["composition_color"]}]- \"#{co}\""
+        line_color = @config["composition_color"]
+        if @config["color_class_name"].to_s != ""
+          if co.match?(/#{@config["color_class_name"]}/)
+            line_color = @config["class_color"]
+            out.push "class \"#{co}\" ##{@config["class_color"]}"
+          elsif o_list.name.match?(/#{@config["color_class_name"]}/)
+            line_color = @config["class_color"]
+          end
+        end
+        out.push "\"#{o_list.name}\" *-[##{line_color}]- \"#{co}\""
       end
     elsif o_list.type == :module_end
       # インスタンス変数がある場合はモジュール名と同じクラスを定義
@@ -49,7 +77,11 @@ def print_uml(out, out_list)
          o_list.inherit_list.size != 0 or
          o_list.composition_list.size != 0
         pp o_list if o_list.name == ""
-        out.push "class #{o_list.name} {"
+        if @config["color_class_name"].to_s != "" && o_list.name.match?(/#{@config["color_class_name"]}/)
+          out.push "class #{o_list.name} ##{@config["class_color"]} {"
+        else
+          out.push "class #{o_list.name} {"
+        end
         # インスタンス変数の出力
         o_list.var_list.uniq.each do |iv|
           out.push iv
@@ -61,11 +93,29 @@ def print_uml(out, out_list)
         out.push "}"
         # 継承リストの出力
         o_list.inherit_list.each do |ih|
-          out.push "\"#{o_list.name}\" -[##{@config["inherit_color"]}]-|> \"#{ih}\""
+          line_color = @config["inherit_color"]
+          if @config["color_class_name"].to_s != ""
+            if ih.match?(/#{@config["color_class_name"]}/)
+              line_color = @config["class_color"]
+              out.push "class \"#{ih}\" ##{@config["class_color"]}"
+            elsif o_list.name.match?(/#{@config["color_class_name"]}/)
+              line_color = @config["class_color"]
+            end
+          end
+          out.push "\"#{o_list.name}\" -[##{line_color}]-|> \"#{ih}\""
         end
         # compo
         o_list.composition_list.uniq.each do |co|
-          out.push "\"#{o_list.name}\" *-[##{@config["composition_color"]}]- \"#{co}\""
+          line_color = @config["composition_color"]
+          if @config["color_class_name"].to_s != ""
+            if co.match?(/#{@config["color_class_name"]}/)
+              line_color = @config["class_color"]
+              out.push "class \"#{co}\" ##{@config["class_color"]}"
+            elsif o_list.name.match?(/#{@config["color_class_name"]}/)
+              line_color = @config["class_color"]
+            end
+          end
+          out.push "\"#{o_list.name}\" *-[##{line_color}]- \"#{co}\""
         end
       end
       out.push "}"
@@ -93,9 +143,9 @@ def create_uml_class(in_dir, _out_file)
 
   Dir.glob("#{in_dir}/**/*.py") do |f|
     puts f
-    puts @config["exclude_path"]
-    if @config["exclude_path"] != ""
-      if f =~ Regexp.new(@config["exclude_path"])
+    if @config && @config["exclude_path"]
+      puts @config["exclude_path"]
+      if @config["exclude_path"] != "" && f =~ Regexp.new(@config["exclude_path"])
         puts "skip #{f}"
         next
       end
@@ -106,7 +156,7 @@ def create_uml_class(in_dir, _out_file)
       # FileUtils.cp(f, tmp_file.path)
       kernel = Facter.value(:kernel)
       if kernel == "windows"
-        open("|#{get_formatter_path} #{f} > #{tmp_file.path}") do |ff|
+        open("|#{get_python_path} #{get_formatter_path} #{f} > #{tmp_file.path}") do |ff|
           if ff.read.to_s != ""
             puts "pylint error #{ff}"
             return
@@ -115,8 +165,8 @@ def create_uml_class(in_dir, _out_file)
           end
         end
       else
-        open("|#{get_formatter_path} #{f} > #{tmp_file.path}") do |ff|
-          puts "|#{get_formatter_path} #{f} > #{tmp_file.path}"
+        open("|#{get_python_path} #{get_formatter_path} #{f} > #{tmp_file.path}") do |ff|
+          puts "|#{get_python_path} #{get_formatter_path} #{f} > #{tmp_file.path}"
           if ff.read.to_s != ""
             puts "pylint error #{ff}"
             return
@@ -135,10 +185,71 @@ def create_uml_class(in_dir, _out_file)
     file_struct_list.push CStruct.new(:class_start, file_name, file_name + ".global", block_count, [], [], [], [])
     file_struct_list.push CStruct.new(:class_end, file_name, file_name + ".global", block_count, [], [], [], [])
     is_def = false
+    local_imports = {}
+    local_classes = []
+
+    in_multiline_string = false
+    multiline_char = nil
+
+    buf.each_line do |line|
+      if line =~ /^\s*class\s+[a-zA-Z0-9_]+/
+        work = line.gsub(/class\s/, "")
+        c_name = work.split("\(")[0].to_s.gsub(/:/, "").strip
+        local_classes.push(c_name)
+      end
+    end
 
     # ソースを解析
     buf.each_line do |line|
-      next if line =~ /^[\r\n]*$/ # 空行は対象外
+      next if line =~ /^\s*$/ # 空行は対象外
+      next if line =~ /^\s*#/ # コメント行は対象外
+
+      clean_line = line.gsub(/\\"/, '').gsub(/\\'/, '')
+      quotes3_double = clean_line.scan(/"""/).size
+      quotes3_single = clean_line.scan(/'''/).size
+
+      if in_multiline_string
+        if multiline_char == '"""' && quotes3_double.odd?
+          in_multiline_string = false
+        elsif multiline_char == "'''" && quotes3_single.odd?
+          in_multiline_string = false
+        end
+        next
+      else
+        if quotes3_double.odd?
+          in_multiline_string = true
+          multiline_char = '"""'
+        elsif quotes3_single.odd?
+          in_multiline_string = true
+          multiline_char = "'''"
+        end
+      end
+
+      if line =~ /^\s*import\s/
+        line.gsub(/import\s/, "").split(",").each do |imp|
+          if imp =~ / as /
+            short_name = imp.split(" as ")[1].strip
+            full_name = imp.split(" as ")[0].strip
+            local_imports[short_name] = full_name
+          else
+            short_name = imp.strip.split(".")[0]
+            full_name = imp.strip
+            local_imports[short_name] = full_name
+          end
+        end
+      elsif line =~ /^\s*from\s/
+        from_module = line.match(/^\s*from\s+([^\s]+)/)[1]
+        line.gsub(/^.*import\s/, "").split(",").each do |imp|
+          if imp =~ / as /
+            short_name = imp.split(" as ")[1].strip
+            orig_name = imp.split(" as ")[0].strip
+            local_imports[short_name] = "#{from_module}.#{orig_name}"
+          else
+            short_name = imp.strip
+            local_imports[short_name] = "#{from_module}.#{short_name}"
+          end
+        end
+      end
 
       line.chomp!
       # ブロックの開始/終了
@@ -185,7 +296,7 @@ def create_uml_class(in_dir, _out_file)
       end
 
       # クラスの開始
-      if line =~ /^\s*class.*:/
+      if line =~ /^\s*class\s+[a-zA-Z0-9_]+/
         work = line.gsub(/class\s/, "")
         class_name = work.split("\(")[0].to_s.gsub(/:/, "")
         base_name = work.match(/\(.*\)/).to_s.gsub(/[()]/, "")
@@ -198,10 +309,13 @@ def create_uml_class(in_dir, _out_file)
         if base_name != ""
           if base_name =~ /,/
             base_name.split(",").each do |name|
-              cstruct_list[-1].inherit_list.push name
+              name = name.strip
+              resolved_name = local_imports[name] || name
+              cstruct_list[-1].inherit_list.push resolved_name
             end
           else
-            cstruct_list[-1].inherit_list.push base_name
+            resolved_name = local_imports[base_name] || base_name
+            cstruct_list[-1].inherit_list.push resolved_name
           end
         end
         next
@@ -247,29 +361,39 @@ def create_uml_class(in_dir, _out_file)
 
       # composition_list
       # クラスの呼び出し箇所
-      line.match(/\s([A-Z][a-zA-Z]+)\.[a-z]/) do |m|
+      line.match(/\s([a-zA-Z][a-zA-Z0-9]+)\.[a-z]/) do |m|
         c_name = m.to_s.split(".")[0].gsub(/ /, "")
         puts "compo c_name=#{c_name}"
-        if cstruct_list.size != 0
-          cstruct_list[-1].composition_list.push c_name
-        else
-          file_struct_list[-1].composition_list.push c_name
+
+        # importされているものだけを対象とする
+        if local_imports.include?(c_name)
+          resolved_name = local_imports[c_name] || c_name
+          if cstruct_list.size != 0
+            cstruct_list[-1].composition_list.push resolved_name
+          else
+            file_struct_list[-1].composition_list.push resolved_name
+          end
         end
       end
 
       # クラスの初期化箇所
-      line.match(/[\s\.][A-Z][A-Za-z]+\(/) do |m|
-        c_name = m.to_s.gsub(/\(/, "").gsub(/[\s\.]/, "")
+      line.scan(/\b([A-Z][A-Za-z0-9_]*)\(/).each do |m|
+        c_name = m[0]
         puts "compo c_name=#{c_name}"
-        if cstruct_list.size != 0
-          cstruct_list[-1].composition_list.push c_name
-        else
-          file_struct_list[-1].composition_list.push c_name
+        
+        # 自分で定義したものとimportされているものだけを対象とする
+        if local_imports.include?(c_name) || local_classes.include?(c_name)
+          resolved_name = local_imports[c_name] || c_name
+          if cstruct_list.size != 0
+            cstruct_list[-1].composition_list.push resolved_name
+          else
+            file_struct_list[-1].composition_list.push resolved_name
+          end
         end
       end
 
       # インスタンス変数
-      if line =~ /^\s*self\.[a-zA-Z0-9_]+\s+=/ and cstruct_list.size != 0
+      if line =~ /^\s*self\.[a-zA-Z0-9_]+(\s*:\s*[^=]+)?\s*=/ and cstruct_list.size != 0
         line.match(/self\.[a-zA-Z0-9_]+/) do |m|
           instance_var = cstruct_list[-1].var_list
           val = m.to_s.gsub(/self\./, "")
@@ -284,19 +408,22 @@ def create_uml_class(in_dir, _out_file)
         end
       end
 
+      # クラス変数・外部変数（グローバル変数）の正規表現
+      var_regex = /^\s*(?!(?:def|class|if|elif|else|while|for|try|except|finally|with|pass|return|yield|import|from|global|nonlocal|assert|del|raise|break|continue)\b)([a-zA-Z0-9_]+)\s*(?::\s*[^=]+|=(?!=))/
+
       # クラス変数
-      if line =~ /^\s*[a-zA-Z0-9_]+\s+=/ and cstruct_list.size != 0 and is_def == false
-        line.match(/[a-zA-Z0-9_]+/) do |m|
+      if line =~ var_regex and cstruct_list.size != 0 and is_def == false
+        line.match(var_regex) do |m|
           instance_var = cstruct_list[-1].var_list
-          val = m.to_s
+          val = m[1].to_s
           instance_var.push "- #{val}"
         end
       end
 
       # 外部変数
-      if line =~ /^\s*[a-zA-Z0-9_]+\s+=/ and cstruct_list.size == 0 and is_def == false
-        line.match(/\$*[a-zA-Z0-9_]+/) do |m|
-          file_struct_list[-1].var_list.push "+ #{m}"
+      if line =~ var_regex and cstruct_list.size == 0 and is_def == false
+        line.match(var_regex) do |m|
+          file_struct_list[-1].var_list.push "+ #{m[1].to_s}"
         end
       end
     end

data/lib/css/index.css

@@ -29,6 +29,12 @@ hr {
     overflow: auto;
 }
 
+.outarea img {
+    max-width: 100%;
+    height: auto;
+    display: block;
+}
+
 .inarea {
     border: thin solid #000000;
     margin: 5px;

data/lib/js/main.js

@@ -384,10 +384,10 @@ function openFile(file) {
 $(document).ready(function () {
 
     // サーバに接続
-    server_connect("ws://localhost:45709/wsserver")
+    server_connect("ws://localhost:41325/wsserver")
     window.onload = function (e) {
         // サーバに接続
-        //server_connect("ws://localhost:45709/wsserver")
+        //server_connect("ws://localhost:41325/wsserver")
     }
 
     // menu
@@ -405,23 +405,37 @@ $(document).ready(function () {
     });
 
     // ウインドウサイズ
-    var width = 800;
-    var height = 600;
+    function adjustOutareaHeight() {
+        var windowHeight = $(window).height();
+        var outareaOffset = $(".outarea").offset().top;
+        var margin = 20; // 下部の余白
+
+        // outareaの開始位置からウィンドウの下端までの高さを計算
+        var newHeight = windowHeight - outareaOffset - margin;
+        
+        // 最小高さを設定（縮小しすぎないように）
+        if (newHeight < 100) {
+            newHeight = 100;
+        }
+
+        $(".outarea").height(newHeight);
+        $(".outarea").width($(window).width() - 40);
+    }
+    
     $(window).resize(function () {
-        $(".outarea").height($(window).height() - 180);
+        adjustOutareaHeight();
     });
+    
     // ウインドウの位置
     $(function () {
-        //window.resizeTo(width, height);
-        //window.moveTo((window.screen.width / 2) - (width / 2), (screen.height / 2) - (height / 2));
-        //window.moveTo(0,0);
-        $(".outarea").height($(window).height() - 180);
+        // DOM要素の高さが確定するのを待ってから調整する
+        setTimeout(adjustOutareaHeight, 200);
     });
 
     $('.outarea').scroll(function () {
         var h = $('.outarea').get(0).scrollHeight - $('.outarea').innerHeight();
         //console.log("scrollEnd=" + Math.abs($('.outarea').scrollTop() - h));
-        if (Math.abs($('.outarea').scrollTop() - h) < 30) {
+        if (Math.abs($('.outarea').scrollTop() - h) < 50) {
             // 最後までスクロールしている
             // 自動スクロールON
             $auto_scroll = true;

data/lib/python_uml_class/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PythonUmlClassVer
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/server.rb

@@ -44,9 +44,21 @@ class Search < Sinatra::Base
     end
     path.gsub!(/[\/]+/, "/")
     puts path
+    
+    base_dir = path.gsub(/\*$/, "")
+    parent_dir = File.expand_path("..", base_dir)
+    
+    if File.directory?(base_dir) && parent_dir != File.expand_path(base_dir)
+      data = {}
+      data["label"] = "../"
+      data["value"] = parent_dir
+      res.push data
+    end
+
     Dir.glob(path, File::FNM_DOTMATCH).each do |file|
       data = {}
       next if File.basename(file) == "."
+      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/lib/start.rb

@@ -2,8 +2,28 @@
 # -*- coding: utf-8 -*-
 $LOAD_PATH << File.dirname(File.expand_path(__FILE__))
 
+require 'rubygems'
+require 'rubygems'
+
+begin
+  require 'bundler/setup'
+rescue LoadError
+  gem 'rack'
+  gem 'rackup'
+end
+
+require 'rack'
+begin
+  require 'rackup'
+  require 'rackup/server'
+rescue LoadError
+  # Fallback to older rack
+  require 'rack/server'
+  Object.const_set("Rackup", Rack) unless defined?(Rackup)
+end
+
+require 'bundler/setup'
 require "socket"
-require "rack"
 require "daemons"
 require "fileutils"
 require "kconv"
@@ -75,17 +95,17 @@ end
 port = get_unused_port
 puts "port=#{port}"
 
-# config.ruの編集
-buf = File.binread("config.ru").toutf8
-buf.gsub!(/port [0-9]+/, "port #{port}")
-File.binwrite("config.ru", buf)
+# config.ruの編集は不要 (Rackup/Server optionsでポートを指定する)
 
 # main.jsの編集
 buf = File.binread("js/main.js").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
+buf.gsub!(/localhost:[0-9]+\/wsserver/, "localhost:#{port}/wsserver")
+# ws://localhost:12345/wsserver のようなパターンの置換をより確実に行う
+buf.gsub!(/ws:\/\/localhost:[0-9]+\/wsserver/, "ws://localhost:#{port}/wsserver")
 File.binwrite("js/main.js", buf)
 
-# index.htaの編集
+# html/index.htmlの編集
 buf = File.binread("html/index.html").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
 File.binwrite("html/index.html", buf)
@@ -122,7 +142,8 @@ begin
   }
 
   # start web server
-  Rack::Server.start
+  server_class = defined?(Rackup::Server) ? Rackup::Server : Rack::Server
+  server_class.start(:Port => port, :config => "config.ru", :server => 'thin')
 rescue
   puts $!
   puts $@

data/lib/wsserver.rb

@@ -50,8 +50,15 @@ class WsServer < Sinatra::Base
           end
         end
         ws.onmessage do |msg|
+          # puts msg  # Do not print raw message that might contain binary/non-ascii
+          msg = msg.force_encoding("UTF-8") if msg.respond_to?(:force_encoding)
           puts msg
-          json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
+          begin
+            json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
+          rescue => e
+            puts "Error reading setting.json: #{e.message}"
+            json = {"setting_list" => []}
+          end
           json_config = config_json_hash(json)
           $app.set_config(json_config)
           if msg =~ /^exec:/

data/python_uml_class.gemspec

@@ -36,6 +36,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "browser_app_base", "~> 0.1"
   spec.add_dependency "facter", "~> 4.2"
+  spec.add_dependency "rack", ">= 3.0"
+  spec.add_dependency "rackup"
+  spec.add_dependency "webrick"
   #spec.add_dependency "rufo", "~> 0.1"
 
   # For more information and examples about making a new gem, check out our