solargraph-rails 0.2.2.pre.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7550cc551e9ee58ed7e88b5cac988326729410700f4833735c63e25423def03e
-  data.tar.gz: 50b16e19c7843b9e30956e68c14164763c130c1aceafb9c93fa25286c1f5d17c
+  metadata.gz: bdae0802262c6077a713ab7360faba89107df21b076feb137632d38ea119b7ab
+  data.tar.gz: 241082c1dd11fd455da5b9c309d8836021e9509f7ecad08542d71307485cf726
 SHA512:
-  metadata.gz: 9d90365c3d92aa903a50d5210f09d5bab8f0326bb29b42216cc8def98df66e6dfc14e31e93c44ab025d58ca8c320425e0590f21b02c9f0c95a09c47098aeca44
-  data.tar.gz: 4e3ce253f78282b89c15eeb14b8ed2d7cd026bb12141fcefad04d5264321673b9a8b6af464913330f1f773ed11e96b91883bfef9a08df302290f8bc06fcb4dcc
+  metadata.gz: 06c879380e6f6bc9cf0858809e725058d6b2d013db97816de6fc9afc23431bd51baede7431b1ed7e6ae3338707fe2978b90493119917ff0b3cecf51ccadbc925
+  data.tar.gz: fbda10862a2f58edcd111f643d475111fdea59c0b2f5797f024365c7858642be78747a11ffd04511c35b73791e6e63bdbfa329e7a6dbce46e8fc96488bd3234d

data/.gitignore

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

data/CHANGELOG.md

@@ -2,7 +2,18 @@
 
 ## Changes
 
-### v0.2.2.pre
+### 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`

data/README.md

@@ -52,23 +52,25 @@ 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 (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`:
+There is simplistic support for `belongs_to` and `has_many` macros:
 
  ![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.
 
+Association support is slightly less functional in Rails 7.
+
 ## Installation
 
-###  Install `solargraph` v0.40+ and `solargraph_rails` locally
+###  Install `solargraph` and `solargraph-rails` locally
 
 Typically gems like these are not installed via the Gemfile, because most projects have more than one contributor and other contributors might have different setups for their editors in mind. Instead you need to use `gem install`.
 
 `gem install solargraph-rails`
 
 ####  Alternative: using bundler
-If you do want to use bundler, add `gem 'solargraph-rails', '~> 0.2.0'`
+If you do want to use bundler, add `gem 'solargraph-rails'`
 
 ### Add `solargraph-rails` to your `.solargraph.yml`
 

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

@@ -6,10 +6,18 @@ module MetaSource
       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
-        name&.camelize
+        @type || name&.camelize
       end
     end
   end

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

@@ -6,10 +6,18 @@ module MetaSource
       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
-        "Array<#{name.singularize.camelize}>"
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
       end
     end
   end

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

@@ -6,10 +6,18 @@ module MetaSource
       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
-        "Array<#{name.singularize.camelize}>"
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
       end
     end
   end

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

@@ -6,10 +6,18 @@ module MetaSource
       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
-        name.camelize
+        @type || name.camelize
       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
@@ -109,6 +109,7 @@ module Solargraph
           'datetime' => 'ActiveSupport::TimeWithZone',
           'string' => 'String',
           'boolean' => 'Boolean',
+          'float' => 'Float',
           'text' => 'String'
         }
       end

data/lib/solargraph/rails/version.rb

@@ -1,5 +1,5 @@
 module Solargraph
   module Rails
-    VERSION = '0.2.2.pre.2'
+    VERSION = '0.3.1'
   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.42.0"
-  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.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-02-04 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.42.0
+        version: 0.41.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        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:
@@ -93,7 +93,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -128,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,109 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solargraph-rails (0.2.2.pre.2)
-      activesupport (~> 6.1.3)
-      solargraph (~> 0.42.0)
-
-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.7)
-      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.1)
-      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.42.1)
-      backport (~> 1.1)
-      benchmark
-      bundler (>= 1.17.2)
-      diff-lcs (~> 1.4)
-      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