textbringer-ghost_text 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee11306209a200392bb926c38709e91edb9151b3
-  data.tar.gz: bbb782882d6590efd34e9f5f58633ccde50eb89b
+  metadata.gz: f86902879c3f37dde2c3719208fae58d263eeed1
+  data.tar.gz: 7349aea3d2e51a8f87062a3c1f861f4af31a7c18
 SHA512:
-  metadata.gz: 85940038dca84d2d28755c0db4431b02eaf6636665cb930ef12e4f7da4167929ae2d32c4b5ee368a176fa17b456bca85554e45984fbcc691de562d5d6702c822
-  data.tar.gz: ef886af90ffa9e762a1e319b40fb12b0136a8e256505a426ba72d8e96ce09daf7ff4ca6e55261730ade6348e46e8f4f7d1fb741983ceac6ded968a246d837697
+  metadata.gz: 59841ec3c62f9e141b8f1c03c56e68956c2aab46ea831c0377248bb060d548ae15808c258a0f145b0f8470758d7db646b264df2e330d9f80b663c2a4986385c6
+  data.tar.gz: 6f2c404714da657908fa5233748cdde6f8716423e9769716c9bc6d61a1afc7df5c5ec87bec5e05aacfa78a9062a39ae80566cf0b3a0df0bd71d4dca95086870a

data/README.md

@@ -1,5 +1,7 @@
 # textbringer-ghost_text
 
+[![Gem Version](https://badge.fury.io/rb/textbringer-ghost_text.svg)](https://badge.fury.io/rb/textbringer-ghost_text)
+
 [GhostText](https://github.com/GhostText/GhostText) plugin for Textbringer.
 
 ## Installation

data/lib/textbringer/ghost_text.rb

@@ -2,5 +2,5 @@
 
 require_relative "ghost_text/version"
 require_relative "ghost_text/config"
-require_relative "ghost_text/web_socket_server"
+require_relative "ghost_text/server"
 require_relative "ghost_text/commands"

data/lib/textbringer/ghost_text/commands.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-define_command(:ghost_text_start) do
+define_command(:ghost_text_start,
+               doc: "Start GhostText server") do
+  host = CONFIG[:ghost_text_host]
+  port = CONFIG[:ghost_text_port]
+  message("Start GhostText server: http://#{host}:#{port}")
   background do
     thin = Rack::Handler.get("thin")
-    thin.run(Textbringer::GhostText::WebSocketServer.new,
-             Host: CONFIG[:ghost_text_host],
-             Port: CONFIG[:ghost_text_port]) do |server|
+    app = Rack::ContentLength.new(Textbringer::GhostText::Server.new)
+    thin.run(app, Host: host, Port: port) do |server|
       server.silent = true
     end
   end

data/lib/textbringer/ghost_text/config.rb

@@ -3,4 +3,5 @@
 module Textbringer
   CONFIG[:ghost_text_host] = "127.0.0.1"
   CONFIG[:ghost_text_port] = 4001
+  CONFIG[:ghost_text_ping_interval] = 30
 end

data/lib/textbringer/ghost_text/server.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "json"
+require "rack"
+require "thin"
+require "faye/websocket"
+
+Faye::WebSocket.load_adapter("thin")
+
+module Textbringer
+  module GhostText
+    class Server
+      def call(env)
+        if Faye::WebSocket.websocket?(env)
+          accept_client(env)
+        else
+          json = {
+            "WebSocketPort" => CONFIG[:ghost_text_port],
+            "ProtocolVersion" => 1
+          }.to_json
+          [200, {'Content-Type' => 'application/json'}, [json]]
+        end
+      end
+
+      private
+
+      def accept_client(env)
+        ws = Faye::WebSocket.new(env, nil,
+                                 ping: CONFIG[:ghost_text_ping_interval])
+        next_tick! do
+          setup_buffer(ws)
+        end
+        ws.rack_response
+      end
+
+      def setup_buffer(ws)
+        buffer = Buffer.new_buffer("*GhostText*")
+        switch_to_buffer(buffer)
+
+        syncing_from_remote_text = false
+
+        ws.on :message do |event|
+          data = JSON.parse(event.data)
+          next_tick do
+            syncing_from_remote_text = true
+            begin
+              buffer.replace(data["text"])
+              if pos = data["selections"]&.dig(0, "start")
+                byte_pos = data["text"][0, pos].bytesize
+                buffer.goto_char(byte_pos)
+              end
+            ensure
+              syncing_from_remote_text = false
+            end
+            if (title = data['title']) && !title.empty?
+              buffer.name = "*GhostText:#{title}*"
+            end
+            switch_to_buffer(buffer)
+          end
+        end
+
+        ws.on :close do |event|
+          ws = nil
+          next_tick do
+            kill_buffer(buffer, force: true)
+          end
+        end
+
+        buffer.on :modified do
+          unless syncing_from_remote_text
+            pos = buffer.substring(0, buffer.point).size
+            data = {
+              "text" => buffer.to_s,
+              "selections" => [{ "start" => pos, "end" => pos }]
+            }
+            ws&.send(data.to_json)
+          end
+        end
+
+        buffer.on :killed do
+          ws&.close
+        end
+      end
+    end
+  end
+end

data/lib/textbringer/ghost_text/version.rb

@@ -2,6 +2,6 @@
 
 module Textbringer
   module GhostText
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/textbringer-ghost_text.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "textbringer", ">= 0.2.3"
+  spec.add_runtime_dependency "textbringer", ">= 0.2.5"
   spec.add_runtime_dependency "thin"
   spec.add_runtime_dependency "faye-websocket"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer-ghost_text
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +97,8 @@ files:
 - lib/textbringer/ghost_text.rb
 - lib/textbringer/ghost_text/commands.rb
 - lib/textbringer/ghost_text/config.rb
+- lib/textbringer/ghost_text/server.rb
 - lib/textbringer/ghost_text/version.rb
-- lib/textbringer/ghost_text/web_socket_server.rb
 - lib/textbringer_plugin.rb
 - textbringer-ghost_text.gemspec
 homepage: https://github.com/shugo/textbringer-ghost_text

data/lib/textbringer/ghost_text/web_socket_server.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-require "rack"
-require "thin"
-require "faye/websocket"
-
-Faye::WebSocket.load_adapter("thin")
-
-module Textbringer
-  module GhostText
-    class WebSocketServer
-      def call(env)
-        if Faye::WebSocket.websocket?(env)
-          ws = Faye::WebSocket.new(env)
-
-          next_tick do
-            buffer = Buffer.new_buffer("*GhostText*")
-            switch_to_buffer(buffer)
-
-            remote_text = nil
-
-            buffer.on_modified do
-              text = buffer.to_s
-              if text != remote_text
-                pos = buffer.substring(0, buffer.point).size
-                data = {
-                  "text" => text,
-                  "selections" => [{ "start" => pos, "end" => pos }]
-                }
-                ws.send(data.to_json)
-                remote_text = text
-              end
-            end
-
-            ws.on :message do |event|
-              data = JSON.parse(event.data)
-              next_tick do
-                buffer.composite_edit do
-                  remote_text = data["text"]
-                  buffer.delete_region(buffer.point_min, buffer.point_max)
-                  buffer.insert(remote_text)
-                  pos = data["selections"]&.dig(0, "start")
-                  if pos
-                    byte_pos = remote_text[0, pos].bytesize
-                    buffer.goto_char(byte_pos)
-                  end
-                end
-              end
-            end
-
-            ws.on :close do |event|
-              next_tick do
-                kill_buffer(buffer, force: true)
-              end
-              ws = nil
-            end
-          end
-          ws.rack_response
-        else
-          json = {
-            "WebSocketPort" => 4001,
-            "ProtocolVersion" => 1
-          }.to_json
-          [200, {'Content-Type' => 'application/json'}, [json]]
-        end
-      end
-    end
-  end
-end