flammarion 0.1.5 → 0.1.6

data/Readme.md

@@ -78,7 +78,7 @@ f.button("Click Here!!!") {f.puts "You clicked the button!"}
 f.input("Placeholder > ") {|msg| f.puts "You wrote: #{msg['text'].light_magenta}"}
 ```
 
-The [api documetaion](http://zach-capalbo.github.io/flammarion/doc/Flammarion.html)
+The [api documentation](http://zach-capalbo.github.io/flammarion/doc/Flammarion.html)
 is available at <http://zach-capalbo.github.io/flammarion/doc/Flammarion.html>.
 
 ## Screenshots / Samples

data/electron/flammarion-window.sh

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

data/electron/main.coffee

@@ -1,14 +1,18 @@
 app = require 'app'
 BrowserWindow = require('browser-window')
-require('crash-reporter').start()
 path = require('path')
+shell = require('electron').shell
 
 app.on 'ready', ->
   preload = path.resolve(path.join(__dirname, 'preload.js'))
   main_window = new BrowserWindow
-    width:800
-    height: 600
+    width: parseInt(process.argv[3]) || 800
+    height: parseInt(process.argv[4]) || 600
     "node-integration": false
     "web-security":false
+    icon:"icon.png"
     preload:preload
-  main_window.loadUrl(process.argv[2])
+  main_window.loadURL(process.argv[2])
+  main_window.webContents.on 'new-window', (event, url) ->
+    event.preventDefault()
+    shell.openExternal(url)

data/electron/main.js

@@ -1,26 +1,31 @@
 // Generated by CoffeeScript 1.9.0
 (function() {
-  var BrowserWindow, app, path;
+  var BrowserWindow, app, path, shell;
 
   app = require('app');
 
   BrowserWindow = require('browser-window');
 
-  require('crash-reporter').start();
-
   path = require('path');
 
+  shell = require('electron').shell;
+
   app.on('ready', function() {
     var main_window, preload;
     preload = path.resolve(path.join(__dirname, 'preload.js'));
     main_window = new BrowserWindow({
-      width: 800,
-      height: 600,
+      width: parseInt(process.argv[3]) || 800,
+      height: parseInt(process.argv[4]) || 600,
       "node-integration": false,
       "web-security": false,
+      icon: "icon.png",
       preload: preload
     });
-    return main_window.loadUrl(process.argv[2]);
+    main_window.loadURL(process.argv[2]);
+    return main_window.webContents.on('new-window', function(event, url) {
+      event.preventDefault();
+      return shell.openExternal(url);
+    });
   });
 
 }).call(this);

data/electron/package.json

@@ -1,5 +1,13 @@
 {
   "name" : "flammarion",
   "version" : "0.1.0",
-  "main" : "main.js"
+  "main" : "main.js",
+  "dependencies": {
+    "spellchecker": "^3.2.1",
+    "nan": "^2.0.0"
+  },
+  "packageDependencies": {
+    "spellchecker": "^3.2.1",
+    "nan": "^2.0.0"
+  }
 }

data/electron/preload.coffee

@@ -1,5 +1,17 @@
 window.$remote = require('remote')
 
+webFrame = require('web-frame')
+
+try
+  spellcheck = require('spellchecker')
+
+  webFrame.setSpellCheckProvider("en-US", true, {
+    spellCheck: (text) ->
+      return !spellcheck.isMisspelled(text)
+    })
+catch error
+  console.log("Could not load spellchecker: #{error}")
+
 window.onkeyup = (e) ->
   if e.ctrlKey and e.keyCode is 70
     window.show_search_bar()

data/electron/preload.js

@@ -1,7 +1,23 @@
 // Generated by CoffeeScript 1.9.0
 (function() {
+  var error, spellcheck, webFrame;
+
   window.$remote = require('remote');
 
+  webFrame = require('web-frame');
+
+  try {
+    spellcheck = require('spellchecker');
+    webFrame.setSpellCheckProvider("en-US", true, {
+      spellCheck: function(text) {
+        return !spellcheck.isMisspelled(text);
+      }
+    });
+  } catch (_error) {
+    error = _error;
+    console.log("Could not load spellchecker: " + error);
+  }
+
   window.onkeyup = function(e) {
     if (e.ctrlKey && e.keyCode === 70) {
       return window.show_search_bar();

data/lib/flammarion/revelator.rb

@@ -72,7 +72,7 @@ module Flammarion
 
     browser :electron do |options|
       if which('electron') then
-        Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{options[:url]}'"))
+        Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{options[:url]}' #{options[:width]} #{options[:height]}"))
         return true
       end
       false

data/lib/flammarion/version.rb

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

data/lib/flammarion/writeable.rb

@@ -311,13 +311,24 @@ module Flammarion
       send_json({action:'script', data:data}.merge(options))
     end
 
-    # Sets a CSS styles attribute on the current pane.
-    # @param attribute [String] The css attribute to set. Currently does not
-    #  support selectors or anything.
-    # @param value [#to_s] The value to set the attribute to. (Don't forget
-    #  units!)
-    def style(attribute, value)
-      send_json({action: 'style', attribute: attribute, value: value})
+    # Sets CSS styles attributes on the current pane.
+    # @overload style(attribute, value)
+    #   @param attribute [String] The css attribute to set. Currently does not
+    #    support selectors or anything.
+    #   @param value [#to_s] The value to set the attribute to. (Don't forget
+    #    units!)
+    # @overload style(attributes)
+    #   @param attributes [Hash] Table of css attribute to value mapping to set.
+    def style(*args)
+      case args.length
+      when 1
+        # @todo Pass this as a whole hash, rather than individually.
+        args[0].each{|a,v| send_json({action: 'style', attribute: a, value: v})}
+      when 2
+        send_json({action: 'style', attribute: args[0], value: args[1]})
+      else
+        raise ArgumentError.new("Invalid number of arguments (Expected 1 or 2)")
+      end
     end
 
     # Will render the given Slim template into the Writeable area. This is

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

@@ -152,6 +152,12 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
       return results;
     };
 
+    WSClient.prototype.relink = function(text) {
+      return text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, function(str, l) {
+        return "<a href=\"" + l + "\" target='_blank'>";
+      });
+    };
+
     WSClient.prototype.escape = function(text, input_options) {
       var options;
       options = {
@@ -178,11 +184,14 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
           return "<i class='fa fa-" + match.slice(1, -1) + "'></i>";
         });
       }
-      return text;
+      text = $("<div>" + text + "</div>");
+      text.find("a[href^='http']").attr('target', '_blank');
+      return text.html();
     };
 
     WSClient.prototype.add = function(object, target, data) {
       var key, ref, val;
+      object.find("a[href^='http']").attr('target', '_blank');
       if (data.style) {
         ref = data.style;
         for (key in ref) {

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

@@ -6773,6 +6773,12 @@ if (typeof module !== 'undefined') {
       return results;
     };
 
+    WSClient.prototype.relink = function(text) {
+      return text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, function(str, l) {
+        return "<a href=\"" + l + "\" target='_blank'>";
+      });
+    };
+
     WSClient.prototype.escape = function(text, input_options) {
       var options;
       options = {
@@ -6799,11 +6805,14 @@ if (typeof module !== 'undefined') {
           return "<i class='fa fa-" + match.slice(1, -1) + "'></i>";
         });
       }
-      return text;
+      text = $("<div>" + text + "</div>");
+      text.find("a[href^='http']").attr('target', '_blank');
+      return text.html();
     };
 
     WSClient.prototype.add = function(object, target, data) {
       var key, ref, val;
+      object.find("a[href^='http']").attr('target', '_blank');
       if (data.style) {
         ref = data.style;
         for (key in ref) {

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

@@ -152,6 +152,12 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
       return results;
     };
 
+    WSClient.prototype.relink = function(text) {
+      return text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, function(str, l) {
+        return "<a href=\"" + l + "\" target='_blank'>";
+      });
+    };
+
     WSClient.prototype.escape = function(text, input_options) {
       var options;
       options = {
@@ -178,11 +184,14 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
           return "<i class='fa fa-" + match.slice(1, -1) + "'></i>";
         });
       }
-      return text;
+      text = $("<div>" + text + "</div>");
+      text.find("a[href^='http']").attr('target', '_blank');
+      return text.html();
     };
 
     WSClient.prototype.add = function(object, target, data) {
       var key, ref, val;
+      object.find("a[href^='http']").attr('target', '_blank');
       if (data.style) {
         ref = data.style;
         for (key in ref) {

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

@@ -152,6 +152,12 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
       return results;
     };
 
+    WSClient.prototype.relink = function(text) {
+      return text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, function(str, l) {
+        return "<a href=\"" + l + "\" target='_blank'>";
+      });
+    };
+
     WSClient.prototype.escape = function(text, input_options) {
       var options;
       options = {
@@ -178,11 +184,14 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
           return "<i class='fa fa-" + match.slice(1, -1) + "'></i>";
         });
       }
-      return text;
+      text = $("<div>" + text + "</div>");
+      text.find("a[href^='http']").attr('target', '_blank');
+      return text.html();
     };
 
     WSClient.prototype.add = function(object, target, data) {
       var key, ref, val;
+      object.find("a[href^='http']").attr('target', '_blank');
       if (data.style) {
         ref = data.style;
         for (key in ref) {

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

@@ -152,6 +152,12 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
       return results;
     };
 
+    WSClient.prototype.relink = function(text) {
+      return text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, function(str, l) {
+        return "<a href=\"" + l + "\" target='_blank'>";
+      });
+    };
+
     WSClient.prototype.escape = function(text, input_options) {
       var options;
       options = {
@@ -178,11 +184,14 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
           return "<i class='fa fa-" + match.slice(1, -1) + "'></i>";
         });
       }
-      return text;
+      text = $("<div>" + text + "</div>");
+      text.find("a[href^='http']").attr('target', '_blank');
+      return text.html();
     };
 
     WSClient.prototype.add = function(object, target, data) {
       var key, ref, val;
+      object.find("a[href^='http']").attr('target', '_blank');
       if (data.style) {
         ref = data.style;
         for (key in ref) {

data/lib/html/build/stylesheets/all.css

@@ -677,6 +677,7 @@ p a,
   -ms-user-select: text;
   user-select: text;
   font-family: monospace;
+  white-space: pre-wrap;
 }
 .pane > .pane {
   width: calc(100% + 16px);

data/lib/html/build/stylesheets/engraving.css

@@ -55,6 +55,7 @@ p a,
   -ms-user-select: text;
   user-select: text;
   font-family: monospace;
+  white-space: pre-wrap;
 }
 .pane > .pane {
   width: calc(100% + 16px);

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

@@ -59,6 +59,11 @@ class WSClient
         $(pane).css "height", p_height(pane)
         $(pane).css "width", '100%'
 
+  relink: (text) ->
+    text.replace(/\<a href=['"](https?:\/\/[^\s]+)["']>/gm, (str, l) ->
+      "<a href=\"#{l}\" target='_blank'>"
+    )
+
   escape: (text, input_options) ->
     options =
       raw: false
@@ -70,11 +75,15 @@ class WSClient
     text = "#{text}"
     text = ansi_up.escape_for_html(text) if options.escape_html
     text = ansi_up.ansi_to_html(text, {use_classes:true}) if options.colorize
+    # text = @relink(text)
     text = text.replace(/:[\w-]+:/g, (match) ->
       "<i class='fa fa-#{match[1..-2]}'></i>") if options.escape_icons
-    return text
+    text = $("<div>#{text}</div>")
+    text.find("a[href^='http']").attr('target','_blank')
+    return text.html()
 
   add: (object, target, data) ->
+    object.find("a[href^='http']").attr('target','_blank')
     if data.style
       object.css(key, val) for own key, val of data.style
     if data.replace

data/lib/html/source/stylesheets/engraving.styl

@@ -47,6 +47,7 @@ a
   position relative
   user-select text
   font-family $main-font
+  white-space pre-wrap
 
 .pane > .pane
   width calc(100% + 16px)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -366,6 +366,7 @@ files:
 - LICENSE
 - Readme.md
 - electron/package.json
+- electron/flammarion-window.sh
 - electron/main.js
 - electron/icon.png
 - electron/preload.coffee