Fix not preserving cases of ports

Author: jonnor

README.md

@@ -64,7 +64,6 @@ Also see [./doc/braindump.md](./doc/braindump.md)
 
 * Implement diffing of graph properties
 * Implement basic grouping/heuristics/context to make the diff easier to understand
-* Fix inconsistencies in casing for port names
 
 ### Later
 

examples/connections.yml

@@ -6,7 +6,7 @@
   to: |
     'default' -> IN read(ReadSomething)
     read OUT -> IN unconnected(Frobnitzer)
-  diff: "+ read out -> in unconnected"
+  diff: "+ read OUT -> IN unconnected"
 
 'removed 1 edge':
   format: 'fbp'
@@ -16,21 +16,21 @@
   to: |
     'default' -> IN read(ReadSomething)
     unconnected(Frobnitzer)
-  diff: "- read out -> in unconnected"
+  diff: "- read OUT -> IN unconnected"
 
 'add a string IIP':
   format: 'fbp'
   from: |
     read(ReadSomething)
   to: |
     'myiip' -> read(ReadSomething)
-  diff: '+ "myiip" -> in read'
+  diff: '+ "myiip" -> IN read'
 
 'remove a string IIP':
   format: 'fbp'
   from: |
     'myiip' -> read(ReadSomething)
   to: |
     read(ReadSomething)
-  diff: '- "myiip" -> in read'
+  diff: '- "myiip" -> IN read'
 

examples/exported-ports.yml

@@ -4,24 +4,24 @@
   to: |
     INPORT=read.IN:FILENAME
     'default' -> IN read(ReadSomething)
-  diff: "+ INPORT=read.in:filename"
+  diff: "+ INPORT=read.IN:FILENAME"
 
 'removed inport':
   from: |
     INPORT=read.IN:FILENAME
     'default' -> IN read(ReadSomething)
   to: |
     'default' -> IN read(ReadSomething)
-  diff: "- INPORT=read.in:filename"   #FIXME casing
+  diff: "- INPORT=read.IN:FILENAME"
 
 'renamed inport':
   from: |
     INPORT=read.IN:FILENAME
     'default' -> IN read(ReadSomething)
   to: |
-    INPORT=read.IN:NEWFILENAME
+    INPORT=read.IN:newfilename
     'default' -> IN read(ReadSomething)
-  diff: ".rename INPORT=read.in:newfilename was INPORT=read.in:filename"
+  diff: ".rename INPORT=read.IN:newfilename was INPORT=read.IN:FILENAME"
 
 'added outport':
   from: |
@@ -31,7 +31,7 @@
     INPORT=read.IN:FILENAME
     OUTPORT=read.OUT:OUTPUT
     'default' -> IN read(ReadSomething)
-  diff: "+ OUTPORT=read.out:output"
+  diff: "+ OUTPORT=read.OUT:OUTPUT"
 
 'removed outport':
   from: |
@@ -43,7 +43,7 @@
     INPORT=read.IN:FILENAME
     OUTPORT=read.OUT:OUTPUT
     'default' -> IN read(ReadSomething)
-  diff: "- OUTPORT=read.error:error"   #FIXME casing
+  diff: "- OUTPORT=read.ERROR:ERROR"
 
 'change target of outport':
   from: |
@@ -54,4 +54,4 @@
     INPORT=read.IN:FILENAME
     OUTPORT=read.OUTPUT:OUTPUT
     'default' -> IN read(ReadSomething)
-  diff: ". OUTPORT=read.output:output was OUTPORT=read.out:output"   #FIXME casing
+  diff: ". OUTPORT=read.OUTPUT:OUTPUT was OUTPORT=read.OUT:OUTPUT"

examples/real-life.yml

@@ -38,7 +38,7 @@
     ledchain SHOWN -> IN dummy(Forward)
     ledchain READY -> IN dummyB(Forward)
   diff: |
-    - "true" -> hwspi ledchain
-    + "2" -> pindata ledchain
-    + "3" -> pinclk ledchain
-    - OUTPORT=ledchain.pixelset:pixelset
+    - "true" -> HWSPI ledchain
+    + "2" -> PINDATA ledchain
+    + "3" -> PINCLK ledchain
+    - OUTPORT=ledchain.PIXELSET:PIXELSET

src/diff.coffee

@@ -285,10 +285,10 @@ formatDiffTextual = (diff, options) ->
   return lines.join('\n')
 
 # TODO: validate graph against schema
-readGraph = (contents, type) ->
+readGraph = (contents, type, options) ->
   fbp = require 'fbp'
   if type == 'fbp'
-    graph = fbp.parse contents
+    graph = fbp.parse contents, { caseSensitive: options.caseSensitive }
   else if type == 'object'
     graph = contents
   else
@@ -308,17 +308,18 @@ exports.diff = (from, to, options) ->
   options.format = 'object' if not options.format? 
   options.fromFormat = options.format if not options.fromFormat?
   options.toFormat = options.format if not options.toFormat?
+  options.caseSensitive = true if not options.caseSensitive?
 
-  f = readGraph from, options.fromFormat
-  t = readGraph to, options.toFormat
+  f = readGraph from, options.fromFormat, options
+  t = readGraph to, options.toFormat, options
 
   diff = calculateDiff f, t
   out = formatDiffTextual diff
 
   return out
 
 # node.js only
-readGraphFile = (filepath, callback) ->
+readGraphFile = (filepath, options, callback) ->
   fs = require 'fs'
   path = require 'path'
 
@@ -332,9 +333,9 @@ readGraphFile = (filepath, callback) ->
     return callback null, graph
 
 diffFiles = (fromPath, toPath, options, callback) ->
-  readGraphFile fromPath, (err, fromGraph) ->
+  readGraphFile fromPath, options, (err, fromGraph) ->
     return callback err if err
-    readGraphFile toPath, (err, toGraph) ->
+    readGraphFile toPath, options, (err, toGraph) ->
       return callback err if err
 
       options.format = 'object' # already loaded