neovim 0.0.5 → 0.0.6

data/spec/neovim/msgpack_stream_spec.rb

@@ -5,7 +5,7 @@ module Neovim
   RSpec.describe MsgpackStream do
     shared_context "msgpack stream behavior" do
       it "sends and receives data" do
-        stream = MsgpackStream.new(event_loop)
+        msgpack_stream = MsgpackStream.new(event_loop)
         client_messages = []
 
         server_thread = Thread.new do
@@ -17,14 +17,13 @@ module Neovim
           server.close
         end
 
-        fiber = Fiber.new do
-          msg_cb = Proc.new { |msg| Fiber.yield(msg) }
-          stream.send([1]).run(msg_cb)
+        server_message = nil
+        msgpack_stream.write([1]).run do |message|
+          server_message = message
+          msgpack_stream.shutdown
         end
 
-        server_message = fiber.resume
         server_thread.join
-
         expect(server_message).to eq([2])
         expect(client_messages).to eq([MessagePack.pack([1])])
       end

data/spec/neovim/{object_spec.rb → remote_object_spec.rb}

@@ -1,10 +1,7 @@
 require "helper"
-require "neovim/buffer"
-require "neovim/tabpage"
-require "neovim/window"
 
 module Neovim
-  RSpec.describe Object do
+  RSpec.describe RemoteObject do
     context Window do
       let(:window) { Neovim.attach_child(["-n", "-u", "NONE"]).current.window }
 

data/spec/neovim/session_spec.rb

@@ -5,12 +5,12 @@ require "fileutils"
 module Neovim
   RSpec.describe Session do
     shared_context "session behavior" do
-      it "supports functions with async=false" do
+      it "supports requests" do
         expect(session.request(:vim_strwidth, "foobar")).to be(6)
       end
 
-      it "supports functions with async=true" do
-        expect(session.request(:vim_input, "jk")).to be(2)
+      it "supports notifications" do
+        expect(session.notify(:vim_input, "jk")).to be(nil)
       end
 
       it "raises an exception when there are errors" do
@@ -25,11 +25,19 @@ module Neovim
         expect(session.request(:vim_get_current_line)).to eq(large_str)
       end
 
-      describe "#api_methods_for_prefix" do
-        it "returns relevant functions without a prefix" do
-          methods = session.api_methods_for_prefix("vim_")
-          expect(methods).to include(:strwidth)
+      it "subscribes to events" do
+        session.request(:vim_subscribe, "my_event")
+        session.request(:vim_command, "call rpcnotify(0, 'my_event', 'foo')")
+
+        messages = []
+        session.run do |msg|
+          messages << msg
+          session.shutdown
         end
+
+        expect(messages.first).to be_a(Notification)
+        expect(messages.first.method_name).to eq("my_event")
+        expect(messages.first.arguments).to eq(["foo"])
       end
     end
 
@@ -56,12 +64,7 @@ module Neovim
         Process.waitpid(nvim_pid)
       end
 
-      let(:session) do
-        event_loop = EventLoop.tcp("0.0.0.0", nvim_port)
-        stream = MsgpackStream.new(event_loop)
-        async = AsyncSession.new(stream)
-        Session.new(async)
-      end
+      let(:session) { Session.tcp("0.0.0.0", nvim_port) }
 
       include_context "session behavior"
     end
@@ -89,24 +92,13 @@ module Neovim
         Process.waitpid(nvim_pid)
       end
 
-      let(:session) do
-        event_loop = EventLoop.unix(socket_path)
-        stream = MsgpackStream.new(event_loop)
-        async = AsyncSession.new(stream)
-        Session.new(async)
-      end
+      let(:session) { Session.unix(socket_path) }
 
       include_context "session behavior"
     end
 
     context "child" do
-      let(:session) do
-        event_loop = EventLoop.child(["-n", "-u", "NONE"])
-        stream = MsgpackStream.new(event_loop)
-        async = AsyncSession.new(stream)
-        Session.new(async)
-      end
-
+      let(:session) { Session.child(["-n", "-u", "NONE"]) }
       include_context "session behavior"
     end
   end

data/spec/neovim_spec.rb

@@ -1,4 +1,3 @@
-require "neovim/plugin"
 require "helper"
 require "fileutils"
 
@@ -22,6 +21,7 @@ RSpec.describe Neovim do
         expect(Neovim.attach_tcp("0.0.0.0", port).strwidth("hi")).to eq(2)
       ensure
         Process.kill(:TERM, pid)
+        Process.waitpid(pid)
       end
     end
   end
@@ -49,8 +49,7 @@ RSpec.describe Neovim do
 
   describe ".attach_child" do
     it "spawns and attaches to a child process" do
-      nvim = Neovim.attach_child(nvim_argv)
-      expect(nvim.strwidth("hi")).to eq(2)
+      expect(Neovim.attach_child(nvim_argv).strwidth("hi")).to eq(2)
     end
   end
 

data/spec/support.rb

@@ -18,12 +18,12 @@ module Support
     File.join(workspace, name)
   end
 
-  def self.remove_workspace
-    FileUtils.rm_rf(workspace)
+  def self.setup_workspace
+    teardown_workspace
+    FileUtils.mkdir_p(workspace)
   end
 
-  def self.clean_workspace
-    remove_workspace
-    FileUtils.mkdir_p(workspace)
+  def self.teardown_workspace
+    FileUtils.rm_rf(workspace)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -111,9 +111,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/j2mp
+- bin/mp2j
 - bin/neovim-ruby-host
 - lib/neovim.rb
-- lib/neovim/api_info.rb
+- lib/neovim/api.rb
 - lib/neovim/async_session.rb
 - lib/neovim/buffer.rb
 - lib/neovim/client.rb
@@ -125,8 +127,10 @@ files:
 - lib/neovim/manifest.rb
 - lib/neovim/msgpack_stream.rb
 - lib/neovim/notification.rb
-- lib/neovim/object.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/session.rb
 - lib/neovim/tabpage.rb
@@ -135,6 +139,7 @@ files:
 - neovim.gemspec
 - spec/acceptance/neovim-ruby-host_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
@@ -144,8 +149,8 @@ files:
 - spec/neovim/line_range_spec.rb
 - spec/neovim/manifest_spec.rb
 - spec/neovim/msgpack_stream_spec.rb
-- spec/neovim/object_spec.rb
 - spec/neovim/plugin_spec.rb
+- spec/neovim/remote_object_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
@@ -177,6 +182,7 @@ summary: A Ruby client for Neovim
 test_files:
 - spec/acceptance/neovim-ruby-host_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
@@ -186,9 +192,10 @@ test_files:
 - spec/neovim/line_range_spec.rb
 - spec/neovim/manifest_spec.rb
 - spec/neovim/msgpack_stream_spec.rb
-- spec/neovim/object_spec.rb
 - spec/neovim/plugin_spec.rb
+- spec/neovim/remote_object_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
 - spec/support.rb
+has_rdoc: 

data/lib/neovim/api_info.rb

@@ -1,27 +0,0 @@
-require "delegate"
-
-module Neovim
-  class APIInfo < SimpleDelegator
-    def functions
-      @functions ||= fetch(1).fetch("functions")
-    end
-
-    def types
-      @types ||= fetch(1).fetch("types")
-    end
-
-    def channel_id
-      @channel_id ||= fetch(0)
-    end
-
-    def defined?(function)
-      functions.any? do |func|
-        func["name"] == function.to_s
-      end
-    end
-
-    def inspect
-      "#<#{self.class}:0x%x @types={...} @functions={...}>" % (object_id << 1)
-    end
-  end
-end

data/lib/neovim/object.rb

@@ -1,40 +0,0 @@
-module Neovim
-  class Object
-    attr_reader :index
-
-    def initialize(index, session)
-      @index = index
-      @session = session
-    end
-
-    def respond_to?(method_name)
-      super || methods.include?(method_name.to_sym)
-    end
-
-    def method_missing(method_name, *args)
-      if methods.include?(method_name)
-        @session.request(qualify(method_name), @index, *args)
-      else
-        super
-      end
-    end
-
-    def to_msgpack(packer)
-      packer.pack(@index)
-    end
-
-    def methods
-      super | @session.api_methods_for_prefix(function_prefix)
-    end
-
-    private
-
-    def function_prefix
-      "#{self.class.to_s.split("::").last.downcase}_"
-    end
-
-    def qualify(method_name)
-      :"#{function_prefix}#{method_name}"
-    end
-  end
-end