octodown 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060715e5ebab9c22e3f9cccc9b87f2888f2da006
-  data.tar.gz: a53f8dc0b0024693d073f345274281416c56c8d7
+  metadata.gz: 6a531a7522c46d3268a13438f70d95a6cda40b44
+  data.tar.gz: 7aec5cd981f01c760edfb5398fb6daf9f5a52b9e
 SHA512:
-  metadata.gz: 7d055ab5ff014d28beca6d8e93fce961bad0f9468a10ffd86490da6ade49df078ec811c414586f85708d95e2a2c87376a6c4be4bf569cca2038a32752c8d9157
-  data.tar.gz: 3679b776ed450685a3469b8f2525ff6f914ce37aef844fbd94486ce74bf494479e0113543065dcf5e431cef26ba0c243854f6c07fd91384832162ff7e52b1ed7
+  metadata.gz: 61fcf9f255aca9065abe69807749e6f266881b63999bdf170f1e64de2535a61cb08c41b809fe532e27994a08b3b085d9ab1abd1a4377f3e46dc012030544375f
+  data.tar.gz: 85d04f8d4f6d81602108d62fe066f8e7cdd019dcf6774bc1f43b376959fd010ff7ec687cdd8f3353ef36a4ce5ba55492e5ae16a02ac786be13a38f07d17085ef

data/lib/octodown/renderer/server.rb

@@ -1,31 +1,54 @@
+require 'faye/websocket'
+require 'puma'
+require 'rack'
+require 'rack/handler/puma'
+require 'thread'
+require 'launchy'
+
 module Octodown
   module Renderer
     class Server
       attr_reader :file, :path, :options, :port
 
       def initialize(_content, options = {})
-        init_ws
-
         @file = ARGF.file
         @options = options
         @path = File.dirname(File.expand_path(file.path))
         @port = options[:port]
         @websockets = []
+        @already_opened = false
+        @mutex = Mutex.new
       end
 
       def present
         register_listener
 
-        # We need to make sure the server has started before opening the
-        # page in a browser. I hate relying on time here, but I can't think
-        # of cleaner way currently.
-        Thread.new do |t|
-          sleep 2.5
-          Launchy.open "http://localhost:#{port}" if @websockets.empty?
-          t.exit
+        Thread.new do
+          Thread.abort_on_exception = true
+          maybe_launch_browser
+          Thread.exit
         end
 
-        Rack::Server.start app: app, Port: port
+        boot_server
+      end
+
+      def boot_server
+        puts "[INFO] Server running on http://localhost:#{port}"
+        Rack::Handler::Puma.run app, Host: 'localhost', Port: port, Silent: true
+      end
+
+      def maybe_launch_browser
+        return if ENV['TEST']
+
+        sleep 2.5
+
+        @mutex.synchronize do
+          if @already_opened == false
+            @already_opened = true
+            puts '[INFO] Loading preview in a new browser tab'
+            Launchy.open "http://localhost:#{port}"
+          end
+        end
       end
 
       def call(env)
@@ -47,6 +70,14 @@ module Octodown
         socket = ::Faye::WebSocket.new(env)
 
         socket.on(:open) do
+          @mutex.synchronize do
+            if @already_opened == false
+              puts '[INFO] Re-using octodown client from previous browser tab'
+            end
+
+            @already_opened = true
+          end
+
           socket.send md
           puts "Clients: #{@websockets.size}" if ENV['DEBUG']
         end
@@ -80,6 +111,7 @@ module Octodown
 
       def register_listener
         Octodown::Support::Services::Riposter.call file do
+          puts '[INFO] Recompiling markdown...'
           md = render_md(file)
           @websockets.each do |socket|
             socket.send md
@@ -91,13 +123,6 @@ module Octodown
         f.rewind unless f.pos == 0
         Renderer::GithubMarkdown.render f, options
       end
-
-      def init_ws
-        require 'rack'
-        require 'faye/websocket'
-
-        Faye::WebSocket.load_adapter 'thin'
-      end
     end
   end # Support
 end # Octodown

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

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

data/lib/octodown/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octodown
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -123,47 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement