gfm_live_preview 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7a81f2c5a4368fe8f980db25ba2ccfd700a4db
-  data.tar.gz: 337f31ef3bda894d4f4f76ecddec338c8fa71a32
+  metadata.gz: b1d5623ea9f4bd1f3a8dfedefff5fb0ce629fa89
+  data.tar.gz: 6b7da1b778422066e3ec3625a066d300b67e98c2
 SHA512:
-  metadata.gz: 5b4a35f7edb06eed47bfb04c270495325d4aecafe94a09af61b996144c1f382986a5b5665aff7659e6bfa804482e493b3227fe3043c0cee5a0527f8e3f787343
-  data.tar.gz: 83e7567923b1fb779d761f3c0b92a48b5687b666df7fbac0d7c2972f510e3622c652cbeda98d12416cc3cdf6d64dc7a13f08eb9986a982ce1c15d11595f2dd40
+  metadata.gz: 85d71df80b15bcc2addbe3218b397ae6d25bd0961a0d8f8653edc53a154f53fa71a4b3d07b91ea7ef07bc9958433b3870a1d4af38ba0f3dd7a096fda6e241107
+  data.tar.gz: e515ea2c8c934b28805860ac6aa56320369937474334dc4cca95c26998c54eb802452ff72b138f17069da20df7c4515102a6e104186241b8c97ff7c8b19e9a7b

data/lib/gfm_live_preview.rb

@@ -24,4 +24,13 @@ module GfmLivePreview
   def config
     @config ||= {}
   end
+
+  def read_file(relative_path = nil)
+    path = relative_path ? root.join(relative_path) : file
+    File.read path
+  end
+
+  def root
+    Pathname(File.expand_path("..", file))
+  end
 end

data/lib/gfm_live_preview/cli.rb

@@ -27,7 +27,14 @@ module GfmLivePreview
         end
       end.parse(argv)
 
-      [argv.last, options]
+      file = argv.last
+
+      if file.nil?
+        @argv = ['-h']
+        parse
+      end
+
+      [file, options]
     end
   end
 end

data/lib/gfm_live_preview/server.rb

@@ -14,34 +14,59 @@ module GfmLivePreview
       e.backtrace.each do |line| puts line; end
     end
 
-    def render_document
-      document = File.read ::GfmLivePreview.file
+    def render_document(ws, relative_path)
+      document = GfmLivePreview.read_file relative_path
       syntax_highlight! document
-      GitHub::Markdown.render_gfm document
+      doc = GitHub::Markdown.render_gfm document
+      EM.next_tick { ws.send doc }
     end
 
-    def doc_path
-      File.expand_path '..', ::GfmLivePreview.file
+    def setup_websockets(request, relative_path = nil)
+      request.websocket do |ws|
+        ws.onopen do
+          render_document ws, relative_path
+          listener = Listen.to GfmLivePreview.root do 
+            render_document ws, relative_path
+          end
+          listener.start
+          settings.sockets << ws
+        end
+        ws.onclose do
+          settings.sockets.delete ws
+        end
+      end
     end
 
     get "/" do
       if request.websocket?
-        request.websocket do |ws|
-          ws.onopen do
-            ws.send render_document
-            listener = Listen.to doc_path do 
-              ws.send render_document
-            end
-            listener.start
-            settings.sockets << ws
-          end
-          ws.onclose do
-            settings.sockets.delete ws
-          end
-        end
+        setup_websockets request
       else
         erb :index
       end
     end
+
+    # Support local assets like images
+    get "/*" do
+      path = params[:splat].first
+
+      local_path = ::GfmLivePreview.root.join path
+
+      halt 404 unless local_path.exist?
+
+      mime_type = MIME::Types.type_for(local_path.basename.to_s).first
+
+      if mime_type && mime_type.raw_media_type == "image"
+        content_type mime_type.content_type
+        File.read local_path
+      elsif %w(.md .markdown).include? local_path.extname
+        if request.websocket?
+          setup_websockets request, path
+        else
+          erb :index
+        end
+      else
+        halt 404
+      end
+    end
   end
 end

data/lib/gfm_live_preview/version.rb

@@ -1,3 +1,3 @@
 module GfmLivePreview
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/lib/views/index.erb

@@ -17,14 +17,16 @@ window.onload = function() {
       for(var cc = 0; cc < links.length; cc++) {
         var link = links[cc];
         if(link.rel == "stylesheet") {
-          link.href += "?";
+          var token = (Math.random() + 1).toString(36).substring(7);
+          link.href = link.href.replace(/\?.*/, '') + '?' + token;
         }
       }
     };
 
-    var md_document = document.getElementById("document");
+    var md_document    = document.getElementById("document");
     var web_socket_url = "ws://" + window.location.host + window.location.pathname;
-    var ws       = new WebSocket(web_socket_url);
+    var ws             = new WebSocket(web_socket_url);
+
     ws.onmessage = function(m) {
       md_document.innerHTML = m.data;
       reload_css();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gfm_live_preview
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler