flammarion 0.1.7 → 0.1.8pre

data/Readme.md

@@ -185,4 +185,4 @@ They are:
  * [leaflet](http://leafletjs.com/)
  * [font awesome](https://fortawesome.github.io/Font-Awesome/)
  * [emojione](http://emojione.com/)
- * [Plotly](htps://plot.ly/)
+ * [Plotly](https://plot.ly/)

data/lib/flammarion/version.rb

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

data/lib/flammarion/writeable.rb

@@ -52,12 +52,25 @@ module Flammarion
       def plot(data, options = {})
         if data.respond_to?(:keys)
           options = options.merge(data)
+          if data.include?(:xy) then
+            data = data.clone
+            data[:x] = data[:xy].map(&:first)
+            data[:y] = data[:xy].map(&:last)
+            data.delete(:xy)
+          end
           data = [data]
         elsif not data.first.respond_to?(:keys)
           data = [{y:data, x:(1..data.size).to_a}.merge(options)]
         end
         @engraving.send_json({action:'plot', id:@id, target:@target, data:data}.merge(options))
       end
+
+      def to_svg
+        svg = nil
+        @engraving.script(%|$('#plot-i9').find('svg')[0].outerHTML|, coffee:false) {|r| svg = r['result'] || "Error"}
+        sleep(0.1) while svg.nil?
+        return svg
+      end
     end
 
     # @!macro [new] escape_options
@@ -138,13 +151,13 @@ module Flammarion
     #   @example
     #     f.plot(100.times.map{rand}, mode: 'markers')
     # @overload plot(dataset, options = {})
-    #   @param [Hash] A hash representing a Plotly dataset
+    #   @param [Hash] A hash representing a Plotly trace
     #   @example
     #     f.plot(x: (1..314).to_a.map{|x| Math.sin(x.to_f / 20.0)}, y:(1..314).to_a.map{|x| Math.sin(x.to_f / 10)}, replace:true)
     #   @example
     #     f.plot(x: [Time.now, Time.now + 24*60*60].map(&:to_s), y: [55, 38], type:'bar', replace:true)
     # @overload plot(datasets, options = {})
-    #   @param [Array<Hash>] An array of Plotly datasets
+    #   @param [Array<Hash>] An array of Plotly traces
     #   @example
     #     f.plot(5.times.map{|t| {y: 100.times.map{rand * t}}})f.plot(5.times.map{|t| {y: 100.times.map{rand * t}}})
     def plot(data, options = {})
@@ -317,9 +330,18 @@ module Flammarion
     #  the options given. Defaults to CoffeeScript
     # @option options [Boolean] :coffee (true) If true, will compile +text+ from
     #  CoffeeScript to JavaScript. If false, will pass text as plain JavaScript
-    def script(text, options = {})
+    def script(text, options = {}, &block)
       data = options.fetch(:coffee, true) ? CoffeeScript.compile(text) : text
-      send_json({action:'script', data:data}.merge(options))
+      id = @engraving.make_id
+      d = nil
+      if block_given?
+        @engraving.callbacks[id] = block
+      else
+        d = DeferredValue.new
+        @engraving.callbacks[id] = Proc.new {|v| d.__setobj__(v["result"])}
+      end
+      send_json({action:'script', data:data, id: id}.merge(options))
+      return d
     end
 
     # Sets CSS styles attributes on the current pane.

data/lib/html/build/javascripts/actions.js

@@ -382,7 +382,15 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       return $("body").html(data.data);
     },
     script: function(data) {
-      return eval(data.data);
+      var r;
+      r = eval(data.data);
+      return this.__parent.send({
+        id: data.id,
+        action: 'callback',
+        source: 'script',
+        original_msg: data,
+        result: r
+      });
     },
     style: function(data) {
       var target;

data/lib/html/build/javascripts/all.js

@@ -7048,7 +7048,15 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
       return $("body").html(data.data);
     },
     script: function(data) {
-      return eval(data.data);
+      var r;
+      r = eval(data.data);
+      return this.__parent.send({
+        id: data.id,
+        action: 'callback',
+        source: 'script',
+        original_msg: data,
+        result: r
+      });
     },
     style: function(data) {
       var target;

data/lib/html/source/javascripts/actions.coffee

@@ -108,7 +108,14 @@ $.extend WSClient.prototype.actions,
     $("body").html(data.data)
 
   script: (data) ->
-    eval(data.data)
+    r = eval(data.data)
+    @__parent.send({
+      id:data.id
+      action:'callback'
+      source:'script'
+      original_msg:data
+      result: r
+      })
 
   style: (data) ->
     target = @__parent.check_target(data)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.8pre
+  prerelease: 5
 platform: ruby
 authors:
 - Zach Capalbo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -3847,9 +3847,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23