neovim 0.2.5 → 0.3.0

data/spec/helper.rb

@@ -3,8 +3,7 @@ require "neovim"
 require "pry"
 require "stringio"
 require "timeout"
-
-require File.expand_path("../support.rb", __FILE__)
+require "fileutils"
 
 if ENV["REPORT_COVERAGE"]
   require "coveralls"
@@ -50,4 +49,36 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 end
 
+module Support
+  def self.workspace
+    File.expand_path("../workspace", __FILE__)
+  end
+
+  def self.socket_path
+    file_path("nvim.sock")
+  end
+
+  def self.port
+    server = TCPServer.new("0.0.0.0", 0)
+
+    begin
+      server.addr[1]
+    ensure
+      server.close
+    end
+  end
+
+  def self.file_path(name)
+    File.join(workspace, name)
+  end
+
+  def self.setup_workspace
+    FileUtils.mkdir_p(workspace)
+  end
+
+  def self.teardown_workspace
+    FileUtils.rm_rf(workspace)
+  end
+end
+
 Thread.abort_on_exception = true

data/spec/neovim/host_spec.rb

@@ -57,7 +57,7 @@ module Neovim
 
       it "doesn't add top-level RPCs to specs" do
         plugin = Plugin.from_config_block("source") do |plug|
-          plug.rpc(:Foo)
+          plug.__send__(:rpc, :Foo)
         end
 
         expect {

data/spec/neovim/plugin_spec.rb

@@ -67,7 +67,7 @@ module Neovim
         cmd_block = Proc.new {}
 
         plugin = Plugin.from_config_block("source") do |plug|
-          plug.rpc("Foo", :sync => true, &cmd_block)
+          plug.__send__(:rpc, "Foo", &cmd_block)
         end
 
         expect(plugin.handlers.size).to be(1)
@@ -98,7 +98,7 @@ module Neovim
 
       it "doesn't include specs for top-level RPCs" do
         plugin = Plugin.from_config_block("source") do |plug|
-          plug.rpc("Foo", :sync => true)
+          plug.__send__(:rpc, "Foo")
         end
 
         expect(plugin.specs).to eq([])

data/spec/neovim/session/api_spec.rb

@@ -0,0 +1,46 @@
+require "helper"
+
+module Neovim
+  class Session
+    RSpec.describe API do
+      describe ".null" do
+        it "returns an empty API object" do
+          api = API.null
+
+          expect(api.types).to be_empty
+          expect(api.functions).to be_empty
+        end
+      end
+
+      describe "#function" do
+        it "returns a corresponding Function object" do
+          api = API.new(
+            [nil, {"functions" => [
+              {"name" => "vim_strwidth", "async" => false}
+            ]}]
+          )
+
+          function = api.function("vim_strwidth")
+          expect(function).to be_a(API::Function)
+          expect(function.name).to eq("vim_strwidth")
+          expect(function.async).to be(false)
+        end
+      end
+
+      describe "#functions_with_prefix" do
+        it "returns relevant functions" do
+          api = API.new(
+            [nil, {"functions" => [
+              {"name" => "vim_strwidth"},
+              {"name" => "buffer_get_lines"}
+            ]}]
+          )
+
+          functions = api.functions_with_prefix("vim_")
+          expect(functions.size).to be(1)
+          expect(functions.first.name).to eq("vim_strwidth")
+        end
+      end
+    end
+  end
+end

data/spec/neovim/session/event_loop_spec.rb

@@ -0,0 +1,99 @@
+require "helper"
+require "socket"
+
+module Neovim
+  class Session
+    RSpec.describe EventLoop do
+      shared_context "socket behavior" do
+        it "sends and receives data" do
+          request = nil
+
+          server_thread = Thread.new do
+            client = server.accept
+            request = client.readpartial(1024)
+
+            client.write("res")
+            client.close
+            server.close
+          end
+
+          response = nil
+          event_loop.write("req").run do |msg|
+            response = msg
+            event_loop.stop
+          end
+
+          server_thread.join
+          event_loop.shutdown
+          expect(request).to eq("req")
+          expect(response).to eq("res")
+        end
+      end
+
+      context "tcp" do
+        let!(:server) { TCPServer.new("0.0.0.0", 0) }
+        let!(:event_loop) { EventLoop.tcp("0.0.0.0", server.addr[1]) }
+
+        include_context "socket behavior"
+      end
+
+      context "unix" do
+        let!(:server) { UNIXServer.new(Support.socket_path) }
+        let!(:event_loop) { EventLoop.unix(Support.socket_path) }
+
+        include_context "socket behavior"
+      end
+
+      context "stdio" do
+        it "sends and receives data" do
+          old_stdout = STDOUT.dup
+          old_stdin = STDIN.dup
+
+          begin
+            srv_stdout, cl_stdout = IO.pipe
+            cl_stdin, srv_stdin = IO.pipe
+
+            STDOUT.reopen(cl_stdout)
+            STDIN.reopen(cl_stdin)
+
+            event_loop = EventLoop.stdio
+            request = nil
+
+            server_thread = Thread.new do
+              request = srv_stdout.readpartial(1024)
+              srv_stdin.write("res")
+            end
+
+            response = nil
+            event_loop.write("req").run do |msg|
+              response = msg
+              event_loop.stop
+            end
+
+            server_thread.join
+            expect(request).to eq("req")
+            expect(response).to eq("res")
+          ensure
+            STDOUT.reopen(old_stdout)
+            STDIN.reopen(old_stdin)
+          end
+        end
+      end
+
+      context "child" do
+        it "sends and receives data" do
+          event_loop = EventLoop.child(["nvim", "-n", "-u", "NONE"])
+          input = MessagePack.pack([0, 0, :vim_strwidth, ["hi"]])
+
+          response = nil
+          event_loop.write(input).run do |msg|
+            response = msg
+            event_loop.shutdown
+          end
+
+          expect(response).to eq(MessagePack.pack([1, 0, nil, 2]))
+        end
+      end
+    end
+  end
+end

data/spec/neovim/session/rpc_spec.rb

@@ -0,0 +1,108 @@
+require "helper"
+
+module Neovim
+  class Session
+    RSpec.describe RPC do
+      shared_context "rpc behavior" do
+        it "receives requests" do
+          serializer = Serializer.new(event_loop)
+          rpc = RPC.new(serializer)
+
+          server_thread = Thread.new do
+            client = server.accept
+            client.write(
+              MessagePack.pack(
+                [0, 123, "func", [1, 2, 3]]
+              )
+            )
+          end
+
+          request = nil
+          rpc.run do |msg|
+            request = msg
+            rpc.shutdown
+          end
+
+          server_thread.join
+
+          expect(request).to be_a(Request)
+          expect(request.method_name).to eq("func")
+          expect(request.arguments).to eq([1, 2, 3])
+        end
+
+        it "receives notifications" do
+          serializer = Serializer.new(event_loop)
+          rpc = RPC.new(serializer)
+
+          server_thread = Thread.new do
+            client = server.accept
+            client.write(
+              MessagePack.pack(
+                [2, "func", [1, 2, 3]]
+              )
+            )
+          end
+
+          notification = nil
+          rpc.run do |message|
+            notification = message
+            rpc.shutdown
+          end
+
+          server_thread.join
+
+          expect(notification).to be_a(Notification)
+          expect(notification.method_name).to eq("func")
+          expect(notification.arguments).to eq([1, 2, 3])
+        end
+
+        it "receives responses to requests" do
+          serializer = Serializer.new(event_loop)
+          rpc = RPC.new(serializer)
+          request = nil
+
+          server_thread = Thread.new do
+            client = server.accept
+            request = client.readpartial(1024)
+
+            client.write(
+              MessagePack.pack(
+                [1, 0, [0, "error"], "result"]
+              )
+            )
+          end
+
+          error, result = nil
+          rpc.request("func", 1, 2, 3) do |err, res|
+            error, result = err, res
+            rpc.shutdown
+          end.run
+
+          expect(error).to eq("error")
+          expect(result).to eq("result")
+
+          server_thread.join
+          rpc.shutdown
+
+          expect(request).to eq(
+            MessagePack.pack([0, 0, "func", [1, 2, 3]])
+          )
+        end
+      end
+
+      context "tcp" do
+        let!(:server) { TCPServer.new("0.0.0.0", 0) }
+        let!(:event_loop) { EventLoop.tcp("0.0.0.0", server.addr[1]) }
+
+        include_context "rpc behavior"
+      end
+
+      context "unix" do
+        let!(:server) { UNIXServer.new(Support.socket_path) }
+        let!(:event_loop) { EventLoop.unix(Support.socket_path) }
+
+        include_context "rpc behavior"
+      end
+    end
+  end
+end

data/spec/neovim/session/serializer_spec.rb

@@ -0,0 +1,48 @@
+require "socket"
+require "helper"
+
+module Neovim
+  class Session
+    RSpec.describe Serializer do
+      shared_context "serializer behavior" do
+        it "sends and receives data" do
+          serializer = Serializer.new(event_loop)
+          request = nil
+
+          server_thread = Thread.new do
+            client = server.accept
+            request = client.readpartial(1024)
+
+            client.write(MessagePack.pack(["res"]))
+            client.close
+            server.close
+          end
+
+          response = nil
+          serializer.write(["req"]).run do |message|
+            response = message
+            serializer.shutdown
+          end
+
+          server_thread.join
+          expect(request).to eq(MessagePack.pack(["req"]))
+          expect(response).to eq(["res"])
+        end
+      end
+
+      context "tcp" do
+        let!(:server) { TCPServer.new("0.0.0.0", 0) }
+        let!(:event_loop) { EventLoop.tcp("0.0.0.0", server.addr[1]) }
+
+        include_context "serializer behavior"
+      end
+
+      context "unix" do
+        let!(:server) { UNIXServer.new(Support.socket_path) }
+        let!(:event_loop) { EventLoop.unix(Support.socket_path) }
+
+        include_context "serializer behavior"
+      end
+    end
+  end
+end

data/spec/neovim/session_spec.rb

@@ -74,7 +74,7 @@ module Neovim
             session.shutdown
           end
 
-          expect(message).to be_a(Notification)
+          expect(message).to be_a(Session::Notification)
           expect(message.method_name).to eq("my_event")
           expect(message.arguments).to eq(["foo"])
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -100,28 +100,28 @@ files:
 - bin/mp2j
 - bin/neovim-ruby-host
 - lib/neovim.rb
-- lib/neovim/api.rb
-- lib/neovim/async_session.rb
 - lib/neovim/buffer.rb
 - lib/neovim/client.rb
 - lib/neovim/current.rb
-- lib/neovim/event_loop.rb
 - lib/neovim/host.rb
 - lib/neovim/host/loader.rb
 - lib/neovim/line_range.rb
 - lib/neovim/logging.rb
-- lib/neovim/msgpack_stream.rb
-- lib/neovim/notification.rb
 - lib/neovim/plugin.rb
 - lib/neovim/plugin/dsl.rb
 - lib/neovim/plugin/handler.rb
 - lib/neovim/remote_object.rb
-- lib/neovim/request.rb
 - lib/neovim/ruby_provider.rb
 - lib/neovim/ruby_provider/buffer_ext.rb
 - lib/neovim/ruby_provider/vim.rb
 - lib/neovim/ruby_provider/window_ext.rb
 - lib/neovim/session.rb
+- lib/neovim/session/api.rb
+- lib/neovim/session/event_loop.rb
+- lib/neovim/session/notification.rb
+- lib/neovim/session/request.rb
+- lib/neovim/session/rpc.rb
+- lib/neovim/session/serializer.rb
 - lib/neovim/tabpage.rb
 - lib/neovim/version.rb
 - lib/neovim/window.rb
@@ -129,24 +129,23 @@ files:
 - spec/acceptance/neovim-ruby-host_spec.rb
 - spec/acceptance/ruby_provider_spec.rb
 - spec/helper.rb
-- spec/neovim/api_spec.rb
-- spec/neovim/async_session_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
-- spec/neovim/event_loop_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
-- spec/neovim/msgpack_stream_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
 - spec/neovim/ruby_provider/buffer_ext_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
+- spec/neovim/session/api_spec.rb
+- spec/neovim/session/event_loop_spec.rb
+- spec/neovim/session/rpc_spec.rb
+- spec/neovim/session/serializer_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
-- spec/support.rb
 homepage: https://github.com/alexgenco/neovim-ruby
 licenses:
 - MIT
@@ -175,22 +174,21 @@ test_files:
 - spec/acceptance/neovim-ruby-host_spec.rb
 - spec/acceptance/ruby_provider_spec.rb
 - spec/helper.rb
-- spec/neovim/api_spec.rb
-- spec/neovim/async_session_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
-- spec/neovim/event_loop_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
-- spec/neovim/msgpack_stream_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
 - spec/neovim/ruby_provider/buffer_ext_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
+- spec/neovim/session/api_spec.rb
+- spec/neovim/session/event_loop_spec.rb
+- spec/neovim/session/rpc_spec.rb
+- spec/neovim/session/serializer_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
-- spec/support.rb
 has_rdoc: