flammarion 0.1.6 → 0.1.7pre

data/Readme.md

@@ -32,7 +32,7 @@ or add it to your Gemfile.
 
 The easiest way to use Flammarion, is similar to how you might use STDOUT:
 
-_(Note: these examples are inteneded to be run from an interactive session such as IRB or [pry](http://pryrepl.org/). If you wish to use them as part of a script, you should use `f.wait_until_closed` at the end, in order to block termination of the script.)_
+_(Note: these examples are intended to be run from an interactive session such as IRB or [pry](http://pryrepl.org/). If you wish to use them as part of a script, you should use `f.wait_until_closed` at the end, in order to block termination of the script.)_
 
 ```ruby
 require 'flammarion'
@@ -165,7 +165,7 @@ Flammarion is distributed with a bunch of useful tools to make everyone's life e
 They are:
 
  * [ansi up](https://github.com/drudru/ansi_up)
- * [highlihgt.js](https://highlightjs.org/)
+ * [highlight.js](https://highlightjs.org/)
  * [jquery](https://jquery.com/)
  * [jquery transit](http://ricostacruz.com/jquery.transit/)
  * [leaflet](http://leafletjs.com/)

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.6"
+    VERSION = "0.1.7pre"
   end

data/lib/flammarion/writeable.rb

@@ -50,7 +50,12 @@ module Flammarion
       end
 
       def plot(data, options = {})
-        @engraving.send_json({action:'plot', id:@id, target:@target, data:data}.merge(options))
+        unless data.respond_to?(:keys)
+          data = {y:data, x:(1..data.size).to_a}
+        else
+          options = options.merge(data)
+        end
+        @engraving.send_json({action:'plot', id:@id, target:@target, data:[{type:'scatter'}.merge(data)]}.merge(options))
       end
     end
 
@@ -137,10 +142,11 @@ module Flammarion
     #  and zero
     # @note You can press 'a' while hovering the plot to reset the zoom.
     # @return [Plot] A Plot object for manipulation after creation.
-    def plot(values, options = {})
+    def plot(data, options = {})
       id = @engraving.make_id
-      send_json({action:'plot', data:values, id:id}.merge(options))
-      return Plot.new(id, @pane_name, @engraving)
+      p = Plot.new(id, @pane_name, @engraving)
+      p.plot(data, options)
+      return p
     end
 
     # Adds a pretty-printed, colorful display of data or code