neovim 0.7.0 → 0.7.1

data/lib/neovim/line_range.rb

@@ -12,8 +12,8 @@ module Neovim
     # @yieldparam line [String]
     def each(&block)
       (0...@buffer.count).each_slice(5000) do |linenos|
-        _start, _stop = linenos[0], linenos[-1] + 1
-        @buffer.get_lines(_start, _stop, true).each(&block)
+        start, stop = linenos[0], linenos[-1] + 1
+        @buffer.get_lines(start, stop, true).each(&block)
       end
     end
 
@@ -50,15 +50,15 @@ module Neovim
     # @example Get the first two lines using an index and length
     #   line_range[0, 2] # => ["first", "second"]
     def [](pos, len=nil)
-      if Range === pos
+      if pos.is_a?(Range)
         @buffer.get_lines(*range_indices(pos), true)
       else
-        _begin, _end = length_indices(pos, len || 1)
-        lines = @buffer.get_lines(_begin, _end, true)
+        start, stop = length_indices(pos, len || 1)
+        lines = @buffer.get_lines(start, stop, true)
         len ? lines : lines.first
       end
     end
-    alias_method :slice, :[]
+    alias slice []
 
     # Set a line or line range.
     #
@@ -85,11 +85,11 @@ module Neovim
       *target, val = args
       pos, len = target
 
-      if Range === pos
+      if pos.is_a?(Range)
         @buffer.set_lines(*range_indices(pos), true, Array(val))
       else
-        _begin, _end = length_indices(pos, len || 1)
-        @buffer.set_lines(_begin, _end, true, Array(val))
+        start, stop = length_indices(pos, len || 1)
+        @buffer.set_lines(start, stop, true, Array(val))
       end
     end
 
@@ -113,18 +113,18 @@ module Neovim
     private
 
     def range_indices(range)
-      _begin = adjust_index(range.begin)
-      _end = adjust_index(range.end)
-      _end += 1 unless range.exclude_end?
+      start = adjust_index(range.begin)
+      stop = adjust_index(range.end)
+      stop += 1 unless range.exclude_end?
 
-      [_begin, _end]
+      [start, stop]
     end
 
     def length_indices(index, len)
-      _begin = adjust_index(index)
-      _end = _begin < 0 ? [_begin + len, -1].min : _begin + len
+      start = adjust_index(index)
+      stop = start < 0 ? [start + len, -1].min : start + len
 
-      [_begin, _end]
+      [start, stop]
     end
 
     def adjust_index(i)

data/lib/neovim/logging.rb

@@ -13,13 +13,12 @@ module Neovim
     def self.logger(env=ENV)
       return @logger if instance_variable_defined?(:@logger)
 
-      if env_file = env["NVIM_RUBY_LOG_FILE"]
-        @logger = Logger.new(env_file)
-      else
-        @logger = Logger.new(STDERR)
-      end
+      env_file, env_level =
+        env.values_at("NVIM_RUBY_LOG_FILE", "NVIM_RUBY_LOG_LEVEL")
 
-      if env_level = env["NVIM_RUBY_LOG_LEVEL"]
+      @logger = Logger.new(env_file || STDERR)
+
+      if env_level
         begin
           @logger.level = Integer(env_level)
         rescue ArgumentError
@@ -43,7 +42,7 @@ module Neovim
     end
 
     def self.json_formatter
-      -> (level, time, _, fields) {
+      lambda do |level, time, _, fields|
         require "multi_json"
 
         MultiJson.encode(
@@ -52,20 +51,21 @@ module Neovim
             _time: time.strftime(TIMESTAMP_FORMAT)
           }.merge!(fields)
         ) << "\n"
-      }
+      end
     end
     private_class_method :json_formatter
 
+    # @api private
     module Helpers
       private
 
-      def log(level, _method=nil, &block)
+      def log(level, method=nil, &block)
         begin
           Logging.logger.public_send(level) do
             {
               _class: self.class,
-              _method: _method || block.binding.eval("__method__"),
-            }.merge!(block.call)
+              _method: method || block.binding.eval("__method__")
+            }.merge!(yield)
           end
         rescue => ex
           Logging.logger.error("failed to log: #{ex.inspect}")
@@ -74,12 +74,12 @@ module Neovim
         # Inability to log shouldn't abort process
       end
 
-      def log_exception(level, ex, _method)
-        log(level, _method) do
+      def log_exception(level, ex, method)
+        log(level, method) do
           {exception: ex.class, message: ex.message}
         end
 
-        log(:debug, _method) do
+        log(:debug, method) do
           {exception: ex.class, message: ex.message, backtrace: ex.backtrace}
         end
       end

data/lib/neovim/message.rb

@@ -29,13 +29,13 @@ module Neovim
       Notification.new(method, args)
     end
 
-    class Request < Struct.new(:id, :method_name, :arguments)
+    Request = Struct.new(:id, :method_name, :arguments) do
       def to_a
         [0, id, method_name, arguments]
       end
 
-      def received(_, &block)
-        block.call(self)
+      def received(_)
+        yield self
       end
 
       def sync?
@@ -43,7 +43,7 @@ module Neovim
       end
     end
 
-    class Response < Struct.new(:request_id, :error, :value)
+    Response = Struct.new(:request_id, :error, :value) do
       def to_a
         [1, request_id, error, value]
       end
@@ -53,13 +53,13 @@ module Neovim
       end
     end
 
-    class Notification < Struct.new(:method_name, :arguments)
+    Notification = Struct.new(:method_name, :arguments) do
       def to_a
         [2, method_name, arguments]
       end
 
-      def received(_, &block)
-        block.call(self)
+      def received(_)
+        yield self
       end
 
       def sync?

data/lib/neovim/plugin/dsl.rb

@@ -85,14 +85,14 @@ module Neovim
         @plugin.handlers.push(Handler.unqualified(name, block))
       end
 
-      def register_handler(type, name, _options, block)
+      def register_handler(type, name, options, block)
         if type == :autocmd
-          options = _options.dup
+          options = options.dup
         else
-          options = standardize(_options.dup)
+          options = standardize(options.dup)
         end
 
-        sync = options.delete(:sync)
+        sync = !!options.delete(:sync)
 
         @plugin.handlers.push(
           Handler.new(@plugin.source, type, name, sync, options, block)

data/lib/neovim/plugin/handler.rb

@@ -12,7 +12,7 @@ module Neovim
         @source = source
         @type = type.to_sym if type.respond_to?(:to_sym)
         @name = name.to_s
-        @sync = !!sync
+        @sync = sync
         @options = options
         @block = block || -> {}
         @qualified =
@@ -20,7 +20,7 @@ module Neovim
       end
 
       def sync?
-        @sync
+        !!@sync
       end
 
       def qualified?
@@ -43,7 +43,7 @@ module Neovim
           type: @type,
           name: @name,
           sync: @sync,
-          opts: @options,
+          opts: @options
         }
       end
 

data/lib/neovim/remote_object.rb

@@ -23,15 +23,15 @@ module Neovim
 
     # Intercept method calls and delegate to appropriate RPC methods.
     def method_missing(method_name, *args)
-      if func = @api.function_for_object_method(self, method_name)
+      if (func = @api.function_for_object_method(self, method_name))
         func.call(@session, @index, *args)
       else
         super
       end
     end
 
-    # Extend +respond_to?+ to support RPC methods.
-    def respond_to?(method_name, *)
+    # Extend +respond_to_missing?+ to support RPC methods.
+    def respond_to_missing?(method_name, *)
       super || rpc_methods.include?(method_name.to_sym)
     end
 

data/lib/neovim/ruby_provider.rb

@@ -1,6 +1,7 @@
 require "neovim/ruby_provider/vim"
 require "neovim/ruby_provider/buffer_ext"
 require "neovim/ruby_provider/window_ext"
+require "stringio"
 
 module Neovim
   # This class is used to define a +Neovim::Plugin+ to act as a backend for the
@@ -21,10 +22,7 @@ module Neovim
       end
     end
 
-    # Bootstrap the provider client:
-    #
-    # 1. Monkeypatch +$stdout+ and +$stderr+ to write to +nvim+.
-    # 2. Define the +DirChanged+ event to update the provider's pwd.
+    # Define the +DirChanged+ event to update the provider's pwd.
     def self.__define_setup(plug)
       plug.__send__(:setup) do |client|
         begin
@@ -108,12 +106,10 @@ module Neovim
     private_class_method :__wrap_client
 
     def self.__with_exception_handling(client)
-      begin
-        yield
-      rescue ScriptError, StandardError => e
-        msg = [e.class, e.message].join(": ")
-        client.err_writeln(msg)
-      end
+      yield
+    rescue ScriptError, StandardError => e
+      msg = [e.class, e.message].join(": ")
+      client.err_writeln(msg)
     end
     private_class_method :__with_exception_handling
 
@@ -126,8 +122,8 @@ module Neovim
       begin
         yield
 
-        client.out_write($stdout.string + $/) if $stdout.length > 0
-        client.err_writeln($stderr.string) if $stderr.length > 0
+        client.out_write($stdout.string + $/) if $stdout.size > 0
+        client.err_writeln($stderr.string) if $stderr.size > 0
       ensure
         $stdout = old_stdout
         $stderr = old_stderr
@@ -137,10 +133,10 @@ module Neovim
 
     def self.__update_lines_in_chunks(buffer, start, stop, size)
       (start..stop).each_slice(size) do |linenos|
-        _start, _stop = linenos[0]-1, linenos[-1]
-        lines = buffer.get_lines(_start, _stop, true)
+        start, stop = linenos[0] - 1, linenos[-1]
+        lines = buffer.get_lines(start, stop, true)
 
-        buffer.set_lines(_start, _stop, true, yield(lines))
+        buffer.set_lines(start, stop, true, yield(lines))
       end
     end
     private_class_method :__update_lines_in_chunks

data/lib/neovim/ruby_provider/buffer_ext.rb

@@ -1,6 +1,7 @@
 require "neovim/ruby_provider/vim"
 
 module Neovim
+  # @api private
   class Buffer
     def self.current
       ::Vim.get_current_buf

data/lib/neovim/ruby_provider/vim.rb

@@ -15,8 +15,20 @@ module Vim
 
   # Delegate all method calls to the underlying +Neovim::Client+ object.
   def self.method_missing(method, *args, &block)
-    @__client.public_send(method, *args, &block).tap do
-      __refresh_globals(@__client)
+    if @__client.respond_to?(method)
+      @__client.public_send(method, *args, &block).tap do
+        __refresh_globals(@__client)
+      end
+    else
+      super
+    end
+  end
+
+  def self.respond_to_missing?(method, *args)
+    if @__client
+      @__client.send(:respond_to_missing?, method, *args)
+    else
+      super
     end
   end
 

data/lib/neovim/ruby_provider/window_ext.rb

@@ -1,6 +1,7 @@
 require "neovim/ruby_provider/vim"
 
 module Neovim
+  # @api private
   class Window
     def self.current
       ::Vim.get_current_win

data/lib/neovim/session.rb

@@ -1,5 +1,6 @@
 require "neovim/logging"
 require "fiber"
+require "thread"
 
 module Neovim
   # Wraps an event loop in a synchronous API using +Fiber+s.
@@ -22,8 +23,8 @@ module Neovim
     def run(&block)
       @running = true
 
-      while message = @pending_messages.shift
-        Fiber.new { message.received(@response_handlers, &block) }.resume
+      while (pending = @pending_messages.shift)
+        Fiber.new { pending.received(@response_handlers, &block) }.resume
       end
 
       return unless @running
@@ -86,10 +87,10 @@ module Neovim
     def blocking_response
       response = nil
 
-      @response_handlers[@request_id] = -> (res) {
+      @response_handlers[@request_id] = lambda do |res|
         response = res
         stop
-      }
+      end
 
       run { |message| @pending_messages << message }
       response
@@ -97,11 +98,7 @@ module Neovim
 
     def yielding_response
       fiber = Fiber.current
-
-      @response_handlers[@request_id] = -> (response) {
-        fiber.resume(response)
-      }
-
+      @response_handlers[@request_id] = ->(response) { fiber.resume(response) }
       Fiber.yield
     end
 
@@ -110,7 +107,7 @@ module Neovim
         yield if block_given?
       else
         raise(
-          "A Ruby plugin attempted to call neovim outside of the main thread, " +
+          "A Ruby plugin attempted to call neovim outside of the main thread, " \
           "which is not yet supported by the neovim gem."
         )
       end

data/lib/neovim/version.rb

@@ -1,3 +1,3 @@
 module Neovim
-  VERSION = Gem::Version.new("0.7.0")
+  VERSION = Gem::Version.new("0.7.1")
 end

data/lib/neovim/window.rb

@@ -56,9 +56,9 @@ module Neovim
     # @param coords [Array(Integer, Integer)]
     # @return [Array(Integer, Integer)]
     def cursor=(coords)
-      _x, _y = coords
-      x = [_x, 1].max
-      y = [_y, 0].max + 1
+      x, y = coords
+      x = [x, 1].max
+      y = [y, 0].max + 1
       @session.request(:nvim_eval, "cursor(#{x}, #{y})")
     end
 

data/neovim.gemspec

@@ -1,6 +1,5 @@
-# coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.unshift(lib) unless $:.include?(lib)
 require "neovim/version"
 
 Gem::Specification.new do |spec|
@@ -23,9 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_json", "~> 1.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "0.52.1"
+  spec.add_development_dependency "vim-flavor", "2.2.2"
 end