erd_map 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860c0712604342f0e495b6ff55da67a041d7b886bfc7e561aa96c0bf848a3290
-  data.tar.gz: 89d513411e0732f0583c1613d7ebb961519f0d1248166204289d0c30419578b2
+  metadata.gz: ed4d072a4862423c842760702dbb6d1e51d749e3dcb53968a53f34a7780962f6
+  data.tar.gz: 5da740ea6a8613083bcb5dcd4274087482189f9cbc0ec8e56e8c4032c4c9e3be
 SHA512:
-  metadata.gz: eba427423e7d20c9246b45a7e87a4785da9ebe38a91c303bcbbfe5203013ab47808aa651857f631383cf46414a21319f294e4c2dbd700379451e49b2107595e0
-  data.tar.gz: 26700b51e97658e85f0cab1f3c4056c50836d4d1a3d60f1cbc4b15ca2e8f4604e25c882d9a91dc5ead1295cca7dc16734fc41316ad7a3395104b4420f67f1acd
+  metadata.gz: c887c21acfb720eb0ae8a3a2b5d6aa1caeca816ccf68781384e29a901a2e8dafb30bb6bde4524b3c46319da7ad10e53eb384535c5f01e8733d304cdadd9e86bc
+  data.tar.gz: 0ae4645e25e70ad6b709c37ab2525285bf421ede860b9eed22e0ef307fafcfe29461da9fbbe81430030877a269396b7fca2eea43aed0a39aed8f85760daad8d0

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/map_builder.rb

@@ -55,13 +55,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 +102,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

@@ -159,19 +159,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
             )
           )

data/lib/erd_map/version.rb

@@ -1,3 +1,3 @@
 module ErdMap
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 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.4
 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