octodown 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15b5cceda8b3271dc0fda94c850817676019f1d
-  data.tar.gz: ac6cbb077b6ff20c636b3418a2f5caf9063c9cc2
+  metadata.gz: 060715e5ebab9c22e3f9cccc9b87f2888f2da006
+  data.tar.gz: a53f8dc0b0024693d073f345274281416c56c8d7
 SHA512:
-  metadata.gz: 6bb15c6a9de3ff7a1cc9eb5e99c5520a8117490db4c61270d9e4c04ff712c8916de7bff8daf6d6d3faebd18662ddeb13a80c1457cc69e2cd8aad65bbf49caa07
-  data.tar.gz: 8f11f1fa05e51b65f34fc24d72912cdf983e8208036d69ce774275a5edcce4da2315cfc07fd5c23afcdc8801388532c6d11616d53232cb53e353964037cf7835
+  metadata.gz: 7d055ab5ff014d28beca6d8e93fce961bad0f9468a10ffd86490da6ade49df078ec811c414586f85708d95e2a2c87376a6c4be4bf569cca2038a32752c8d9157
+  data.tar.gz: 3679b776ed450685a3469b8f2525ff6f914ce37aef844fbd94486ce74bf494479e0113543065dcf5e431cef26ba0c243854f6c07fd91384832162ff7e52b1ed7

data/lib/octodown/renderer/server.rb

@@ -1,7 +1,7 @@
 module Octodown
   module Renderer
     class Server
-      attr_reader :file, :path, :options, :port, :ws
+      attr_reader :file, :path, :options, :port
 
       def initialize(_content, options = {})
         init_ws
@@ -10,6 +10,7 @@ module Octodown
         @options = options
         @path = File.dirname(File.expand_path(file.path))
         @port = options[:port]
+        @websockets = []
       end
 
       def present
@@ -19,8 +20,8 @@ module Octodown
         # page in a browser. I hate relying on time here, but I can't think
         # of cleaner way currently.
         Thread.new do |t|
-          sleep 1
-          Launchy.open "http://localhost:#{port}"
+          sleep 2.5
+          Launchy.open "http://localhost:#{port}" if @websockets.empty?
           t.exit
         end
 
@@ -39,10 +40,26 @@ module Octodown
 
       private
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def render_ws(env)
-        @ws = ::Faye::WebSocket.new env
-        ws.rack_response
+        md = render_md(file)
+
+        socket = ::Faye::WebSocket.new(env)
+
+        socket.on(:open) do
+          socket.send md
+          puts "Clients: #{@websockets.size}" if ENV['DEBUG']
+        end
+
+        socket.on(:close) do
+          @websockets = @websockets.select { |s| s != socket }
+          puts "Clients: #{@websockets.size}" if ENV['DEBUG']
+        end
+
+        @websockets << socket
+        socket.rack_response
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def render_http(env)
         Rack::Response.new.tap do |res|
@@ -58,22 +75,21 @@ module Octodown
 
       # Render HTML body from Markdown
       def body
-        HTML.render render_md, options
+        HTML.render render_md(file), options
       end
 
       def register_listener
         Octodown::Support::Services::Riposter.call file do
-          md = render_md
-          ws.on(:open) { ws.send md }
-          ws.send md
-
-          puts "Reloading #{file.path}..."
+          md = render_md(file)
+          @websockets.each do |socket|
+            socket.send md
+          end
         end
       end
 
-      def render_md
-        file.rewind unless file.pos == 0
-        Renderer::GithubMarkdown.render file, options
+      def render_md(f)
+        f.rewind unless f.pos == 0
+        Renderer::GithubMarkdown.render f, options
       end
 
       def init_ws

data/lib/octodown/support/services/riposter.rb

@@ -7,7 +7,13 @@ module Octodown
 
           path = File.dirname(File.expand_path(file.path))
           regex = Regexp.new(file.path)
-          Listen.to(path, only: regex, &listener_callback).start
+
+          @listener ||= Listen.to(path, only: regex) do
+            puts "Reloading #{file.path}..."
+            listener_callback.call
+          end
+
+          @listener.start
         end
       end
     end

data/lib/octodown/template/octodown.html.erb

@@ -9,13 +9,36 @@
     <%= highlight_stylesheet %>
     <%= stylesheet %>
 
-    <script type="text/javascript">
-      var socket = new WebSocket(<%= host %>);
+    <script type='text/javascript'>
+      'use strict';
 
-      socket.onmessage = function(event) {
-        document.querySelector('article.markdown-body').innerHTML = event.data;
-      };
+      document.addEventListener("DOMContentLoaded", function() {
+        var ws = null;
+        var interval = 2500;
+
+        function start() {
+          ws = new WebSocket(<%= host %>);
+
+          ws.onmessage = function(event) {
+            var body =  document.querySelector('article.markdown-body');
+            if (body) body.innerHTML = event.data;
+          };
+
+          ws.onclose = function() {
+            check();
+          };
+        }
+
+        function check(){
+          if(ws.readyState == 3) start();
+        }
+
+        start();
+
+        setInterval(check, interval);
+      });
     </script>
+
   </head>
 
   <body>

data/lib/octodown/version.rb

@@ -1,3 +1,3 @@
 module Octodown
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octodown
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: GitHub Markdown straight from your shell.