flammarion 0.1.7pre2 → 0.1.7

data/LICENSE

@@ -103,3 +103,45 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## Emojione
+
+Emoji provided free by [Emoji One](http://emojione.com)
+
+#### Emoji One Artwork
+
+*  Applies to all PNG and SVG files as well as any adaptations made.
+*  License: Creative Commons Attribution 4.0 International
+*  Human Readable License: http://creativecommons.org/licenses/by/4.0/
+*  Complete Legal Terms: http://creativecommons.org/licenses/by/4.0/legalcode
+
+
+#### Emoji One Non-Artwork
+
+*  Applies to the Javascript, JSON, PHP, CSS, HTML files, and everything else not covered under the artwork license above.
+*  License: MIT
+*  Complete Legal Terms: http://opensource.org/licenses/MIT
+
+## Plotly
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Plotly, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Readme.md

@@ -40,12 +40,13 @@ f = Flammarion::Engraving.new
 f.puts "Hello World!"
 ```
 
-It can even support standard console color codes: (Thanks to [ansi_up](http://github.com/drudru/ansi_up)!)
+It can even support standard console color codes (Thanks to [ansi_up](http://github.com/drudru/ansi_up)!) and emoji / icons (Thanks to [emojione](http://emojione.com/) and [font awesome](https://fortawesome.github.io/Font-Awesome/))
 
 ```ruby
 require 'colorized'
 f.puts "This line will be red!".red
 f.puts "This #{"word".colorize(:green)} will not be blue."
+f.puts "This line will have cows :cow: :cow2:", escape_icons: true
 ```
 
 However, you can also do more advanced things. Say you want to show a table. Easy!
@@ -56,6 +57,13 @@ f.table(
   10.times.collect{|x| [x, x * x, Math.sqrt(x)]})
 ```
 
+Now, instead of a table, you decide you want a plot. No problem.
+
+```ruby
+x = 10.times.to_a
+f.plot([{x:x, y:x}, {x: x, y: x.map{|i| i*i}}, {x: x, y: x.map{|i| Math.sqrt(i)}}])
+```
+
 Or maybe you want to know where something is:
 
 ```ruby
@@ -92,7 +100,7 @@ recipient = f.subpane("number").input("Phone Number")
 text = f.input("Body", multiline:true)
 f.button("Send") { send_message(recipient.to_s, text.to_s); f.status("Message Sent!")}
 f.pane("contacts").puts("Contacts", replace:true)
-icons = %w[thumbs-up meh-o bicycle gears star-o star] + [nil] * 5
+icons = %w[thumbs-up meh-o bicycle gears star-o star cow cat cactus] + [nil] * 5
 30.times do |i|
   name = Faker::Name.name
   f.pane("contacts").button(name, right_icon:icons.sample, left_icon:icons.sample) do
@@ -154,6 +162,12 @@ f.pane("sidebar").pane("side2").puts Faker::Hipster.paragraph.green
 
 ![Table Sample](http://zach-capalbo.github.io/flammarion/img/table.png)
 
+```ruby
+f = Flammarion::Engraving.new
+f.plot(5.times.map{|t| {y:100.times.map{rand * t}}})
+```
+
+![Plot Sample](http://zach-capalbo.github.io/flammarion/img/plot.png)
 
 ## Examples
 

data/lib/flammarion/version.rb

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

data/lib/flammarion/writeable.rb

@@ -68,7 +68,7 @@ module Flammarion
     #   plain text. If false, allows any arbitrary html to be rendered in the
     #   writeable area.
     #  @option options [Boolean] :escape_icons (false) If true, will translate
-    #   any text between two `:` into a font-awesome icon. (E.g. :thumbs-up:)
+    #   any text between two `:` into a font-awesome or emojione icon. (E.g. :thumbs-up:)
 
     # @!macro [new] string_representation
     #   The string can be included in text for text-accepting methods (such as
@@ -124,12 +124,29 @@ module Flammarion
       return nil
     end
 
-    # Creates a new plot to display single axis data
+    # Creates a new plot to display single axis data. Uses Plotly javascript
+    # library for plotting, options are passed directly to Plotly, so all
+    # types of plots and options are supported.
+    #
     # @macro add_options
+    # @see https://plot.ly/javascript/
     # @return [Plot] A Plot object for manipulation after creation.
-    # @overload plot(array, options)
+    # @overload plot(array, options = {})
     #   @param [Array<Number>] values A list of numbers to plot
-    # @overload plot(dataset, options)
+    #   @example
+    #     f.plot([1,3,4,2])
+    #   @example
+    #     f.plot(100.times.map{rand}, mode: 'markers')
+    # @overload plot(dataset, options = {})
+    #   @param [Hash] A hash representing a Plotly dataset
+    #   @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
+    #   @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 = {})
       id = @engraving.make_id
       p = Plot.new(id, @pane_name, @engraving)

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

@@ -70,6 +70,8 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
   var WSClient,
     hasProp = {}.hasOwnProperty;
 
+  emojione.imagePathPNG = 'images/emoji/';
+
   WSClient = (function() {
     function WSClient() {
       var host;
@@ -197,7 +199,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

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

@@ -6736,6 +6736,8 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
   var WSClient,
     hasProp = {}.hasOwnProperty;
 
+  emojione.imagePathPNG = 'images/emoji/';
+
   WSClient = (function() {
     function WSClient() {
       var host;
@@ -6863,7 +6865,6 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
           }
         });
       }
-      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }
@@ -7116,11 +7117,20 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
       left_icon = "";
       data.right_icon || (data.right_icon = data.icon);
       if (data.left_icon) {
-        left_icon = "<i class='fa fa-" + data.left_icon + " label-icon-left'></i>";
+        if ((":" + data.left_icon + ":") in emojione.emojioneList) {
+          left_icon = "<i class='label-icon-left'>" + emojione.shortnameToImage(":" + data.left_icon + ":") + "</i>";
+          console.log(left_icon);
+        } else {
+          left_icon = "<i class='fa fa-" + data.left_icon + " label-icon-left'></i>";
+        }
       }
       right_icon = "";
       if (data.right_icon) {
-        right_icon = "<i class='fa fa-" + data.right_icon + " label-icon-right'></i>";
+        if ((":" + data.right_icon + ":") in emojione.emojioneList) {
+          left_icon = "<i class='label-icon-right'>" + emojione.shortnameToImage(":" + data.right_icon + ":") + "</i>";
+        } else {
+          right_icon = "<i class='fa fa-" + data.right_icon + " label-icon-right'></i>";
+        }
       }
       element = $("<a href='#' class='" + class_name + "'>" + left_icon + (this.__parent.escape(data.label, data)) + right_icon + "</a>");
       element.click((function(_this) {
@@ -7362,7 +7372,7 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
       paper_bgcolor: $('#plot-style').css("background-color"),
       font: {
         color: $('#plot-style').css("color"),
-        family: $('body').css("font-family")
+        family: $('pre').css("font-family")
       },
       titlefont: {
         color: $('#plot-style').css("color"),
@@ -7398,7 +7408,12 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
       if (plotDiv.size() === 0) {
         plotDiv = $("<div class='plot' id='plot-" + data.id + "'></div>");
         this.__parent.add(plotDiv, target, data);
-        console.log(default_plot_options);
+        $(window).resize(function() {
+          return Plotly.relayout(plotDiv[0], {
+            width: plotDiv.width(),
+            height: plotDiv.height()
+          });
+        });
         return Plotly.newPlot(plotDiv[0], data.data, $.extend({
           width: plotDiv.width()
         }, window.default_plot_options, data));

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

@@ -70,6 +70,8 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
   var WSClient,
     hasProp = {}.hasOwnProperty;
 
+  emojione.imagePathPNG = 'images/emoji/';
+
   WSClient = (function() {
     function WSClient() {
       var host;
@@ -197,7 +199,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }
@@ -248,11 +249,20 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       left_icon = "";
       data.right_icon || (data.right_icon = data.icon);
       if (data.left_icon) {
-        left_icon = "<i class='fa fa-" + data.left_icon + " label-icon-left'></i>";
+        if ((":" + data.left_icon + ":") in emojione.emojioneList) {
+          left_icon = "<i class='label-icon-left'>" + emojione.shortnameToImage(":" + data.left_icon + ":") + "</i>";
+          console.log(left_icon);
+        } else {
+          left_icon = "<i class='fa fa-" + data.left_icon + " label-icon-left'></i>";
+        }
       }
       right_icon = "";
       if (data.right_icon) {
-        right_icon = "<i class='fa fa-" + data.right_icon + " label-icon-right'></i>";
+        if ((":" + data.right_icon + ":") in emojione.emojioneList) {
+          left_icon = "<i class='label-icon-right'>" + emojione.shortnameToImage(":" + data.right_icon + ":") + "</i>";
+        } else {
+          right_icon = "<i class='fa fa-" + data.right_icon + " label-icon-right'></i>";
+        }
       }
       element = $("<a href='#' class='" + class_name + "'>" + left_icon + (this.__parent.escape(data.label, data)) + right_icon + "</a>");
       element.click((function(_this) {

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

@@ -70,6 +70,8 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
   var WSClient,
     hasProp = {}.hasOwnProperty;
 
+  emojione.imagePathPNG = 'images/emoji/';
+
   WSClient = (function() {
     function WSClient() {
       var host;
@@ -197,7 +199,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

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

@@ -5,7 +5,7 @@
       paper_bgcolor: $('#plot-style').css("background-color"),
       font: {
         color: $('#plot-style').css("color"),
-        family: $('body').css("font-family")
+        family: $('pre').css("font-family")
       },
       titlefont: {
         color: $('#plot-style').css("color"),
@@ -41,7 +41,12 @@
       if (plotDiv.size() === 0) {
         plotDiv = $("<div class='plot' id='plot-" + data.id + "'></div>");
         this.__parent.add(plotDiv, target, data);
-        console.log(default_plot_options);
+        $(window).resize(function() {
+          return Plotly.relayout(plotDiv[0], {
+            width: plotDiv.width(),
+            height: plotDiv.height()
+          });
+        });
         return Plotly.newPlot(plotDiv[0], data.data, $.extend({
           width: plotDiv.width()
         }, window.default_plot_options, data));

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

@@ -70,6 +70,8 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
   var WSClient,
     hasProp = {}.hasOwnProperty;
 
+  emojione.imagePathPNG = 'images/emoji/';
+
   WSClient = (function() {
     function WSClient() {
       var host;
@@ -197,7 +199,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

data/lib/html/config.rb

@@ -39,7 +39,7 @@
  configure :development do
    activate :livereload
    config[:file_watcher_ignore] += [
-     /source\/images\/emoji\//
+     /emoji\//
    ]
  end
 

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

@@ -5,9 +5,19 @@ $.extend WSClient.prototype.actions,
     class_name = if data.inline then 'inline-button' else 'full-button'
     left_icon = ""
     data.right_icon ||= data.icon
-    left_icon = "<i class='fa fa-#{data.left_icon} label-icon-left'></i>" if data.left_icon
+    if data.left_icon
+      if ":#{data.left_icon}:" of emojione.emojioneList
+        left_icon = "<i class='label-icon-left'>" + emojione.shortnameToImage(":#{data.left_icon}:") + "</i>"
+        console.log left_icon
+      else
+        left_icon = "<i class='fa fa-#{data.left_icon} label-icon-left'></i>"
+
     right_icon = ""
-    right_icon = "<i class='fa fa-#{data.right_icon} label-icon-right'></i>" if data.right_icon
+    if data.right_icon
+      if ":#{data.right_icon}:" of emojione.emojioneList
+        left_icon = "<i class='label-icon-right'>" + emojione.shortnameToImage(":#{data.right_icon}:") + "</i>"
+      else
+        right_icon = "<i class='fa fa-#{data.right_icon} label-icon-right'></i>"
 
     element = $("<a href='#' class='#{class_name}'>#{left_icon}#{@__parent.escape(data.label, data)}#{right_icon}</a>")
     element.click =>

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

@@ -4,7 +4,7 @@ $(document).ready ->
     paper_bgcolor: $('#plot-style').css("background-color")
     font:
       color: $('#plot-style').css("color")
-      family: $('body').css("font-family")
+      family: $('pre').css("font-family")
     titlefont:
       color: $('#plot-style').css("color")
       family: $('body').css("font-family")
@@ -29,7 +29,8 @@ $.extend WSClient.prototype.actions,
     if plotDiv.size() is 0
       plotDiv = $("<div class='plot' id='plot-#{data.id}'></div>")
       @__parent.add(plotDiv, target, data)
-      console.log(default_plot_options)
+      $(window).resize ->
+        Plotly.relayout plotDiv[0], {width: plotDiv.width(), height:plotDiv.height()}
       Plotly.newPlot(plotDiv[0], data.data, $.extend(width: plotDiv.width(), window.default_plot_options, data))
     else
       plotDiv[0].data = data.data

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

@@ -3,6 +3,8 @@
 #= require fontawesome.js
 #= require vendor/emojione.min.js
 
+emojione.imagePathPNG = 'images/emoji/'
+
 class WSClient
   constructor: ->
     host = $qs.get("host") || "localhost"
@@ -80,7 +82,7 @@ class WSClient
     if options.escape_icons
       text = text.replace /:[\w-]+:/g, (match) ->
         if font_awesome_list.includes(match[1..-2]) then "<i class='fa fa-#{match[1..-2]}'></i>" else match
-    emojione.imagePathPNG = 'images/emoji/'
+
     text = emojione.toImage(text) if options.escape_icons
     text = $("<div>#{text}</div>")
     text.find("a[href^='http']").attr('target','_blank')

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.7pre2
-  prerelease: 5
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - Zach Capalbo
@@ -3826,7 +3826,6 @@ files:
 - LICENSE
 - Readme.md
 - electron/package.json
-- electron/flammarion-window.sh
 - electron/main.js
 - electron/icon.png
 - electron/preload.coffee
@@ -3848,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/electron/flammarion-window.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-electron .