solargraph-rails 0.2.2.pre.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b094ca4d96b63dd47297f752e821904875c11eda1f2a367ab84da2862b5ff6
-  data.tar.gz: 60200f07c8ff06a580cd4f44aba81fe2313c12364bf23b9637c8a874b2769c2e
+  metadata.gz: cf9a813f372c7c2f1e7b26294cde25617702b4d718cbac08f37036a866a23365
+  data.tar.gz: af00aad628cc77acb911dcc86e8906609cd71a4b906b8eb69b0a6cae9343b409
 SHA512:
-  metadata.gz: 55fb5b511f8ff2dc298d47063e4a602154cee613852a750ecc7fe77acdf1a9aa0686fbed86435180cf4c88dcb1038b7510b6ef9b1b58f4ff636d7f17cf34a475
-  data.tar.gz: b33e682d6b94cb029d741495c0e14719ffbc643273d8fbe96b88725cbcc085425710e6d95683646f107bc5d874dc2ed00b96e89149fe881d2b6113bba95c3eda
+  metadata.gz: cc552911a9121aa3a7876fabf09c7850854ba53bea4fbb8374f565017d39ccc2cb1d6c2a9db30b62a213c35577eb6d290b8037ffd140216e676fba3e2038c01a
+  data.tar.gz: 74d5c903fedf1d94500b7d51a94810e95af3b7b8dc04dfa8bbeba724f4f8bf4587273a8788a87580bbae01868a1a75ddccba5daf0074069d102d83c10d28ca5f

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# solargraph-rails changelog
+
+## Changes
+
+### v0.3.0
+* Require String inflection monkeypatches directly to avoid error from ActiveSupport v7
+* Remove Gemfile.lock from version control
+
+### v0.2.2.pre.4
+* Loosen the dependency requirements
+
+### v0.2.2.pre.3
+* Update to solargraph 0.42.3
+* Determine return type of association using class_name argument
+
+### v0.2.2.pre.2
+
+* 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/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/meta_source/association/belongs_to_matcher.rb

@@ -0,0 +1,24 @@
+module MetaSource
+  module Association
+    class BelongsToMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /belongs_to\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+
+        return unless @name
+
+        return @name unless line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+
+        @type = Regexp.last_match(1)
+
+        @name
+      end
+
+      def type
+        @type || name&.camelize
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+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)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
+      end
+
+      def type
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module MetaSource
+  module Association
+    class HasManyMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /has_many\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
+      end
+
+      def type
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module MetaSource
+  module Association
+    class HasOneMatcher
+      attr_reader :name
+
+      def match?(line)
+        line =~ /has_one\s+:([a-z_]*)/
+        @name = Regexp.last_match(1)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
+      end
+
+      def type
+        @type || name.camelize
+      end
+    end
+  end
+end

data/lib/solargraph/rails/pin_creator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string'
+require 'active_support/core_ext/string/inflections'
 
 module Solargraph
   module Rails
@@ -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.3.0'
   end
 end

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/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 "activesupport", "~> 6.1.3"
+  spec.add_runtime_dependency "solargraph", ">= 0.41.1"
+  spec.add_runtime_dependency "activesupport"
 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.3.0
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,30 +56,30 @@ dependencies:
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.41.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: '0'
 description: Add reflection on ActiveModel dynamic attributes that will be created
   at runtime
 email:
@@ -91,18 +91,23 @@ 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
@@ -122,9 +127,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key:

data/Gemfile.lock

@@ -1,108 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solargraph-rails (0.2.1)
-      activesupport
-      solargraph (~> 0.41.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.1.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.2)
-    backport (1.1.2)
-    benchmark (0.1.1)
-    bundler-audit (0.8.0)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 1.0)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    e2mmap (0.1.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    kramdown (2.3.1)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
-    nokogiri (1.11.6)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    racc (1.5.2)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (2.1.1)
-    reverse_markdown (2.0.0)
-      nokogiri
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.16.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    solargraph (0.41.1)
-      backport (~> 1.1)
-      benchmark
-      bundler (>= 1.17.2)
-      e2mmap
-      jaro_winkler (~> 1.5)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
-      thor (~> 1.0)
-      tilt (~> 2.0)
-      yard (~> 0.9, >= 0.9.24)
-    thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    yard (0.9.26)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.2.10)
-  bundler-audit
-  byebug
-  rake (~> 12.3.3)
-  rspec (~> 3.0)
-  solargraph-rails!
-
-BUNDLED WITH
-   2.2.16