grapht 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b0d92ac5111da4102fa9375ed2ff8cd031c36f
-  data.tar.gz: 92e20cc9d8968b744a9e07764620541f5070fc23
+  metadata.gz: 1fe989813b4f6c56f0d18f51aaee1e4bc4f0c45b
+  data.tar.gz: 1f756e623419a70df6c1c2fece60324002c7b878
 SHA512:
-  metadata.gz: d0c14b3abd8022f504200a9c64a4de95291ec02c57dfa482165868179ab897309e1b37105e2ab2281e780cf7a7b40f18176cbb7698ecd514d470947b776fc4e2
-  data.tar.gz: abf23e58cacfa00294bc257a3bbf57d9778ec88b8d5cb76b7a47679f7aa8fa2ed195827cc21e93c77c05fa35a62d9f268f0400d40bf5ac4b30270ba572793249
+  metadata.gz: 8a7c61bc4e4ce2936fac328cc4f033aee666a1e5e2b18b2b75d70a6a010cd7ac7512053f8ada009b5e2200a48bf80119edc013d921b5f070bac4dd293db35634
+  data.tar.gz: 2c77a6970a6841c43fb89f73dee9f21fe83fbddbd38cfe2da835916a6cdf0ddc0d88956fd9846a36a1d5c94142c6d46d480028f4f94942eeb20476ab1ec0fdb1

data/.travis.yml

@@ -7,16 +7,4 @@ rvm:
   - 2.1.0
   - 2.1.1
   - ruby-head
-  - rbx-2
-matrix:
-  include:
-    - rvm: jruby-18mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-  fast_finish: true
+  - rbx-2

data/lib/graph-definitions/bar-horizontal.js

@@ -6,10 +6,13 @@ function(data) {
       svgHeight  = height + margin.top + margin.bottom;
 
   var svg = d3.select("body").append("svg")
-             .style("fill", "none")
+             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
              .attr("width", svgWidth)
              .attr("height", svgHeight)
-             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
+             .style("font-family", "Arial")
+             .style("font-size", "14px")
+             .style("fill", "none")
+             .style("background-color", "#ffffff")
             .append('g')
               .attr('transform', 'translate(' +margin.left+ ',' +margin.top+ ')')
               .style("fill", "none");
@@ -50,22 +53,21 @@ function(data) {
       .data(data)
     .enter().append('rect')
       .attr('class',    'bar')
-      .style('fill',    '#428bca')
-      .attr('opacity',  '0.3')
       .attr('x',        0)
       .attr('y',        function(d) { return y(d.name); })
       .attr('width',    function(d) { return x(d.value); })
-      .attr('height',   y.rangeBand());
+      .attr('height',   y.rangeBand())
+      .style('fill',    '#428bca')
+      .style('opacity',  '0.3')
+      ;
 
-  svg.selectAll('.text')
-    .attr('font-family', 'Arial')
-    .selectAll('label')
+  svg.selectAll('label')
       .attr('fill-opacity', '0.3')
 
   var xAxisElement = svg.append('g')
                      .attr('class',      'x axis')
-                     .style("fill", "none")
                      .attr('transform',  "translate(0," +height+ ")")
+                     .style("fill", "none")
                      .call(xAxis);
 
   var yAxisElement = svg.append('g')
@@ -75,16 +77,14 @@ function(data) {
 
   xAxisElement.selectAll('line')
     .style('fill', 'none')
-    .attr('stroke', 'black')
-    .attr('stroke-width', '1px')
-    .attr('stroke-opacity', 0.1)
-    .attr('shape-rendering', 'geometricPrecision');
+    .style('stroke', 'black')
+    .style('stroke-width', '1px')
+    .style('stroke-opacity', 0.1)
+    .style('shape-rendering', 'geometricPrecision');
 
   xAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial');
+    .style('fill', '#333333');
 
   yAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial');
+    .style('fill', '#333333');
 }

data/lib/graph-definitions/bar-vertical.js

@@ -6,10 +6,13 @@ function(data) {
       svgHeight  = height + margin.top + margin.bottom;
 
   var svg = d3.select("body").append("svg")
-             .style("fill", "none")
+             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
              .attr("width", svgWidth)
              .attr("height", svgHeight)
-             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
+             .style("font-family", "Arial")
+             .style("font-size", "14px")
+             .style("fill", "none")
+             .style("background-color", "#ffffff")
             .append('g')
               .attr('transform', 'translate(' +margin.left+ ',' +margin.top+ ')')
               .style("fill", "none");
@@ -43,17 +46,15 @@ function(data) {
       .data(data)
     .enter().append('rect')
       .attr('class',    'bar')
-      .style('fill',    '#428bca')
-      .attr('opacity',  '0.3')
       .attr('y',        function(d) { return y(d.value); })
       .attr('x',        function(d) { return x(d.name); })
+      .attr('width',    x.rangeBand())
       .attr('height',   function(d) { return height - y(d.value); })
-      .attr('width',    x.rangeBand());
+      .style('fill',    '#428bca')
+      .style('opacity',  '0.3');
 
-  svg.selectAll('.text')
-    .attr('font-family', 'Arial')
-    .selectAll('label')
-      .attr('fill-opacity', '0.3')
+  svg.selectAll('label')
+      .style('fill-opacity', '0.3')
 
   var xAxisElement = svg.append('g')
                      .attr('class',      'x axis')
@@ -67,23 +68,21 @@ function(data) {
 
   xAxisElement.selectAll('line')
     .style('fill', 'none')
-    .attr('stroke', 'black')
-    .attr('stroke-width', '1px')
-    .attr('stroke-opacity', 0.1)
-    .attr('shape-rendering', 'geometricPrecision');
+    .style('stroke', 'black')
+    .style('stroke-width', '1px')
+    .style('stroke-opacity', 0.1)
+    .style('shape-rendering', 'geometricPrecision');
 
   xAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial');
+    .style('fill', '#333333');
 
   yAxisElement.selectAll('line')
     .style('fill', 'none')
-    .attr('stroke', 'black')
-    .attr('stroke-width', '1px')
-    .attr('stroke-opacity', 0.1)
-    .attr('shape-rendering', 'geometricPrecision');
+    .style('stroke', 'black')
+    .style('stroke-width', '1px')
+    .style('stroke-opacity', 0.1)
+    .style('shape-rendering', 'geometricPrecision');
 
   yAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial');
+    .style('fill', '#333333');
 }

data/lib/graph-definitions/donut.js

@@ -6,11 +6,14 @@ function(data) {
       svgHeight  = height + margin.top + margin.bottom,
       radius     = Math.min(width, height) / 2;
 
-  var svg = d3.select("body").append("svg")
-             .style("fill", "none")
+  var svg = d3.select("body").append("svg")             
+             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
              .attr("width", svgWidth)
              .attr("height", svgHeight)
-             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
+             .style("font-family", "Arial")
+             .style("font-size", "14px")
+             .style("fill", "none")
+             .style("background-color", "#ffffff")
             .append('g')
               .attr('transform', 'translate(' +(width/2)+ ',' +(height/2)+ ')')
               .style("fill", "none");
@@ -38,10 +41,9 @@ function(data) {
 
   arcElement.append("text")
             .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
-            .attr("dy", ".35em")
+            .attr("dy", "5px")
             .style('fill', '#FFFFFF')
-            .attr('font-family', 'Arial')
-            .attr('font-weight', 'bold')
+            .style('font-weight', 'bold')
             .style("text-anchor", "middle")
             .text(function(d) { return d.data.name; });
 }

data/lib/graph-definitions/line.js

@@ -16,15 +16,17 @@ function(data) {
       svgHeight  = height + margin.top + margin.bottom;
 
   var svg = d3.select("body").append("svg")
-             .style("fill", "none")
-             .attr("width", svgWidth)
-             .attr("height", svgHeight)
-             .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
+              .attr('viewBox', "0 -10 " +svgWidth+ " " +svgHeight+ "")
+              .attr("width", svgWidth)
+              .attr("height", svgHeight)
+              .style("font-family", "Arial")
+              .style("font-size", "14px")
+              .style("fill", "none")
+              .style("background-color", "#ffffff")
             .append('g')
               .attr('transform', 'translate(' +margin.left+ ',' +margin.top+ ')')
               .style("fill", "none");
 
-
   var x     = d3.scale
                 .linear()
                 .range([0, width])
@@ -70,42 +72,39 @@ function(data) {
 
   lineElements.append('path')
     .attr('class', 'line')
-    .attr('stroke-width', '2px')
-    .attr('opacity',  '0.3')
     .attr('d', function(d) { return line(d.value) })
-    .attr('stroke', function(d) { return color(d.key); });
+    .style('stroke-width', '2px')
+    .style('opacity',  '0.3')
+    .style('stroke', function(d) { return color(d.key); });
 
   lineElements.append('text')
     .datum(function(d) { return { name: d.key, value: d.value[d.value.length - 1] }; })
     .attr('transform', function(d) { return "translate(" +x(d.value.x)+ "," +y(d.value.y)+ ")"; })
     .attr('x', 3)
-    .attr('dy', '.35em')
+    .attr('dy', '5px')
     .style('fill', '#333333')
-    .attr('font-family', 'Arial')
     .text(function(d) { return d.name; });
 
   // axis styling
   xAxisElement.selectAll('line')
     .style('fill', 'none')
-    .attr('stroke', 'black')
-    .attr('stroke-width', '1px')
-    .attr('stroke-opacity', 0.1)
-    .attr('shape-rendering', 'geometricPrecision');
+    .style('stroke', 'black')
+    .style('stroke-width', '1px')
+    .style('stroke-opacity', 0.1)
+    .style('shape-rendering', 'geometricPrecision');
 
   xAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial')
-    .attr('dy', '20px');
+    .attr('dy', '20px')
+    .style('fill', '#333333');
 
   yAxisElement.selectAll('line')
     .style('fill', 'none')
-    .attr('stroke', 'black')
-    .attr('stroke-width', '1px')
-    .attr('stroke-opacity', 0.1)
-    .attr('shape-rendering', 'geometricPrecision');
+    .style('stroke', 'black')
+    .style('stroke-width', '1px')
+    .style('stroke-opacity', 0.1)
+    .style('shape-rendering', 'geometricPrecision');
 
   yAxisElement.selectAll('text')
-    .style('fill', '#333333')
-    .attr('font-family', 'Arial')
-    .attr('dx', '-10px');
+    .attr('dx', '-10px')
+    .style('fill', '#333333');
 }

data/lib/grapht/shell.rb

@@ -5,7 +5,7 @@ module Grapht
     class Error < StandardError; end
 
     CMD = File.join(Grapht::ROOT, 'bin/grapht')
-    ALLOWED_OPTIONS  = %w(-f)
+    ALLOWED_OPTIONS  = %w(-f -i)
 
     def self.exec(type, json_data, options={})
       options = *options.select { |k,v| ALLOWED_OPTIONS.include? k }.flatten

data/lib/grapht/version.rb

@@ -1,3 +1,3 @@
 module Grapht
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/script/grapht.coffee

@@ -1,45 +1,65 @@
 page          = require('webpage').create()
 system        = require('system')
 fs            = require('fs')
+
 thisFile      = system.args[0]
 graphType     = system.args[1]
 graphFormat   = false
-scriptPath    = fs.absolute(thisFile)
-                  .replace(/[\w\s\-\.]+?\.(js|coffee)$/i, '')
+dependencies  = ['d3.min.js', 'json2.js']
+
+scriptPath    = fs.absolute(thisFile).replace(/[\w\s\-\.]+?\.(js|coffee)$/i, '')
 vendorPath    = "#{scriptPath}../vendor/"
 defsPath      = "#{scriptPath}../lib/graph-definitions/"
 userDefsPath  = system.env['EXT_GRAPHT_DEFINITIONS_HOME']
-dependencies  = ['d3.min.js', 'json2.js']
 niceDirPathRX = /\/$|$/
 naughtyPathRX = /(?:\.{1,2}\/)+/
 
-# -----------------------------------------------------------------------------
+
+
+#------------------------------------------------------------------------------
 # Helper Functions
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 fns =
-  # Logs the supplied message, and optional trace to STDERR and exits the process
-  # with an exit code of 1.
-  logError: (message, trace) ->
+  # Logs the supplied message (and, optionally, the trace) to STDERR; then, 
+  # exits the process with the supplied code.
+  #
+  # Return Codes:
+  #    0 - Success
+  #    1 - Naughty Type Path Error
+  #    2 - Graph Defintion Not Found Error
+  #    3 - Graph Dependency Load Error
+  #    4 - Graph Data Not Found Error
+  #    5 - Graph Data Parse Error
+  #   99 - Unexpected Error
+  #
+  logError: (message, code, trace) ->
     fs.write '/dev/stderr', "<ERROR> #{message}\n"
+    fs.write '/dev/stderr', formattedTrace(trace) if trace
+    phantom.exit(code || 99)
 
-    if trace
-      traceString = trace.map (t) -> "\t#{t.file}: on line: #{t.line}"
-      fs.write '/dev/stderr', traceString.join('\n')
 
-    phantom.exit(1)
+  # Returns a formatted version of the trace object so it can 
+  # be sent to std out.
+  #
+  formattedTrace: (trace) ->
+    traceString = trace.map (t) -> "\t#{t.file}: on line: #{t.line}"
+    traceString.join('\n')
 
+    
   # Scrubs-out any leading '/' characters from the type, and raises an error
   # if any naughtier path manipulation is detected.
+  #
   sanitizeType: (type) ->
     if naughtyPathRX.test(type)
-      @logError "Naughty! There will be no backing out of the definition directory!"
+      @logError('Naughty! There will be no backing out of the definition directory!', 1)
 
     type.replace(/^\/+/, '')
 
+
   # Searchs for a valid graph definition in the supplied definition paths.  If
-  # no definition is found, we log an error to STDERR and exit with an exitcode
-  # of 1.
+  # no definition is found, we log an error to STDERR.
+  #
   findDef: (type, defPaths...) ->
     type = @sanitizeType(type)
 
@@ -48,20 +68,29 @@ fns =
       path  = "#{dir}#{type}.js"
       return path if fs.exists(path)
 
-    @logError "No graph definition could be found for '#{type}'"
+    @logError("No graph definition could be found for '#{type}'", 2)
+
+
+  # Reads in the graph defintion file.
+  #  
+  loadDef: (def) -> 
+    fs.read(def)
 
-  loadDef: (def) -> fs.read(def)
 
   # Wraps the supplied graph definition in a function that executes the definition
   # and returns the resulting content of the document body.  This function is intended
   # to minimize boiler-plate in graph definitions, and reduce the likelihood of user
   # error.
+  #
   wrapDef: (def) ->
     "function() {
       (#{def}).apply(this, arguments);
       return document.body.innerHTML;
     }"
 
+  # Returns a hash composed of any optional arguments sent
+  # with a command.
+  #
   getOptions: ->
     optionsIn   = system.args[2..]
     optionsOut  = {}
@@ -73,10 +102,25 @@ fns =
 
     optionsOut
 
+
+  # Returns the value of the format option (nil if not
+  # provided)
+  #
   getFormat: ->
     options = @getOptions()
     options['-f'] || options['--format']
 
+
+  # Returns the value of the include option (nil if not
+  # provided)
+  #
+  getInclude: ->
+    options = @getOptions()
+    options['-i'] || options['--include']
+
+
+  # Reads in json data for the graph.
+  #
   readDataIn: ->
     try
       if (data = fs.read('/dev/stdin')).length
@@ -85,36 +129,59 @@ fns =
         fns.logError('No graph data was received!')
 
     catch err
-      @logError err
-
-
-# -----------------------------------------------------------------------------
+      @logError(err, 4)
+
+
+  # Renders the graph output based on the arguments and 
+  # options provided.
+  #
+  renderGraph: ->
+    # Load all dependencies.
+    dependencies.forEach (dp) ->
+      page.injectJs(dp) || fns.logError("Dependency could not be loaded: #{dp}", 3)
+    
+    # Load and evaluate the graph definition within the context of the 
+    # arguments supplied via STDIN.
+    graphData   = fns.readDataIn()
+    graphDef    = fns.wrapDef fns.loadDef fns.findDef(graphType, userDefsPath, defsPath)
+    parsedData  = try
+                    JSON.parse(graphData)
+                  catch err
+                    fns.logError(err, 5)
+
+    # Configure page to remove extraneous whitespace that comes out
+    # of WebKit. 
+    #
+    # The viewport size eliminates a minimum height of 300px that 
+    # seems to be enforced. It does so by requiring all drawings to 
+    # exapnd the viewport to actual size.
+    page.viewportSize = { width: 1, height: 1 };
+
+    # Set the content.
+    page.content = content = page.evaluate(graphDef, parsedData) 
+    
+    # Write resulting content to stdout.
+    if graphFormat = fns.getFormat()
+      page.render '/dev/stdout', { format: graphFormat, quality: 100 }
+    else
+      fs.write '/dev/stdout', "#{content}\n"
+      
+    # Exit with success code
+    phantom.exit(0)
+    
+        
+      
+#------------------------------------------------------------------------------
 # Core Graph Generation Logic
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 # Configure the page context.
 page.libraryPath = vendorPath
 page.onError     = fns.logError
 
-dependencies.forEach (dp) ->
-  page.injectJs(dp) || fns.logError "could not load #{dp}!"
-
-# load and evaluate the graph definition within the context of the JSON, supplied
-# via STDIN.
-graphData   = fns.readDataIn()
-graphDef    = fns.wrapDef fns.loadDef fns.findDef(graphType, userDefsPath, defsPath)
-graphFormat = fns.getFormat()
-parsedData  = try
-                JSON.parse(graphData)
-              catch err
-                fns.logError(err)
-
-page.content = content = page.evaluate(graphDef, parsedData)
-
-# Write resulting content to STDOUT and exit.
-if graphFormat
-  page.render '/dev/stdout', { format: graphFormat, quality: 100 }
+# Render the graph to std out. If include option provided, pull that
+# in and render graph via callback.
+if included_file = fns.getInclude()
+  page.includeJs(included_file, fns.renderGraph)
 else
-  fs.write '/dev/stdout', "#{content}\n"
-
-phantom.exit()
+  fns.renderGraph()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapht
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Tim Lowrimore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,4 +120,3 @@ test_files:
 - spec/lib/grapht/shell_spec.rb
 - spec/spec_helper.rb
 - spec/support/rspec-prof.rb
-has_rdoc: