flammarion 0.1.14 → 0.2.0

data/lib/flammarion.rb

@@ -11,7 +11,7 @@ begin
   require 'sass'
   require 'slim'
   require 'coffee-script'
-  require 'redcarpet'
+  require 'kramdown' unless defined?(Redcarpet::Markdown)
 rescue LoadError
 end
 

data/lib/flammarion/engraving.rb

@@ -12,7 +12,7 @@ module Flammarion
   #   blank window, and then display that thing.
   class Engraving
     include Revelator
-    attr_accessor :on_disconnect, :on_connect, :actions
+    attr_accessor :on_disconnect, :on_callback_exception, :on_connect, :actions
     attr_accessor :callbacks, :sockets # @api private
     include Writeable
 
@@ -21,6 +21,10 @@ module Flammarion
     #  connected (i.e., displayed)
     # @option options [Proc] :on_disconnect Called when the display windows is
     #  disconnected (i.e., closed)
+    # @option options [Proc] :on_callback_exception Called when there is an
+    #  exception executing a provided callback. (e.g., so you can log it)
+    #  If no handler is provided, Flammarion will attempt to pass the exception
+    #  back to the original calling thread.
     # @option options [Boolean] :exit_on_disconnect (false) Will call +exit+
     #  when the widow is closed if this option is true.
     # @option options [Boolean] :close_on_exit (false) Will close the window
@@ -39,6 +43,7 @@ module Flammarion
       @pane_name = "default"
       @on_connect = options[:on_connect]
       @on_disconnect = options[:on_disconnect]
+      @on_callback_exception = options[:on_callback_exception]
       @exit_on_disconnect = options.fetch(:exit_on_disconnect, false)
 
       start_server
@@ -154,6 +159,12 @@ module Flammarion
         end
       end
       @actions[m["action"]].call(m) if @actions.include?(m["action"])
+    rescue Exception
+      if @on_callback_exception then
+        @on_callback_exception.call($!)
+      else
+        raise
+      end
     end
 
     # @api private

data/lib/flammarion/revelator.rb

@@ -20,11 +20,7 @@ module Flammarion
     CHROME_PATH = ENV["FLAMMARION_REVELATOR_PATH"] || 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
 
     def open_a_window(options = {})
-      if RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
-        development_mode = ENV["FLAMMARION_DEVELOPMENT"] == "true"
-      else
-        development_mode = system("lsof -i:#{4567}", out: '/dev/null') and File.exist?("#{File.dirname(__FILE__)}/../html/source/index.html.slim")
-      end
+      development_mode = Flammarion.development_mode?
       host_path = File.absolute_path(File.join(File.dirname(File.absolute_path(__FILE__)), "/../html/build/index.html"))
       host_path = `cygpath -w '#{host_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
       host = "file://#{host_path}"
@@ -117,4 +113,18 @@ module Flammarion
       return nil
     end
   end
+
+  private
+  def self.development_mode?
+    if RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
+      development_mode = ENV["FLAMMARION_DEVELOPMENT"] == "true"
+    else
+      development_mode = system("lsof -i:#{4567}", out: '/dev/null') and File.exist?("#{File.dirname(__FILE__)}/../html/source/index.html.slim")
+    end
+  end
+
+  def self.development_mode=(turnOn)
+    raise StandardError.new("Can't turn on development mode on unix system. (Just start the middleman server, and flammarion will detect it automatically.") unless RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
+    ENV["FLAMMARION_DEVELOPMENT"] = "true"
+  end
 end

data/lib/flammarion/server.rb

@@ -45,7 +45,7 @@ module Flammarion
               Thread.new do
                 begin
                   @windows[@socket_paths[ws]].process_message(msg)
-                rescue StandardError => e
+                rescue Exception
                   handle_exception($!)
                 end
               end

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.14"
+    VERSION = "0.2.0"
   end

data/lib/flammarion/writeable.rb

@@ -361,14 +361,18 @@ module Flammarion
     #  extensions to enable.
     # @macro add_options
     def markdown(text, options = {})
-      markdown_html = Redcarpet::Markdown.new(Redcarpet::Render::HTML, {
-        tables: true,
-        fenced_code_blocks: true,
-        autolink: true,
-        strikethrough: true,
-        superscript: true,
-      }.merge(options[:markdown_extensions] || {})).render(text)
-      send_json({action:'markdown', text: markdown_html}.merge(options))
+      if defined?(Redcarpet::Markdown) then
+        markdown_html = Redcarpet::Markdown.new(Redcarpet::Render::HTML, {
+          tables: true,
+          fenced_code_blocks: true,
+          autolink: true,
+          strikethrough: true,
+          superscript: true,
+        }.merge(options[:markdown_extensions] || {})).render(text)
+      else
+        markdown_html = Kramdown::Document.new(text, {input: 'GFM', hard_wrap: false, syntax_highlighter: nil}.merge(options)).to_html
+      end
+      send_json({action:'markdown', text: markdown_html, hard_wrap:false}.merge(options))
     end
 
     # Hides (but doesn't close) the pane. This allows the pane to be written

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

@@ -261,15 +261,17 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       }
       element = $("#console-" + data.target);
       element.append(this.__parent.escape(data.text, data));
-      results = [];
-      while (element.hasClass("pane")) {
-        atBottom = atBottomStack.shift();
-        if (atBottom) {
-          element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+      if (data.auto_scroll !== false) {
+        results = [];
+        while (element.hasClass("pane")) {
+          atBottom = atBottomStack.shift();
+          if (atBottom) {
+            element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+          }
+          results.push(element = element.parent());
         }
-        results.push(element = element.parent());
+        return results;
       }
-      return results;
     },
     replace: function(data) {
       this.__parent.check_target(data);

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

@@ -7439,15 +7439,17 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
       }
       element = $("#console-" + data.target);
       element.append(this.__parent.escape(data.text, data));
-      results = [];
-      while (element.hasClass("pane")) {
-        atBottom = atBottomStack.shift();
-        if (atBottom) {
-          element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+      if (data.auto_scroll !== false) {
+        results = [];
+        while (element.hasClass("pane")) {
+          atBottom = atBottomStack.shift();
+          if (atBottom) {
+            element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+          }
+          results.push(element = element.parent());
         }
-        results.push(element = element.parent());
+        return results;
       }
-      return results;
     },
     replace: function(data) {
       this.__parent.check_target(data);

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

@@ -432,6 +432,7 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
   color: #e6e1dc;
   -webkit-text-size-adjust: none;
   border-radius: 5px;
+  white-space: pre;
 }
 .hljs-comment,
 .hljs-shebang {

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

@@ -11,6 +11,7 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
   color: #e6e1dc;
   -webkit-text-size-adjust: none;
   border-radius: 5px;
+  white-space: pre;
 }
 .hljs-comment,
 .hljs-shebang {

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

@@ -14,10 +14,11 @@ $.extend WSClient.prototype.actions,
     element = $("#console-#{data.target}")
     element.append(@__parent.escape(data.text, data))
 
-    while element.hasClass("pane")
-      atBottom = atBottomStack.shift()
-      element.scrollTop(element[0].scrollHeight - element.height() - marginSize) if atBottom
-      element = element.parent()
+    unless data.auto_scroll is false
+      while element.hasClass("pane")
+        atBottom = atBottomStack.shift()
+        element.scrollTop(element[0].scrollHeight - element.height() - marginSize) if atBottom
+        element = element.parent()
 
   replace: (data) ->
     @__parent.check_target(data)

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

@@ -18,6 +18,7 @@ $keyword-color = #c26230
   color: $normal-text-color;
   -webkit-text-size-adjust: none;
   border-radius 5px
+  white-space: pre
 
 
 .hljs-comment,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: