erd_map 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860c0712604342f0e495b6ff55da67a041d7b886bfc7e561aa96c0bf848a3290
-  data.tar.gz: 89d513411e0732f0583c1613d7ebb961519f0d1248166204289d0c30419578b2
+  metadata.gz: ff2d016ce1d70f303ba81a480185f13058d35cb1f0cd98c224637eaadaac481b
+  data.tar.gz: a48d58de84ed40da26d8327aac5fb2241c51ddf1333eca9365398ce72fb79628
 SHA512:
-  metadata.gz: eba427423e7d20c9246b45a7e87a4785da9ebe38a91c303bcbbfe5203013ab47808aa651857f631383cf46414a21319f294e4c2dbd700379451e49b2107595e0
-  data.tar.gz: 26700b51e97658e85f0cab1f3c4056c50836d4d1a3d60f1cbc4b15ca2e8f4604e25c882d9a91dc5ead1295cca7dc16734fc41316ad7a3395104b4420f67f1acd
+  metadata.gz: 0aad4e151277b66e1996d5953552de91f9798e2e566f5b01869cad123c6c7e83cd69f35960cc6741ecda719d77da118b172e63e1b2efc168512663e23153752c
+  data.tar.gz: bdf8341667f56d3ed3ed20a9c3204a485b078a81ee2288942c83e9b6821e22e4e4db989afdbaf677de8529c19e3a0a895930bc3e3c7aac8cd7a4c48486687275

data/README.md

@@ -37,6 +37,8 @@ pyenv global $(pyenv install --list | grep -E '^\s*[0-9]+\.[0-9]+\.[0-9]+$' | ta
 ```bash
 # Install packages, for example with pip
 pip install networkx bokeh scipy
+# with pip3
+pip3 install networkx bokeh scipy
 ```
 
 ## Installation
@@ -59,7 +61,7 @@ Add the following to your `config/routes.rb` and access `/erd_map` in your brows
 
 ```ruby
 Rails.application.routes.draw do
-  mount ErdMap::Engine => "erd_map"
+  mount ErdMap::Engine => "erd_map" if defined?(ErdMap)
 end
 ```
 

data/app/controllers/erd_map/erd_map_controller.rb

@@ -2,30 +2,22 @@
 
 module ErdMap
   class ErdMapController < ApplicationController
-    FILE_PATH = Rails.root.join("tmp", "erd_map", "map.html")
-
     skip_forgery_protection
 
     def index
-      if File.exist?(FILE_PATH)
-        render html: File.read(FILE_PATH).html_safe
+      if File.exist?(ErdMap::MAP_FILE)
+        render html: File.read(ErdMap::MAP_FILE).html_safe
       else
-        _stdout, stderr, status = Open3.capture3("rails runner 'ErdMap::MapBuilder.build'")
-        if status.success?
-          render html: File.read(FILE_PATH).html_safe
-        else
-          render plain: "Error: #{stderr}", status: :unprocessable_entity
-        end
+        pid = spawn("rails erd_map")
+        Process.detach(pid)
       end
     end
 
     def update
-      _stdout, stderr, status = Open3.capture3("rails runner 'ErdMap::MapBuilder.build'")
-      if status.success?
-        head :ok
-      else
-        render json: { message: "Error: \n#{stderr}" }, status: :unprocessable_entity
-      end
+      File.delete(ErdMap::MAP_FILE) if File.exist?(ErdMap::MAP_FILE)
+      pid = spawn("rails erd_map")
+      Process.detach(pid)
+      redirect_to erd_map.root_path, status: :see_other
     end
   end
 end

data/app/views/erd_map/erd_map/index.html.erb

@@ -0,0 +1,7 @@
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    setInterval(() => { window.location.reload() }, 5000)
+  })
+</script>
+
+Computing...

data/config/initializers/erd_map.rb

@@ -1,3 +1,7 @@
 # frozen_string_literal: true
 
-ErdMap.py_call_modules = ErdMap::PyCallModules.new
+module ErdMap
+  TMP_DIR = Rails.root.join("tmp", "erd_map")
+  LOCK_FILE = Rails.root.join("tmp", "erd_map", "task.pid")
+  MAP_FILE = Rails.root.join("tmp", "erd_map", "map.html")
+end

data/lib/erd_map/graph.rb

@@ -99,6 +99,15 @@ module ErdMap
       end
     end
 
+    def nodes_with_i18n_labels
+      return @nodes_with_i18n_labels if @nodes_with_i18n_labels
+      @nodes_with_i18n_labels = {}
+      whole_models.each do |model|
+        @nodes_with_i18n_labels[model.name] = model.model_name.human(default: "")
+      end
+      @nodes_with_i18n_labels
+    end
+
     def association_columns
       return @association_columns if @association_columns
 

data/lib/erd_map/graph_renderer.rb

@@ -42,11 +42,11 @@ module ErdMap
         layoutsByChunkData: graph.layouts_by_chunk.to_json,
         chunkedNodesData: graph.chunked_nodes.to_json,
         nodeWithCommunityIndexData: graph.node_with_community_index.to_json,
-        searchBox: plot.button_set[:search_box],
-        selectingNodeLabel: plot.button_set[:selecting_node_label],
-        zoomModeToggle: plot.button_set[:zoom_mode_toggle],
-        tapModeToggle: plot.button_set[:tap_mode_toggle],
-        displayTitleModeToggle: plot.button_set[:display_title_mode_toggle],
+        searchBox: plot.search_box,
+        selectingNodeLabel: plot.selecting_node_label,
+        zoomModeToggle: plot.zoom_mode_toggle,
+        tapModeToggle: plot.tap_mode_toggle,
+        displayTitleModeToggle: plot.display_title_mode_toggle,
         nodeLabels: {
           titleModelLabel: title_model_label,
           foreignModelLabel: foreign_model_label,
@@ -81,12 +81,14 @@ module ErdMap
 
       columns_label = []
       title_label = []
+      i18n_label = []
       rect_heights = []
       graph.node_names.map do |node_name|
         title_text = format_text([node_name], title: true)
         columns_text = [*title_text.scan("\n"), "\n", format_text(graph.association_columns[node_name])].join
         columns_label << columns_text
         title_label << [title_text, "\n", *columns_text.scan("\n")].join
+        i18n_label << [node_name, graph.nodes_with_i18n_labels[node_name]].compact_blank.join("\n")
 
         padding = 36
         line_count = columns_text.scan("\n").size + 1
@@ -102,6 +104,7 @@ module ErdMap
           radius: graph.node_radius,
           original_radius: graph.node_radius,
           rect_height: rect_heights,
+          i18n_label: i18n_label,
           title_label: title_label,
           columns_label: columns_label,
           fill_color: graph.node_colors,
@@ -181,7 +184,7 @@ module ErdMap
       bokeh_models.LabelSet.new(
         x: "x",
         y: "y",
-        text: "index",
+        text: { field: "i18n_label" },
         source: graph_renderer.node_renderer.data_source,
         text_font_size: "12pt",
         text_color: { field: "text_color" },

data/lib/erd_map/map_builder.rb

@@ -33,19 +33,7 @@ module ErdMap
       bokeh_models.Column.new(
         children: [
           bokeh_models.Row.new(
-            children: [
-              plot.button_set[:left_spacer],
-              plot.button_set[:selecting_node_label],
-              plot.button_set[:search_box],
-              plot.button_set[:zoom_mode_toggle],
-              plot.button_set[:tap_mode_toggle],
-              plot.button_set[:display_title_mode_toggle],
-              plot.button_set[:re_layout_button],
-              plot.button_set[:zoom_in_button],
-              plot.button_set[:zoom_out_button],
-              plot.button_set[:re_compute_button],
-              plot.button_set[:right_spacer],
-            ],
+            children: plot.header,
             sizing_mode: "stretch_width",
           ),
           plot.plot,
@@ -55,13 +43,9 @@ module ErdMap
     end
 
     def save(layout)
-      tmp_dir = Rails.root.join("tmp", "erd_map")
-      FileUtils.makedirs(tmp_dir) unless Dir.exist?(tmp_dir)
-      output_path = File.join(tmp_dir, "map.html")
-
-      bokeh_io.output_file(output_path)
+      bokeh_io.output_file(ErdMap::MAP_FILE.to_s)
       bokeh_io.save(layout)
-      puts output_path
+      puts "[erd_map] #{ErdMap::MAP_FILE} (#{Process.pid})"
     end
 
     def setup_graph_manager(plot)
@@ -106,9 +90,19 @@ module ErdMap
 
     class << self
       def build
-        Rails.logger.info "build start"
+        log "Loading modules starts."
+        ErdMap.load_py_call_modules
+        log "Loading modules completed."
+
+        log "Building map starts."
         new.execute
-        Rails.logger.info "build completed"
+        log "Building map completed."
+      end
+
+      private
+
+      def log(text)
+        puts "[erd_map] #{text} (#{Process.pid})"
       end
     end
   end

data/lib/erd_map/plot.rb

@@ -26,8 +26,8 @@ module ErdMap
       end
     end
 
-    def button_set
-      @button_set ||= ButtonSet.new
+    def header
+      @header.to_a
     end
 
     private
@@ -36,6 +36,7 @@ module ErdMap
 
     def initialize(graph)
       @graph = graph
+      @header = Header.new
       register_callback
     end
 
@@ -70,14 +71,34 @@ module ErdMap
       JS
     end
 
-    class ButtonSet
+    class Header
       extend Forwardable
-      def_delegators :@button_set, :[]
+      ACCESSIBLE_PARTS = [:search_box, :selecting_node_label, :zoom_mode_toggle, :tap_mode_toggle, :display_title_mode_toggle]
+
+      def to_a
+        [
+          :left_spacer,
+          :selecting_node_label,
+          :search_box,
+          :zoom_mode_toggle,
+          :tap_mode_toggle,
+          :display_title_mode_toggle,
+          :re_layout_button,
+          :zoom_in_button,
+          :zoom_out_button,
+          :re_compute_button,
+          :right_spacer,
+        ].map { |name| @header[name] }
+      end
 
       private
 
+      ACCESSIBLE_PARTS.each do |name|
+        define_method(name) { @header[name] }
+      end
+
       def initialize
-        @button_set = {
+        @header = {
           left_spacer: left_spacer,
           selecting_node_label: selecting_node_label,
           search_box: search_box,
@@ -159,19 +180,17 @@ module ErdMap
                 button.disabled = true
                 button.label = "Computing ..."
 
-                fetch("/erd_map", { method: "PUT" })
-                  .then(response => {
-                    if (response.ok) { return response.text() }
-                    else { return response.json().then(json => { throw new Error(json.message) }) }
-                  })
-                  .then(data => { window.location.reload() })
-                  .catch(error => {
-                    alert(error.message)
-                    console.error(error)
-
-                    button.disabled = false
-                    button.label = "Re-Compute"
-                  })
+                const form = document.createElement("form")
+                form.method = "POST"
+                form.action = "/erd_map"
+                form.style.display = "none"
+                const input = document.createElement("input")
+                input.type = "hidden"
+                input.name = "_method"
+                input.value = "PUT"
+                form.appendChild(input)
+                document.body.appendChild(form)
+                form.submit()
               JS
             )
           )
@@ -191,5 +210,9 @@ module ErdMap
         )
       end
     end
+
+    Header::ACCESSIBLE_PARTS.each do |name|
+      public define_method(name) { @header.__send__(name) }
+    end
   end
 end

data/lib/erd_map/version.rb

@@ -1,3 +1,3 @@
 module ErdMap
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/erd_map.rb

@@ -12,8 +12,8 @@ module ErdMap
       @py_call_modules
     end
 
-    def py_call_modules=(py_call_modules)
-      @py_call_modules = py_call_modules
+    def load_py_call_modules
+      @py_call_modules = ErdMap::PyCallModules.new
     end
   end
 end

data/lib/tasks/erd_map_tasks.rake

@@ -1,8 +1,27 @@
 # frozen_string_literal: true
 
 desc "Compute erd_map"
-  task erd_map: :environment do
-  puts "Map computing start."
-  ErdMap::MapBuilder.build
-  puts "Map computing completed."
+task erd_map: :environment do
+  FileUtils.makedirs(ErdMap::TMP_DIR) unless Dir.exist?(ErdMap::TMP_DIR)
+  timeout = 5 * 60
+
+  if File.exist?(ErdMap::LOCK_FILE)
+    pid = File.read(ErdMap::LOCK_FILE).to_i
+
+    if Time.now - File.mtime(ErdMap::LOCK_FILE) > timeout
+      puts "[erd_map] Lock expired. Kill process and remove lock file (pid: #{pid}, file: #{ErdMap::LOCK_FILE})."
+      Process.kill("KILL", pid) rescue nil
+      File.delete(ErdMap::LOCK_FILE)
+    else
+      puts "[erd_map] ErdMap is already computing (pid: #{pid}, file: #{ErdMap::LOCK_FILE})."
+      exit 0
+    end
+  end
+
+  File.open(ErdMap::LOCK_FILE, File::WRONLY|File::CREAT|File::TRUNC, 0644) do |f|
+    f.write(Process.pid)
+    f.flush
+    ErdMap::MapBuilder.build
+  end
+  File.delete(ErdMap::LOCK_FILE)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erd_map
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - makicamel
@@ -68,6 +68,7 @@ files:
 - app/controllers/erd_map/erd_map_controller.rb
 - app/helpers/erd_map/application_helper.rb
 - app/models/erd_map/application_record.rb
+- app/views/erd_map/erd_map/index.html.erb
 - app/views/layouts/erd_map/application.html.erb
 - config/initializers/erd_map.rb
 - config/routes.rb