neo4j-meta_model 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13d833527f3508fca4580d9172b9cff349b9a5f
-  data.tar.gz: e8220743ccc9acc90787b66ef7170d57c7ea3791
+  metadata.gz: 50f85430a3cc7e2acc8074edf4a6c2e9f48c4405
+  data.tar.gz: 218c95ae1a5cfcc9c4d635224674093d98bdee1a
 SHA512:
-  metadata.gz: 4ea0cfe86e0d79a5919b94a438719a064bc221120d8ebcf7a00bc07d68bf8f99f064391336ea008eb7ad12cc639a533bb94747e44b29b6fd3cabb7791f900286
-  data.tar.gz: 8f54492ab911f8b4bca8ff62b92cb9a82bdf387ad2f9a08556a35791cdcf7280e7197675d7c59dfe5429b5c5ad5de6c09bd953a5d1f6a11bd0d0ff1b8022f134
+  metadata.gz: b0311c5159ed85369fd6e215f7781e23487fb3a422a8dc2b45a177b86f69a8beca91c9967d598d750f92cb664c5870de4553ac947154e02ee11530aaf15e9a4d
+  data.tar.gz: 937993749747a17a1347249cb80322bf474fe202268d27a93e007a38ad6933c47705f480467ddb8ef8f2e7d0b8a9a5dc1ee5d8ba6fac19ecce7db4f7746faba5

data/app/assets/javascripts/meta_model.js.coffee

@@ -136,6 +136,17 @@ ready = ->
       ).property('from_model', 'to_model')
 
 
+      standardize_name: (->
+        @set 'name', @standardized_name @get('name')
+      ).observes('name')
+
+      standardize_opposite_name: (->
+        @set 'opposite_name', @standardized_name @get('opposite_name')
+      ).observes('opposite_name')
+
+      standardized_name: (name) ->
+        name.replace(/^[\s0-9]/, '').replace(/[^a-zA-Z0-9]+/g, '_').toLowerCase()
+
       standardize_relationship_type: (->
         @set 'relationship_type', @get('relationship_type').replace(/[^a-zA-Z0-9]+/g, '_')
       ).observes('relationship_type')
@@ -205,7 +216,6 @@ ready = ->
 
       actions:
         create: (has_association) ->
-          console.log 'create!'
           has_association.save().then (record) =>
            @transitionToRoute 'has_associations.index'
 

data/app/assets/javascripts/templates/components/has-association-diagram.emblem

@@ -0,0 +1,22 @@
+
+.row.has-associations-row
+  = has_association.from_model.class_name
+  .relationship
+    span.source-join-type
+      = has_association.source_join_type
+    span.source-association-name
+      = has_association.name
+
+    | :
+
+    = has_association.relationship_type
+    span.destination-join-type
+      = has_association.destination_join_type
+    span.destination-association-name
+      = has_association.opposite_name
+
+  i.glyphicon.glyphicon-triangle-right
+  = has_association.to_model.class_name
+
+  = yield
+

data/app/assets/javascripts/templates/has_associations/index.emblem

@@ -1,25 +1,7 @@
-link-to "has_associations.new" | New Association
+.row
+  link-to "has_associations.new" class="btn btn-primary" | New Association
 
-table#has-associations-table.table.table-striped.table-bordered
+.has-association-list
   each has_association in model
-    tr
-      td
-        = has_association.from_model.class_name
-        .relationship
-          span.source-join-type
-            = has_association.source_join_type
-          span.source-association-name
-            = has_association.name
-
-          | :
-
-          = has_association.relationship_type
-          span.destination-join-type
-            = has_association.destination_join_type
-          span.destination-association-name
-            = has_association.opposite_name
-
-        i.glyphicon.glyphicon-triangle-right
-        = has_association.to_model.class_name
-      td
-        a.btn.btn-danger click="delete has_association" DELETE
+    has-association-diagram has_association=has_association
+      a.btn.btn-danger.pull-right click="delete has_association" DELETE

data/app/assets/javascripts/templates/has_associations/new.emblem

@@ -1,22 +1,34 @@
+.well.well-sm
+  p Here you can define an association between two models.
+  p First choose the join type and the source and destination</strong>.
+  p Then give names to the associations.  These should finish the sentence "SOURCE/DESTINATION MODEL has one/many..." (e.g. Person has many <strong>comments</strong> / Comment has one <strong>person</strong>)
+  p Lastly give a relationship type.  This should complete the sentence "SOURCE MODEL ... DESTINATION MODEL" (e.g. Person <strong>wrote_comment</strong> Comment)
+  p Rules
+  ul
+    li For name, opposite name, and relationship type spaces will be converted to underscores (_)
+    li Name and opposite name cannot start with numbers and cannot be upper case
+
 
 form.form-horizontal
   .form-group
     label
       .col-sm-2.control-label Join Type
-      .col-sm-10
-        view "select" content=model.join_types selectionBinding="model.has_association.join_type" class="form-control"
+      .col-sm-4
+        view "select" content=model.join_types selectionBinding="model.has_association.join_type" class="form-control" prompt="Please Select"
+      .col-sm-6
+        has-association-diagram has_association=model.has_association
 
   .form-group
     label
       .col-sm-2.control-label Source Model
       .col-sm-10
-        view "select" content=model.models optionValuePath="content.id" optionLabelPath="content.class_name" selectionBinding="model.has_association.from_model" class="form-control"
+        view "select" content=model.models optionValuePath="content.id" optionLabelPath="content.class_name" selectionBinding="model.has_association.from_model" class="form-control" prompt="Please Select"
 
   .form-group
     label
       .col-sm-2.control-label Destination Model
       .col-sm-10
-        view "select" content=model.models optionValuePath="content.id" optionLabelPath="content.class_name" selectionBinding="model.has_association.to_model" class="form-control"
+        view "select" content=model.models optionValuePath="content.id" optionLabelPath="content.class_name" selectionBinding="model.has_association.to_model" class="form-control" prompt="Please Select"
 
   .form-group
     label

data/app/assets/javascripts/templates/models/edit.emblem

@@ -26,17 +26,15 @@
     .well.property.col-sm-6 class=property.isDirty:has-warning:
       i.glyphicon.glyphicon-remove-circle.close.pull-right click="delete_property property"
 
-      .form-group
-        label
-          .col-sm-2.control-label Name
-          .col-sm-10
-            = focus-input valueBinding="property.name" class="form-control"
-
-      .form-group
-        label
-          .col-sm-2.control-label Type
-          .col-sm-10
-            view "select" content=property_types valueBinding="property.type" class="form-control"
+      label
+        .col-sm-2.control-label Name
+        .col-sm-10
+          = focus-input valueBinding="property.name" class="form-control"
+
+      label
+        .col-sm-2.control-label Type
+        .col-sm-10
+          view "select" content=property_types valueBinding="property.type" class="form-control"
 
 .form-group
   button.btn.btn-danger.pull-right click="delete model.model" DELETE!

data/app/assets/javascripts/templates/models/hierarchy.emblem

@@ -1,8 +1,13 @@
+.well.well-sm
+  p Here you can create new models and edit existing models.
+  p To create a model, enter the model name in the box below and click the button
+  p To edit a model, simply click on a model from the list
+
 .row
   div.col-sm-11
     = input valueBinding="new_model_name" class="form-control" placeholder="Model Name" class="form-control"
-  a.btn.col-sm-1 click='add add_model_name'
-    i.glyphicon.glyphicon-plus
+  a.btn.add-model-btn.col-sm-1 click='add add_model_name'
+    | +
 
 
 model-list node=model class="nested-list-group" id="model-list"

data/app/assets/stylesheets/meta_model.css.scss

@@ -4,6 +4,19 @@
  *= require_self
  */
 
+/* Gotten from: https://github.com/twbs/bootstrap-sass/blob/7d30630bc8d490239b15dce754dfba298a7d5bc2/assets/stylesheets/_bootstrap-sprockets.scss */
+@function twbs-font-path($path) {
+  @return font-path($path);
+}
+
+@function twbs-image-path($path) {
+  @return image-path($path);
+}
+
+$bootstrap-sass-asset-helper: true;
+/* end */
+
+
 #accordion .glyphicon { margin-right:10px; }
  
 #model-list {
@@ -59,9 +72,21 @@ label {
   }
 }
 
+.add-model-btn {
+  font-size: 2em;
+  font-weight: bold;
+  margin: 0;
+  padding: 0;
+  line-height: 1em;
+}
+
 $relationship-arrow-length: 60px;
 
-#has-associations-table {
+.has-association-list .has-associations-row {
+  margin: 3em 0;
+}
+
+.has-associations-row {
   td {
     line-height: 4em;
   }
@@ -110,4 +135,15 @@ $relationship-arrow-length: 60px;
     position: absolute;
     transform: translate(5px,14px);
   }
+
+  .glyphicon-triangle-right {
+    top: -1px;
+    left: -5px;
+
+    &:before {
+      content: '>';
+      font-weight: bold;
+      font-size: 1.4em;
+    }
+  }
 }

data/app/views/layouts/meta_model.html.slim

@@ -19,7 +19,7 @@ body
           = link_to 'Models', root_path
 
         li
-          = link_to 'Admin', meta_path
+          = link_to 'Admin', meta_path + '#/'
 
   .container
     = yield

data/lib/neo4j/meta_model/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module MetaModel
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/test/dummy/config/application.rb

@@ -22,7 +22,7 @@ module MetaModel
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
 
-
+    config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-meta_model
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,7 @@ files:
 - app/assets/javascripts/router.js.coffee
 - app/assets/javascripts/store.js.coffee
 - app/assets/javascripts/templates/application.emblem
+- app/assets/javascripts/templates/components/has-association-diagram.emblem
 - app/assets/javascripts/templates/components/model-list-item.emblem
 - app/assets/javascripts/templates/components/model-list.emblem
 - app/assets/javascripts/templates/has_associations/index.emblem