erd_map 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4d072a4862423c842760702dbb6d1e51d749e3dcb53968a53f34a7780962f6
-  data.tar.gz: 5da740ea6a8613083bcb5dcd4274087482189f9cbc0ec8e56e8c4032c4c9e3be
+  metadata.gz: 29ffeeb0cb80e98ef47daa5c5e6a7d9a01f399cba46b13a9e7ad0c2d7ff41a47
+  data.tar.gz: 57dc614a5f358013de14dd8519704474796bccb67ce9ad7fb2f9b7baecb82423
 SHA512:
-  metadata.gz: c887c21acfb720eb0ae8a3a2b5d6aa1caeca816ccf68781384e29a901a2e8dafb30bb6bde4524b3c46319da7ad10e53eb384535c5f01e8733d304cdadd9e86bc
-  data.tar.gz: 0ae4645e25e70ad6b709c37ab2525285bf421ede860b9eed22e0ef307fafcfe29461da9fbbe81430030877a269396b7fca2eea43aed0a39aed8f85760daad8d0
+  metadata.gz: c2e6326744067203d6112deb82a6ba2b0596c8d17763798e5c64747bb6a1ef1573834e7029bc28f111dda5add572aa9c28420a122a559bd388915b08010ecee2
+  data.tar.gz: ab393eda5b85846e8a6d8131912d9e52691974b4bf363caf45a374065933e23ee24d6de16816424bc200af34f8b5cc8610178e161c8edd91d80d5a22a3a06a31

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,

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,38 +71,38 @@ 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,
+        ]
+      end
 
       private
 
-      def initialize
-        @button_set = {
-          left_spacer: left_spacer,
-          selecting_node_label: selecting_node_label,
-          search_box: search_box,
-          zoom_mode_toggle: zoom_mode_toggle,
-          tap_mode_toggle: tap_mode_toggle,
-          display_title_mode_toggle: display_title_mode_toggle,
-          re_layout_button: re_layout_button,
-          zoom_in_button: zoom_in_button,
-          zoom_out_button: zoom_out_button,
-          re_compute_button: re_compute_button,
-          right_spacer: right_spacer,
-        }
-      end
-
       def left_spacer
-        bokeh_models.Spacer.new(width: 0, sizing_mode: "stretch_width")
+        @left_spacer ||= bokeh_models.Spacer.new(width: 0, sizing_mode: "stretch_width")
       end
 
       def right_spacer
-        bokeh_models.Spacer.new(width: 30, sizing_mode: "fixed")
+        @right_spacer ||= bokeh_models.Spacer.new(height: 1, width: 30, sizing_mode: "fixed")
       end
 
       def selecting_node_label
-        bokeh_models.Div.new(
+        @selecting_node_label ||= bokeh_models.Div.new(
           text: "",
           height: 28,
           styles: { display: :flex, align_items: :center },
@@ -109,49 +110,49 @@ module ErdMap
       end
 
       def search_box
-        bokeh_models.TextInput.new(placeholder: "🔍 Search model", width: 200).tap do |input|
+        @search_box ||= bokeh_models.TextInput.new(placeholder: "🔍 Search model", width: 200).tap do |input|
           input.js_on_change("value", custom_js("searchNodes"))
         end
       end
 
       def zoom_mode_toggle
-        bokeh_models.Button.new(label: "Wheel mode: fix", button_type: "default").tap do |button|
+        @zoom_mode_toggle ||= bokeh_models.Button.new(label: "Wheel mode: fix", button_type: "default").tap do |button|
           button.js_on_click(custom_js("toggleZoomMode"))
         end
       end
 
       def tap_mode_toggle
-        bokeh_models.Button.new(label: "Tap mode: association", button_type: "default").tap do |button|
+        @tap_mode_toggle ||= bokeh_models.Button.new(label: "Tap mode: association", button_type: "default").tap do |button|
           button.js_on_click(custom_js("toggleTapMode"))
         end
       end
 
       def display_title_mode_toggle
-        bokeh_models.Button.new(label: "Display mode: title", button_type: "default").tap do |button|
+        @display_title_mode_toggle ||= bokeh_models.Button.new(label: "Display mode: title", button_type: "default").tap do |button|
           button.js_on_click(custom_js("toggleDisplayTitleMode"))
         end
       end
 
       def re_layout_button
-        bokeh_models.Button.new(label: "Re-Layout", button_type: "default").tap do |button|
+        @re_layout_button ||= bokeh_models.Button.new(label: "Re-Layout", button_type: "default").tap do |button|
           button.js_on_click(custom_js("reLayout"))
         end
       end
 
       def zoom_in_button
-        bokeh_models.Button.new(label: "Zoom In", button_type: "primary").tap do |button|
+        @zoom_in_button ||= bokeh_models.Button.new(label: "Zoom In", button_type: "primary").tap do |button|
           button.js_on_click(custom_js("zoomIn",))
         end
       end
 
       def zoom_out_button
-        bokeh_models.Button.new(label: "Zoom Out", button_type: "success").tap do |button|
+        @zoom_out_button ||= bokeh_models.Button.new(label: "Zoom Out", button_type: "success").tap do |button|
           button.js_on_click(custom_js("zoomOut"))
         end
       end
 
       def re_compute_button
-        bokeh_models.Button.new(label: "Re-Compute", button_type: "default").tap do |button|
+        @re_compute_button ||= bokeh_models.Button.new(label: "Re-Compute", button_type: "default").tap do |button|
           button.js_on_click(
             bokeh_models.CustomJS.new(
               args: { button: button },
@@ -189,5 +190,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.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erd_map
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - makicamel