caravaggio 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c0d90d2672df3cc81691479e1e52a1e7f1deb48
-  data.tar.gz: f1d87ce1735d6344c04b587cdc07694160e525c5
+  metadata.gz: b0dda3dc3ed17236f6cd4eae3b30dcf884e4b730
+  data.tar.gz: 95ae12e8ea864d4ef95268402989bdf16dab5fb3
 SHA512:
-  metadata.gz: ecabd7b1cb1e8b0ce714189c935f76a5fc39427977cdfeb1e6c8f971f4e5ec5995b8564361c9f454f007f711daae95b835afda6f67edd486b1b4e8630a6a6268
-  data.tar.gz: e15e0217418f1089ad832348c7a5c61874292df4153c65b65145c85d03a239bf8053a0186ef24bda103dd7e35df4342a92893f31f46d98761d0b20698fe59db7
+  metadata.gz: 7bdfbc8e4d5dd802f6bd61021835ce49efb8d1e1735d627b2e61c1e3e0e100fc6b3909678bae7863ba48027fb3d8d261e7251a3b8235a51384e2adeae4c7cb7f
+  data.tar.gz: a4ade3b8b7dab76a0a3b7ca057c429aceb7908891d561f29fdfefa9fc1be4a5a8217d89a20163cc0abbb177ac8dd136d39dc0495e0b3cc377614496b1183afe1

data/app/assets/javascripts/caravaggio/caravaggio.js

@@ -62,6 +62,26 @@ function displayModels() {
     .text(d => d["short_name"])
 }
 
+function filterClasses() {
+  filterValue = d3.select("#class_filter").property("value");
+  if(filterValue === "") {
+    console.log("CLEAR ME");
+    d3.selectAll(".class-checker").classed("hidden", false);  
+  } else {
+    for(i = 0; i < models.length; ++i) {
+      if(models[i].id.indexOf(filterValue) == -1) {
+        d3.select(checkboxClassName(models[i])).classed("hidden", true);
+      } else {
+        c = d3.select(checkboxClassName(models[i])).classed("hidden", false);
+      }
+    }
+  }
+}
+
+function checkboxClassName(model) {
+  return "#class_" + model.friendly_name;
+}
+
 function createMarker(defs, name, color) {
   return defs.append("marker")
     .attr('id', name + '-arrowhead')

data/app/assets/stylesheets/caravaggio/caravaggio.css

@@ -31,15 +31,23 @@ div.sidebar {
   padding: 0px 3px;
   height: 85vh;
   min-height: 85vh;
-  overflow-y: scroll;
 }
 
 div.left-sidebar {
   width: 15%;
 }
 
+div.left-sidebar .sidebar-content {
+  overflow-y: scroll;
+  height: 65vh;
+  min-height: 65vh;
+}
+
 div.right-sidebar {
   width: 18%;
+  overflow-y: scroll;
+  height: 85vh;
+  min-height: 85vh;
 }
 
 ul {

data/app/views/caravaggio/canvas/_figure.html.erb

@@ -6,7 +6,7 @@
       <li><%= column.name %> : <%= column.sql_type %></li>
     <% end %>
   </ul>
-  <h3>Associations</h3>
+  <h3>Associations From</h3>
   <ul>
     <% figure.associations.each do |association| %>
       <li>
@@ -21,4 +21,20 @@
       </li>
     <% end %>
   </ul>
+  <ul>
+    <h3>Associations To</h3>
+    <ul>
+      <% @canvas.associations_for(target: figure.name).each do |association| %>
+        <li>
+          <%= association[:source] %> : <%= association[:association_type] %> <%= association[:name] %>
+          <% if association[:options].present? %>
+            <ul>
+              <% association[:options].each do |option, value| %>
+                <li><%= option %> : <%= value %></li>
+              <% end %>
+            </ul>
+          <% end %>
+        </li>
+      <% end %>
+  </ul>
 </div>

data/app/views/caravaggio/canvas/index.html.erb

@@ -19,14 +19,16 @@
         <li><input type="checkbox" name="links_from" id="links_from" onclick="displayModels()" checked/>Links from</li>
         <li><input type="checkbox" name="links_to" id="links_to" onclick="displayModels()" />Links to</li>
         <li><input type="checkbox" name="only_checked" id="only_checked" onclick="displayModels()" />Checked only</li>
+        <li><br/></li>
+        <li><input type="text" name="class_filter" id="class_filter" oninput="filterClasses()" placeholder="Filter" /></li>
       </ul>
     </div>
-    <div>
+    <div class="sidebar-content">
       <h3>Classes</h3>
       <ul>
         <li><%= check_box_tag "ALL", "ALL", false, class: "all-model-checkbox", onclick: "setAllModels(this)" %>ALL</li>
         <% @models.each do |model| %>
-          <li><%= check_box_tag model[:friendly_name], model[:friendly_name], false, data: {class_name: model[:id]}, class: "model-checkbox", onclick: "setModel(this)" %> <%= model[:short_name] %></li>
+          <li class="class-checker" id="class_<%= model[:friendly_name] %>"><%= check_box_tag model[:friendly_name], model[:friendly_name], false, data: {class_name: model[:id]}, class: "model-checkbox", onclick: "setModel(this)" %> <%= model[:short_name] %></li>
         <% end %>
       </ul>
     </div>

data/lib/caravaggio/canvas.rb

@@ -11,7 +11,7 @@ module Caravaggio
       ActiveRecord::Base.descendants.reject{|c| c.abstract_class}.sort{|s1, s2| s1.name <=> s2.name}.each do |model|
         begin
           figure = Figure.new(model)
-          @figures << figure
+          @figures << figure unless figure.habtm?
         rescue => e
           Rails.logger.error "Failed to load #{model.name} with error #{e}"
         end
@@ -22,6 +22,10 @@ module Caravaggio
       @figures.map{|figure| figure.model}
     end
     
+    def associations_for(source: nil, target: nil)
+      associations.select{|assoc| (source.nil? || assoc[:source] == source) && (target.nil? || assoc[:target] == target)}
+    end
+    
     def associations
       if @associations.nil?
         @associations = @figures.map{|figure| figure.associations}.flatten

data/lib/caravaggio/figure.rb

@@ -32,6 +32,11 @@ module Caravaggio
       @to_json ||= to_h.to_json
     end
     
+    # identify HABTM models
+    def habtm?
+      !@source_model.attribute_names.include?("id") && @source_model.name[0..5] == "HABTM_"
+    end
+    
     def model
       @source_model_hash ||= {
         id: name,

data/lib/caravaggio/version.rb

@@ -1,3 +1,3 @@
 module Caravaggio
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caravaggio
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - jdzik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies: []
 description: Shine light on ActiveRecord entities and relationships.
 email: