solargraph 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb228dbd2c050d2937573b2e4a4249fb951da217
-  data.tar.gz: 1af21e85d38cc159b53fc69ba05aeb4011d41a4a
+  metadata.gz: a4d07f475a599b0f7f65563328f9154bbc4aad57
+  data.tar.gz: 2f5eeb896120355cd001ec31581f0cef5680fea1
 SHA512:
-  metadata.gz: 8804b2ea16a1e6b5e1568a683af153a89da87f219ba00cd6b4338d4044c97f92486cfdc7c3f13009c6547b1750d98f1e5574a40f6f97c73435ab314368f6e48b
-  data.tar.gz: 45928e94fefe7fc5a78609b808666e6805e6a654dabe9b91a964b0c57155641544671848922e1c73434e63fac1e67418beefffebea1da59ec8f58c72efb80b6c
+  metadata.gz: 2448dfeac5a8f5db6b65ad949d762edcfe02c6c5e7184447ebfbc4352d1fd681636dd57cbaec4ea43b2819cdb1bf10cbae17737a76797ee559d180da30374294
+  data.tar.gz: 062f9ba1b5efbd026c1019cfda465e19b9d60e5cb6adf689dc876888e1a03522ab8ad4818f4a455b573c9636d9a31212c454bc3d50c7c513bd23ab60e04b8284

data/lib/solargraph/api_map.rb

@@ -26,7 +26,7 @@ module Solargraph
       unless @workspace.nil?
         files = Dir[File.join @workspace, 'lib', '**', '*.rb'] + Dir[File.join @workspace, 'app', '**', '*.rb']
         files.each { |f|
-          append_file f
+          append_file f unless yardoc_has_file?(f)
         }
       end
     end
@@ -47,7 +47,7 @@ module Solargraph
     def yardoc_has_file?(filename)
       return false unless has_yardoc?
       return false if filename.nil?
-      if filename.start_with?(File.join(workspace, 'lib'), File.join(workspace, 'app'))
+      if filename.start_with?(File.join(workspace, 'lib/'), File.join(workspace, 'app/'))
         return true
       end
       false

data/lib/solargraph/code_map.rb

@@ -7,7 +7,7 @@ module Solargraph
     
     include NodeMethods
     
-    def initialize code: '', filename: nil, workspace: nil
+    def initialize code: '', filename: nil, workspace: nil, api_map: nil
       unless workspace.nil?
         workspace = workspace.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
       end
@@ -15,16 +15,10 @@ module Solargraph
         filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
         workspace = CodeMap.find_workspace(filename)
       end
-      if workspace.nil?
-        @api_map = ApiMap.new(workspace)
-      else
-        ser_file = File.join(workspace, '.solargraph.ser')
-        if File.exist?(ser_file)
-          begin
-            @api_map = Marshal.load(File.read(ser_file))
-          rescue Exception => e
-            @api_map = ApiMap.new(workspace)
-          end
+      @api_map = api_map
+      if @api_map.nil?
+        if workspace.nil?
+          @api_map = ApiMap.new(workspace)
         else
           @api_map = ApiMap.new(workspace)
         end
@@ -228,14 +222,15 @@ module Solargraph
       else
         obj = infer(var.children[1])
         while parts.length > 0
-          obj = get_instance_method_return_value obj, ns_here, parts.shift
+          meth = parts.shift
+          obj = get_instance_method_return_value obj, ns_here, meth
         end
         return @api_map.get_instance_methods(obj) unless obj.nil?
       end
     end
 
     def get_method_return_value namespace, root, method
-      meths = @api_map.get_methods(namespace, root).delete_if{ |m| m.label != method }
+      meths = @api_map.get_methods(namespace, root).delete_if{ |m| m.insert != method }
       meths.each { |m|
         unless m.documentation.nil?
           match = m.documentation.all.match(/@return \[([a-z0-9:_]*)/i)
@@ -247,7 +242,7 @@ module Solargraph
     end
 
     def get_instance_method_return_value namespace, root, method
-      meths = @api_map.get_instance_methods(namespace, root).delete_if{ |m| m.label != method }
+      meths = @api_map.get_instance_methods(namespace, root).delete_if{ |m| m.insert != method }
       meths.each { |m|
         unless m.documentation.nil?
           match = m.documentation.all.match(/@return \[([a-z0-9:_]*)/i)

data/lib/solargraph/server.rb

@@ -1,15 +1,28 @@
 require 'sinatra/base'
+require 'thread'
 
 module Solargraph
   class Server < Sinatra::Base
-    set :port, 0
+    set :port, 7657
+
+    @@api_hash = {}
+    @@semaphore = Mutex.new
+
+    post '/prepare' do
+      prepare_workspace params['directory']
+    end
 
     post '/suggest' do
       content_type :json
       begin
-        code_map = CodeMap.new(code: params['text'], filename: params['filename'])
-        offset = code_map.get_offset(params['line'].to_i, params['col'].to_i)
-        sugg = code_map.suggest_at(offset, with_snippets: true, filtered: true)
+        sugg = []
+        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        @@semaphore.synchronize {
+          code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
+          offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
+          sugg = code_map.suggest_at(offset, with_snippets: true, filtered: true)
+        }
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e
         STDERR.puts e
@@ -17,5 +30,33 @@ module Solargraph
         { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
       end
     end
+
+    class << self
+      def run!
+        constant_updates
+        super
+      end
+
+      def prepare_workspace directory
+        api_map = Solargraph::ApiMap.new(directory)
+        @@semaphore.synchronize {
+          @@api_hash[directory] = api_map
+        }
+      end
+
+      def constant_updates
+        Thread.new {
+          loop do
+            @@api_hash.keys.each { |k|
+              update = Solargraph::ApiMap.new(k)
+              @@semaphore.synchronize {
+                @@api_hash[k] = update
+              }
+            }
+            sleep 2
+          end
+        }
+      end
+    end
   end
 end

data/lib/solargraph/shell.rb

@@ -42,30 +42,13 @@ module Solargraph
       end
     end
     
-    desc 'bundled', 'Get a list of bundled gems'
-    def bundled
-      Bundler.load.specs.each { |s|
-        puts s.name
-      }
-    end
-    
     desc 'server', 'Start a Solargraph server'
+    option :port, type: :numeric, aliases: :p, desc: 'The server port', default: 7657
     def server
+      Solargraph::Server.set :port, options[:port]
       Solargraph::Server.run!
     end
     
-    desc 'serialize DIRECTORY', 'Cache an API map of DIRECTORY'
-    def serialize directory
-      api_map = ApiMap.new directory
-      files = Dir[File.join directory, 'lib', '**', '*.rb'] + Dir[File.join directory, 'app', '**', '*.rb']
-      files.each { |f|
-        api_map.append_file f
-      }
-      File.open(File.join(directory, '.solargraph.ser'), 'wb') { |file|
-        file << Marshal.dump(api_map)
-      }
-    end
-
     desc 'suggest', 'Get code suggestions for the provided input'
     long_desc <<-LONGDESC
       Analyze a Ruby file and output a list of code suggestions in JSON format.

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser