active_designer 0.0.0 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d531a1fdbca54b0ba042e38941696997af0b9c97
-  data.tar.gz: 63de8eb465600d5748cabb3982e3ff6acedb2639
+  metadata.gz: 9473ab18b3540a1e51362d8d9ac74a763d318508
+  data.tar.gz: 7c2cb8cfb28757ab14a26dba1c229d49025a5cef
 SHA512:
-  metadata.gz: 28c272aea0fa0a3eceda16d0ac66ed6825cc7372c2e2e0bb12194a50ce48aad7e7daaed6f8f2b932adc889c678478831062ed7d91fb636e7065385d9b89bdfca
-  data.tar.gz: dbf124cf9fe64b4b4089dfbec359454a9850474bfbc007f57ec6611a23b59ac84f55b9ddf5baf84690fca0db48a0396612c37b77b71bb47aafaac4cff34ead23
+  metadata.gz: ae61e1234a802e9c3eba1f55d838bdeec3772706e129d9a39a2181f50281495bca196616b450711f2ed13c9221cb720ac8dd4fc5ba1870ee9520ad0542152dab
+  data.tar.gz: 824d6f4a9a6f63012c96179f115883deb6bc78cca7bbe37291255c767e61b9fa72d1bb6e3a1ffca2b4af0b393449569b2ba8b7c75e0df65e5222dc5d166debb8

data/lib/active_designer.rb

@@ -12,7 +12,7 @@ module ActiveDesigner
     end
 
     if command == "--help" || command == "-h"
-      stdout.puts "To create a schema run '$ active-designer create filepath'"
+      stdout.puts "To create a schema run '$ active-designer --create filepath'"
       stdout.puts "If youre in the root of a Sinatra or Ruby on Rails project the filepath should be './db/schema.rb'"
       return 0
     end
@@ -24,11 +24,13 @@ module ActiveDesigner
 
       if !input_path
         stderr.puts "No path was provided, use -h or --help for more information"
+
         return 1
       end
 
       if !File.exist?(input_path)
         stderr.puts "#{input_path.inspect} does not exist, use -h or --help for more information"
+
         return 1
       end
 
@@ -36,6 +38,7 @@ module ActiveDesigner
 
       if File.exist?(output_path) && !overwrite?(stdin, stdout, output_path)
         stderr.puts "Aborted"
+
         return 1
       end
 

data/lib/active_designer/public/js/schema/edit-table-name.js

@@ -39,18 +39,51 @@ function titleBodyClickListener(e) {
 
 function titleUpdate(e) {
   let schema = getSchema();
-  let tableName = $('.table-form')[0].value;
-  $('.table-form')[0].parentElement.outerHTML = tableTitleHTML(tableName);
+  let newTableName = $('.table-form')[0].value;
+  let cards = $('.card');
+  for (var i = 0; i < cards.length; i++) {
+    if ($(cards[i]).find('form').length === 0) {
+      let tableName = $(cards[i]).find('h4.table-title').text().trim()
+      if (tableName === newTableName) {
+        $('.table-form')[0].parentElement.outerHTML = tableTitleHTML(e.data.originalTitle);
+        editTableName();
+        setSchema(schema);
+        return
+        // Should produce an error here
+      }
+    }
+  }
+  $('.table-form')[0].parentElement.outerHTML = tableTitleHTML(newTableName);
   $('[data-toggle="popover"]').popover();
-  if (e.data.originalTitle !== tableName) {
-    let cardID = e.data.cardID;
-    schema[cardID].name = tableName;
-    checkTitleStatus(cardID,schema);
+  let tableID = e.data.cardID;
+  updateRefs(schema[tableID],schema,newTableName)
+  if (e.data.originalTitle !== newTableName) {
+    schema[tableID].name = newTableName;
+    checkTitleStatus(tableID,schema);
   }
   editTableName();
   setSchema(schema);
 }
 
+function updateRefs(table,schema,newTableName) {
+  let refs = $("li[id^='ref-']");
+  for (var i = 0; i < refs.length; i++) {
+    let refName = $(refs[i]).find('span.column-title').text().split('_');
+    refName.pop();
+    refName = refName.join('_');
+    if (refName === table.name) {
+      $(refs[i]).find('span.column-title').text(`${newTableName}_id`);
+      let refID = refs[i].id;
+      let tableID = `tbl-${refID.split('-')[1]}`;
+      let refObj = schema[tableID].references[refID];
+      refObj.foreign_table_name = newTableName;
+      if (!refObj.status.new) {
+        refObj.status.modified = true;
+      }
+    }
+  }
+}
+
 function tableTitleHTML(tableName) {
   return "<h4 class='card-title table-title' data-toggle='popover' data-trigger='hover' data-content='Edit table name'>" +
     tableName +
@@ -62,7 +95,6 @@ function tableTitleFormHTML(priorText) {
 }
 
 function checkTitleStatus(cardID,schema) {
-
   if (schema[cardID].status.new === false) {
     updateTitleStatus(cardID,schema);
   }

data/lib/active_designer/public/js/schema/listeners.js

@@ -1,15 +1,38 @@
-
 function destroyTable(){
   if (openEditChecker()) { return };
   $('.delete-table').unbind('click');
   $('.delete-table').click(function() {
     $(this).popover('dispose');
     let card = $(this).parents('.card');
-    let listItems = card.find('.list-group-item');
-    for(let i = 0; i < listItems.length; i++) {
-      jsPlumb.remove(listItems[i]);
-    };
-    card[0].outerHTML = "";
+    jsPlumb.remove(card);
+    let schema = getSchema();
+    let table  = schema[card[0].id];
+    let status = table.status;
+    if (status.new) {
+      schema[card[0].id] = null;
+    } else {
+      status.deleted = true;
+    }
+
+    refs = $("li[id^='ref-']");
+    for (let i = 0; i < refs.length; i++) {
+      let refEl         = $(refs[i]);
+      let refID         = $(refs[i])[0].id;
+      let foreignCard   = refEl.parents('.card');
+      let foreignCardID = foreignCard[0].id;
+      let refObj        = schema[foreignCardID].references[refID];
+
+      if (refObj.foreign_table_name === table.name) {
+        if (refObj.status.new) {
+          refObj = null;
+        } else {
+          refObj.status.deleted = true;
+        }
+        jsPlumb.remove(refs[i]);
+        jsPlumb.recalculateOffsets(foreignCard);
+      }
+    }
+    setSchema(schema);
   });
 }
 
@@ -19,17 +42,12 @@ function destroyColumn() {
   $('.delete-column').unbind('click')
   $('.delete-column').click(function() {
     $(this).popover('dispose');
-    let column = $(this).parents('.list-group-item')[0];
+    let column = $(this).parents("li[id^='col-']")[0];
     let columnID = column.id;
-    column.outerHTML = "";
+    let card = $(this).parents(".card")[0];
+    jsPlumb.remove(column)
+    jsPlumb.recalculateOffsets(card)
     let tableID = `tbl-${columnID.split('-')[1]}`;
-    let conns = connections[tableID];
-    if (typeof(conns) !== "undefined") {
-      for(let i = 0; i < conns.length; i++) {
-        jsPlumb.repaintEverything()
-        jsPlumb.repaint(conns[i].source)
-      }
-    }
     let columns = schema[tableID].columns
     let status = columns[columnID].status;
     if (status.new) {
@@ -47,17 +65,12 @@ function destroyReference() {
   $('.delete-ref').unbind('click')
   $('.delete-ref').click(function() {
     $(this).popover('dispose');
-    let reference = $(this).parents('.list-group-item')[0];
+    let reference = $(this).parents("li[id^='ref-']")[0];
     let referenceID = reference.id;
     let tableID = `tbl-${referenceID.split('-')[1]}`;
+    let card = $(this).parents(".card")[0];
     jsPlumb.remove(reference);
-    let conns = connections[tableID];
-    for(let i = 0; i < conns.length; i++) {
-      if (conns[i].source) {
-        jsPlumb.repaintEverything()
-        jsPlumb.repaint(conns[i].source)
-      }
-    }
+    jsPlumb.recalculateOffsets(card)
     let references = schema[tableID].references
     let status = references[referenceID].status;
     if (status.new) {
@@ -90,11 +103,14 @@ function newColumnObj(tableID, columnName, columnType, schema) {
 function newRefObj(tableID,foreignTableName,foreignTableID, schema)  {
   let tableNum = tableID.split('-')[1];
   let prevID = 100;
+
+
+
   let columnIDs = Object.keys(schema[`tbl-${tableNum}`].references);
   if (columnIDs.length !== 0) {
     prevID = parseInt(columnIDs[columnIDs.length -1].split('-')[2]);
   }
-  let columnID = `col-${tableNum}-${prevID + 1}`;
+  let columnID = `ref-${tableNum}-${prevID + 1}`;
   return schema[tableID].references[columnID] = {
     id: columnID,
     table_id: tableID,
@@ -104,15 +120,13 @@ function newRefObj(tableID,foreignTableName,foreignTableID, schema)  {
   }
 }
 
-function addColumn() {
+function addColumnDisplay() {
   if (openEditChecker()) { return };
   $('.fa-plus-square').unbind('click');
   $('.fa-plus-square').on('click', null, {}, displayColumnJumbo);
 }
 
-function displayColumnJumbo() {
-  $('body').append(addColumnCardHTML());
-  let card = $(this).parents('.card');
+function refColToggle() {
   $('#column-reference').change(function(){
     if (this.checked) {
       $('.add-column-card').find('.column-html').addClass('hidden')
@@ -122,43 +136,109 @@ function displayColumnJumbo() {
       $('.add-column-card').find('.column-html').removeClass('hidden')
     }
   });
+}
 
+function displayColumnJumboExit() {
   $('.add-column-card .fa-times').click(function() {
     $('.add-column-card')[0].outerHTML = ""
   });
+}
 
-  $('form button').click(function() {
-    let schema = getSchema();
-    let referenceChecked = $('form input#column-reference')[0].checked
-    if (referenceChecked) {
-      let foreignTableName = $('form input#foreign-table-name').val()
-      let cardIDs = Object.keys(schema)
-      for(let i = 0; i < cardIDs.length; i++) {
-        if (schema[cardIDs[i]].name === foreignTableName) {
-          let referenceRelationship = $('input[name="ref-rel"]:checked').val()
-          let foreignTableHTML = $(`#${cardIDs[i]}`);
+function addEmptyTableToSchema(tableName = "table_name") {
+  tableID = `tbl-${newTableID}`;
 
-          let prevRefs = schema[card[0].id].references
-          let prevRefKeys = Object.keys(prevRefs)
-          let prevStatus = false
-          for(let i = 0; i < prevRefKeys.length; i++) {
-            if (prevRefs[prevRefKeys[i]].foreign_table_name === foreignTableName) {
-              prevStatus = true
-            }
-          }
-          if (!prevStatus) {
-            let foreignKeyHTML = foreignTableHTML.find(`#${foreignTableHTML[0].id}-id-column`);
-            let listGroup = card.find('.list-group');
-            let refObj = newRefObj(card[0].id, foreignTableName, foreignTableHTML[0].id, schema);
-            listGroup.append(columnHTML({id: refObj.id, type: "integer", name: `${foreignTableName}_id`},"delete-ref"));
-            let newColumnHTML = $(`#${refObj.id}`)[0]
-            createConnector(newColumnHTML,foreignKeyHTML);
-          }
-          else {
+  let schema = getSchema();
+  schema[tableID] = {
+    name: tableName,
+    original_name: null,
+    columns: {},
+    references: {},
+    status: { original: false, modified: false, new: true, deleted: false },
+    id: tableID
+  };
+  setSchema(schema);
+  return schema[tableID]
+}
+
+function createNewRef(schema,currentTableHTML) {
+  let foreignTableName = $('form input#foreign-table-name').val()
+  let cardIDs          = Object.keys(schema)
+  for(let i = 0; i < cardIDs.length; i++) {
+    if (schema[cardIDs[i]].name === foreignTableName) {
+      let referenceRelationship = $('input[name="ref-rel"]:checked').val();
+      let foreignTableHTML      = $(`#${cardIDs[i]}`);
+
+      if (referenceRelationship === "mtm" ) {
+        let currentTableName         = currentTableHTML.find('h4.table-title').text().trim();
+        let joinTableName            = createJoinTableName(currentTableName, foreignTableName);
+        for(let i = 0; i < cardIDs.length; i++) {
+          if (schema[cardIDs[i]] && schema[cardIDs[i]].name === joinTableName) {
             console.log("already happend")
+            return
           }
         }
+        let joinTableObj             = addEmptyTableToSchema(joinTableName);
+        $('.jsPlumbBoundary').append(tableHTML(joinTableName,500,500));
+        let joinTableHTML            = $(`#${joinTableObj.id}`);
+        setCardDraggable(joinTableHTML)
+        let foreignTableIDColumnHTML = foreignTableHTML.find(`#${foreignTableHTML[0].id}-id-column`);
+        let currentTableIDColumnHTML = currentTableHTML.find(`#${currentTableHTML[0].id}-id-column`);
+        let currentRefObj            = newRefObj(currentTableHTML[0].id, joinTableName, joinTableObj.id, schema);
+        let foreignRefObj            = newRefObj(foreignTableHTML[0].id, joinTableName, joinTableObj.id, schema);
+        let joinTableListGroup       = joinTableHTML.find('.list-group');
+        joinTableListGroup.append(columnHTML({id: currentRefObj.id, type: "integer", name: `${currentTableName}_id`},"delete-ref"));
+        joinTableListGroup.append(columnHTML({id: foreignRefObj.id, type: "integer", name: `${foreignTableName}_id`},"delete-ref"));
+        let joinTableCurrentKeyHTML  = $(`#${currentRefObj.id}`)[0];
+        let joinTableForeignKeyHTML  = $(`#${foreignRefObj.id}`)[0];
+        createConnector(joinTableCurrentKeyHTML,currentTableIDColumnHTML);
+        createConnector(joinTableForeignKeyHTML,foreignTableIDColumnHTML);
+        newTableID += 1;
+      } else {
+
+        let prevRefs = schema[currentTableHTML[0].id].references
+        let prevRefKeys = Object.keys(prevRefs)
+        let prevStatus  = false
+        for(let i = 0; i < prevRefKeys.length; i++) {
+          if (prevRefs[prevRefKeys[i]].foreign_table_name === foreignTableName) {
+            prevStatus = true
+          }
+        }
+        if (!prevStatus) {
+          let foreignKeyHTML = foreignTableHTML.find(`#${foreignTableHTML[0].id}-id-column`);
+          let listGroup      = currentTableHTML.find('.list-group');
+          let refObj         = newRefObj(currentTableHTML[0].id, foreignTableName, foreignTableHTML[0].id, schema);
+          listGroup.append(columnHTML({id: refObj.id, type: "integer", name: `${foreignTableName}_id`},"delete-ref"));
+          let newColumnHTML  = $(`#${refObj.id}`)[0]
+          createConnector(newColumnHTML,foreignKeyHTML);
+        }
+        else {
+          console.log("already happend")
+        }
       }
+    }
+  }
+}
+
+function createJoinTableName(firstName, secondName) {
+  if (firstName < secondName) {
+    return `${firstName}_${secondName}`;
+  } else {
+    return `${firstName}_${secondName}`;
+  }
+}
+
+function displayColumnJumbo() {
+  $('body').append(addColumnCardHTML());
+  let card = $(this).parents('.card');
+
+  refColToggle()
+  displayColumnJumboExit()
+  $('form button').click(function() {
+    let schema = getSchema();
+    let referenceChecked = $('form input#column-reference')[0].checked
+    if (referenceChecked) {
+      createNewRef(schema,card)
+      schema = getSchema()
     } else {
       let columnName = $('form input#column-name').val()
       let columnType = $('form select#column-type-select').val()
@@ -199,7 +279,6 @@ function addColumnCardHTML() {
   "</div>"
 }
 
-
 function foreignTableRadioButtonHTML() {
   return "<div class='reference-html hidden'>" +
     "<div class='form-group'>" +
@@ -207,7 +286,7 @@ function foreignTableRadioButtonHTML() {
     "</div>" +
     "<div class='form-check'>" +
       "<label class='form-check-label'>" +
-        "<input class='form-check-input' type='radio' name='ref-rel' id='ref-rel-mto' value='mto'>" +
+        "<input class='form-check-input' type='radio' name='ref-rel' id='ref-rel-mto' value='mto' checked >" +
         " Many to one reference" +
       "</label>" +
     "</div>" +
@@ -258,7 +337,7 @@ function datatypeSelectoHTML() {
 function addListeners(){
   destroyTable()
   editTableName()
-  addColumn()
+  addColumnDisplay()
   destroyColumn()
   destroyReference()
   $('[data-toggle="popover"]').popover()

data/lib/active_designer/public/js/schema/main.js

@@ -53,20 +53,6 @@ $(document).ready(function() {
     addTableByClick("table_name")
   })
 
-  function addEmptyTableToSchema() {
-    tableID = `tbl-${newTableID}`;
-    let schema = getSchema();
-    schema[tableID] = {
-      name: "table_name",
-      original_name: null,
-      columns: {},
-      references: {},
-      status: { original: false, modified: false, new: true, deleted: false },
-      id: tableID
-    };
-    setSchema(schema);
-  }
-
   createSchemaFromParams()
 
 });

data/lib/active_designer/public/js/schema/table-html.js

@@ -7,12 +7,12 @@ function tableHTML(tableName,tableX,tableY) {
       "</h4>" +
       "<div class='table-nav-buttons'>" +
         "<i class='fa fa-plus-square' data-toggle='popover' data-trigger='hover' data-content='Add column'></i>" +
-        "<i class='fa fa-trash' data-toggle='popover' data-trigger='hover' data-content='Destroy table'></i>" +
+        "<i class='fa fa-trash delete-table' data-toggle='popover' data-trigger='hover' data-content='Destroy table'></i>" +
       "</div>" +
     "</div>" +
     "<div class='card-block'>" +
       "<ul class='list-group'>" +
-        "<li class='list-group-item' >" +
+        `<li class='list-group-item' id='tbl-${newTableID}-id-column' >` +
           "<span class='tag tag-default float-xs-left type-span'>integer</span>" +
           "<div class='column-title-outer' >" +
             "<span class='column-title' >id</span>" +

data/lib/active_designer/template.html.erb

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>SQL Helper</title>
+  <title>Active Designer</title>
   <link rel="stylesheet" href="<%= @path %>/public/css/bootstrap.min.css">
   <script src="<%= @path %>/public/js/tether.min.js"></script>
   <script src="<%= @path %>/public/js/jquery-3.1.1.js"></script>
@@ -111,8 +111,9 @@
       <% end %>
     </div>
   </div>
-  <script>localStorage.setItem("schema",JSON.stringify(<%= @schema %>))</script>
-  <!-- <script>localStorage.setItem("schema",JSON.parse(<%= @schema %>))</script> -->
+  <script>
+    localStorage.setItem("schema",JSON.stringify(<%= @schema %>))
+  </script>
 
 </body>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_designer
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.3
 platform: ruby
 authors:
 - Thom Schlereth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies: []
 description: Active Designer is a gem that allows a user to easily create a visual
   format of their Active Record schema.rb file for an SQL database. With just one