solargraph-rails 0.2.1.1 → 0.2.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4de8c2ed7ec21658fc8613358b5c6ed4052b06457b100a4fb4612bd014414c46
-  data.tar.gz: 9e8e8a3b202e074168c34fd49c59dbba0c27744e163e8b6c2ea668fbd0817bde
+  metadata.gz: 42b094ca4d96b63dd47297f752e821904875c11eda1f2a367ab84da2862b5ff6
+  data.tar.gz: 60200f07c8ff06a580cd4f44aba81fe2313c12364bf23b9637c8a874b2769c2e
 SHA512:
-  metadata.gz: c11ae8b938ba3cf42fd79a63cb6b5729783709c0f6bc42e1e70d091ff5d69ee182ea64894d039a6b484cbc52b388f0d69c852e16eacbdcc306a3806b797e4f89
-  data.tar.gz: 66d7b753bf6c833b9d9c3bee0e2a210f637d281cd97cea7c636ba7c529ec930389e4d13c8e0bc4114da436633278c21ab1ec9ba66c5b42f5ac0038271493ac3b
+  metadata.gz: 55fb5b511f8ff2dc298d47063e4a602154cee613852a750ecc7fe77acdf1a9aa0686fbed86435180cf4c88dcb1038b7510b6ef9b1b58f4ff636d7f17cf34a475
+  data.tar.gz: b33e682d6b94cb029d741495c0e14719ffbc643273d8fbe96b88725cbcc085425710e6d95683646f107bc5d874dc2ed00b96e89149fe881d2b6113bba95c3eda

data/Gemfile.lock

@@ -1,28 +1,39 @@
 PATH
   remote: .
   specs:
-    solargraph-rails (0.2.1.1)
-      solargraph (>= 0.41.1)
+    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.2.0)
+    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)
-    nokogiri (1.11.7)
+    minitest (5.14.4)
+    nokogiri (1.11.6)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -48,7 +59,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.18.3)
+    rubocop (1.16.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -60,11 +71,10 @@ GEM
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    solargraph (0.42.3)
-      backport (~> 1.2)
+    solargraph (0.41.1)
+      backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
-      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
@@ -77,8 +87,11 @@ GEM
       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

data/lib/solargraph/rails/pin_creator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/string'
+
 module Solargraph
   module Rails
     class PinCreator
@@ -50,13 +52,47 @@ module Solargraph
           end
         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)
+
+            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: has_many_reader,
+              type: "Array<#{has_many_reader.singularize.camelize}>",
+              location: loc
+            }
+          end
+        end
+
         parser.parse
 
         Solargraph::Logging.logger.info "Adding #{model_attrs.count} attributes as pins"
         model_attrs.map do |attr|
           Solargraph::Pin::Method.new(
             name: attr[:name],
-            comments: "@return [#{type_translation[attr[:type]]}]",
+            comments: "@return [#{type_translation.fetch(attr[:type], attr[:type])}]",
             location: attr[:location],
             closure: Solargraph::Pin::Namespace.new(name: module_names.join('::') + "::#{model_name}"),
             scope: :instance,

data/lib/solargraph/rails/version.rb

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

data/solargraph-rails.gemspec

@@ -25,5 +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.41.1"
+  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.1.1
+  version: 0.2.2.pre.1
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
 description: Add reflection on ActiveModel dynamic attributes that will be created
   at runtime
 email:
@@ -77,7 +91,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -109,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
 signing_key:

data/CHANGELOG.md

@@ -1,28 +0,0 @@
-# solargraph-rails changelog
-
-## Changes
-
-### v0.2.1.1
-
-* Loosen dependency requirement on solargraph
-
-### 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