solargraph-rails 0.2.2.pre.1 → 0.2.2.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b094ca4d96b63dd47297f752e821904875c11eda1f2a367ab84da2862b5ff6
-  data.tar.gz: 60200f07c8ff06a580cd4f44aba81fe2313c12364bf23b9637c8a874b2769c2e
+  metadata.gz: 7550cc551e9ee58ed7e88b5cac988326729410700f4833735c63e25423def03e
+  data.tar.gz: 50b16e19c7843b9e30956e68c14164763c130c1aceafb9c93fa25286c1f5d17c
 SHA512:
-  metadata.gz: 55fb5b511f8ff2dc298d47063e4a602154cee613852a750ecc7fe77acdf1a9aa0686fbed86435180cf4c88dcb1038b7510b6ef9b1b58f4ff636d7f17cf34a475
-  data.tar.gz: b33e682d6b94cb029d741495c0e14719ffbc643273d8fbe96b88725cbcc085425710e6d95683646f107bc5d874dc2ed00b96e89149fe881d2b6113bba95c3eda
+  metadata.gz: 9d90365c3d92aa903a50d5210f09d5bab8f0326bb29b42216cc8def98df66e6dfc14e31e93c44ab025d58ca8c320425e0590f21b02c9f0c95a09c47098aeca44
+  data.tar.gz: 4e3ce253f78282b89c15eeb14b8ed2d7cd026bb12141fcefad04d5264321673b9a8b6af464913330f1f773ed11e96b91883bfef9a08df302290f8bc06fcb4dcc

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# solargraph-rails changelog
+
+## Changes
+
+### v0.2.2.pre
+
+* Simplistic support for associations
+* Added dependency on ActiveSupport 6.1 for helpful String methods like `.camelize` and `.singularize`
+
+### v0.2.1
+
+* Update Solargraph to 0.41
+
+### v0.2.0
+First released version with no need to use --pre!
+
+* Updated dependencies with security warnings

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    solargraph-rails (0.2.1)
-      activesupport
-      solargraph (~> 0.41.1)
+    solargraph-rails (0.2.2.pre.2)
+      activesupport (~> 6.1.3)
+      solargraph (~> 0.42.0)
 
 GEM
   remote: https://rubygems.org/
@@ -33,7 +33,7 @@ GEM
       kramdown (~> 2.0)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
-    nokogiri (1.11.6)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -59,7 +59,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.16.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -71,10 +71,11 @@ GEM
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    solargraph (0.41.1)
+    solargraph (0.42.1)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)

data/README.md

@@ -51,8 +51,10 @@ Solargraph won't know about attributes that you add during a session. Restart yo
 
 For my setup with Emacs, that means running `M-x lsp-workspace-restart`, YMMV in other editors.
 
-## Associations
-This is coming soon.
+## Associations (experimental)
+There is very hacky and simplistic support for `belongs_to` and `has_many` macros, if you are willing to use `gem install solargraph-rails --pre`:
+
+ ![Experimental autocomplete and go to definition of associations](assets/solar_rails_associations.gif)
 
 ## Known issues
 This project is being used to write production code by the maintainer, but it is still WIP. Check out the issues tab and contribute if you are interested.

data/lib/solargraph-rails.rb

@@ -5,6 +5,10 @@ require 'solargraph/rails/version'
 require_relative 'solargraph/rails/pin_creator'
 require_relative 'solargraph/rails/ruby_parser'
 require_relative 'solargraph/rails/files_loader'
+require_relative 'solargraph/rails/meta_source/association/belongs_to_matcher'
+require_relative 'solargraph/rails/meta_source/association/has_many_matcher'
+require_relative 'solargraph/rails/meta_source/association/has_one_matcher'
+require_relative 'solargraph/rails/meta_source/association/has_and_belongs_to_many_matcher'
 
 module Solargraph
   module Rails

data/lib/solargraph/rails/meta_source/association/belongs_to_matcher.rb

@@ -0,0 +1,16 @@
+module MetaSource
+  module Association
+    class BelongsToMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /belongs_to\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+      end
+
+      def type
+        name&.camelize
+      end
+    end
+  end
+end

data/lib/solargraph/rails/meta_source/association/has_and_belongs_to_many_matcher.rb

@@ -0,0 +1,16 @@
+module MetaSource
+  module Association
+    class HasAndBelongsToManyMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /has_and_belongs_to_many\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+      end
+
+      def type
+        "Array<#{name.singularize.camelize}>"
+      end
+    end
+  end
+end

data/lib/solargraph/rails/meta_source/association/has_many_matcher.rb

@@ -0,0 +1,16 @@
+module MetaSource
+  module Association
+    class HasManyMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /has_many\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+      end
+
+      def type
+        "Array<#{name.singularize.camelize}>"
+      end
+    end
+  end
+end

data/lib/solargraph/rails/meta_source/association/has_one_matcher.rb

@@ -0,0 +1,16 @@
+module MetaSource
+  module Association
+    class HasOneMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /has_one\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+      end
+
+      def type
+        name.camelize
+      end
+    end
+  end
+end

data/lib/solargraph/rails/pin_creator.rb

@@ -53,22 +53,11 @@ module Solargraph
         end
 
         parser.on_ruby_line do |line|
-          if line =~ /belongs_to\s+:([a-z_]*)/
-            belongs_to_reader = Regexp.last_match(1)
-
-            loc = Solargraph::Location.new(
-              path,
-              Solargraph::Range.from_to(
-                parser.current_line_number,
-                0,
-                parser.current_line_number,
-                parser.current_line_length - 1
-              )
-            )
-            model_attrs << { name: belongs_to_reader, type: belongs_to_reader.camelize, location: loc }
-          elsif line =~ /has_many\s+:([a-z_]*)/
-            has_many_reader = Regexp.last_match(1)
+          matcher = ruby_matchers.find do |m|
+            m.match?(line)
+          end
 
+          if matcher
             loc = Solargraph::Location.new(
               path,
               Solargraph::Range.from_to(
@@ -78,11 +67,7 @@ module Solargraph
                 parser.current_line_length - 1
               )
             )
-            model_attrs << {
-              name: has_many_reader,
-              type: "Array<#{has_many_reader.singularize.camelize}>",
-              location: loc
-            }
+            model_attrs << { name: matcher.name, type: matcher.type, location: loc }
           end
         end
 
@@ -101,6 +86,14 @@ module Solargraph
         end
       end
 
+      def ruby_matchers
+        [
+          MetaSource::Association::BelongsToMatcher.new,
+          MetaSource::Association::HasManyMatcher.new,
+          MetaSource::Association::HasOneMatcher.new,
+          MetaSource::Association::HasAndBelongsToManyMatcher.new
+        ]
+      end
       def col_with_type(line)
         line
           .gsub(/[\(\),:\d]/, '')

data/lib/solargraph/rails/version.rb

@@ -1,5 +1,5 @@
 module Solargraph
   module Rails
-    VERSION = '0.2.2.pre.1'
+    VERSION = '0.2.2.pre.2'
   end
 end

data/solargraph-rails.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "solargraph", "~> 0.41.1"
+  spec.add_runtime_dependency "solargraph", "~> 0.42.0"
   spec.add_runtime_dependency "activesupport", "~> 6.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre.1
+  version: 0.2.2.pre.2
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -91,18 +91,24 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - assets/peek.png
+- assets/solar_rails_associations.gif
 - assets/solar_rails_autocomplete.gif
 - assets/solar_rails_goto.gif
 - bin/console
 - bin/setup
 - lib/solargraph-rails.rb
 - lib/solargraph/rails/files_loader.rb
+- lib/solargraph/rails/meta_source/association/belongs_to_matcher.rb
+- lib/solargraph/rails/meta_source/association/has_and_belongs_to_many_matcher.rb
+- lib/solargraph/rails/meta_source/association/has_many_matcher.rb
+- lib/solargraph/rails/meta_source/association/has_one_matcher.rb
 - lib/solargraph/rails/pin_creator.rb
 - lib/solargraph/rails/ruby_parser.rb
 - lib/solargraph/rails/version.rb