solargraph-rails 0.2.2.pre.4 → 1.0.0.pre.1

data/solargraph-rails.gemspec

@@ -1,30 +1,32 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "solargraph/rails/version"
+require 'solargraph/rails/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "solargraph-rails"
-  spec.version       = Solargraph::Rails::VERSION
-  spec.authors       = ["Fritz Meissner"]
-  spec.email         = ["fritz.meissner@gmail.com"]
+  spec.name = 'solargraph-rails'
+  spec.version = Solargraph::Rails::VERSION
+  spec.authors = ['Fritz Meissner']
+  spec.email = ['fritz.meissner@gmail.com']
 
-  spec.summary       = %q{Solargraph plugin that adds Rails-specific code through a Convention}
-  spec.description   = %q{Add reflection on ActiveModel dynamic attributes that will be created at runtime}
-  spec.homepage      = 'https://github.com/iftheshoefritz/solargraph-rails'
-  spec.license       = "MIT"
+  spec.summary =
+    'Solargraph plugin that adds Rails-specific code through a Convention'
+  spec.description =
+    'Add reflection on ActiveModel dynamic attributes that will be created at runtime'
+  spec.homepage = 'https://github.com/iftheshoefritz/solargraph-rails'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files =
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 2.2.10"
-  spec.add_development_dependency "rake", "~> 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 2.3'
+  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"
+  spec.add_runtime_dependency 'solargraph', '~> 0.44.2'
+  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.4
+  version: 1.0.0.pre.1
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.44.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.44.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -88,12 +88,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".solargraph.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- DEVELOPMENT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -104,14 +107,21 @@ files:
 - 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/annotate.rb
+- lib/solargraph/rails/annotations.rb
+- lib/solargraph/rails/autoload.rb
+- lib/solargraph/rails/debug.rb
+- lib/solargraph/rails/delegate.rb
+- lib/solargraph/rails/devise.rb
+- lib/solargraph/rails/model.rb
+- lib/solargraph/rails/rails_api.rb
+- lib/solargraph/rails/schema.rb
+- lib/solargraph/rails/storage.rb
+- lib/solargraph/rails/types.yml
+- lib/solargraph/rails/util.rb
 - lib/solargraph/rails/version.rb
+- lib/solargraph/rails/walker.rb
+- script/generate_definitions.rb
 - solargraph-rails.gemspec
 homepage: https://github.com/iftheshoefritz/solargraph-rails
 licenses:

data/Gemfile.lock

@@ -1,109 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solargraph-rails (0.2.2.pre.4)
-      activesupport
-      solargraph (>= 0.41.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.1.4)
-      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)
-    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.17.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.42.3)
-      backport (~> 1.2)
-      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

data/lib/solargraph/rails/files_loader.rb

@@ -1,16 +0,0 @@
-module Solargraph
-  module Rails
-    class FilesLoader
-      def initialize(file_names)
-        @file_names = file_names
-      end
-
-      def each(&blk)
-        @file_names.each do |file_name|
-          Solargraph::Logging.logger.info "loading from #{file_name}"
-          blk.call(file_name, File.read(file_name))
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/string'
-
-module Solargraph
-  module Rails
-    class PinCreator
-      attr_reader :contents, :path
-
-      def initialize(path, contents)
-        @path = path
-        @contents = contents
-      end
-
-      def create_pins
-        model_attrs = []
-        model_name = nil
-        module_names = []
-        parser = RubyParser.new(file_contents: contents)
-
-        parser.on_comment do |comment|
-          Solargraph::Logging.logger.info "found comment #{comment}"
-          col_name, col_type = col_with_type(comment)
-          if type_translation.keys.include?(col_type)
-            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: col_name, type: col_type, location: loc }
-          else
-            Solargraph::Logging.logger.info 'could not find annotation in comment'
-          end
-        end
-
-        parser.on_module do |mod_name|
-          Solargraph::Logging.logger.info "found module #{mod_name}"
-          module_names << mod_name
-        end
-
-        parser.on_class do |klass, superklass|
-          Solargraph::Logging.logger.info "found class: #{klass} < #{superklass}"
-          if ['ActiveRecord::Base', 'ApplicationRecord'].include?(superklass)
-            model_name = klass
-          else
-            Solargraph::Logging.logger.info "Unable to find ActiveRecord model from #{klass} #{superklass}"
-            model_attrs = [] # don't include anything from this file
-          end
-        end
-
-        parser.on_ruby_line do |line|
-          matcher = ruby_matchers.find do |m|
-            m.match?(line)
-          end
-
-          if matcher
-            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: matcher.name, type: matcher.type, 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.fetch(attr[:type], attr[:type])}]",
-            location: attr[:location],
-            closure: Solargraph::Pin::Namespace.new(name: module_names.join('::') + "::#{model_name}"),
-            scope: :instance,
-            attribute: true
-          )
-        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]/, '')
-          .split
-          .first(2)
-      end
-
-      def type_translation
-        {
-          'decimal' => 'BigDecimal',
-          'integer' => 'Integer',
-          'date' => 'Date',
-          'datetime' => 'ActiveSupport::TimeWithZone',
-          'string' => 'String',
-          'boolean' => 'Boolean',
-          'text' => 'String'
-        }
-      end
-    end
-  end
-end

data/lib/solargraph/rails/ruby_parser.rb

@@ -1,77 +0,0 @@
-module Solargraph
-  module Rails
-    class RubyParser
-      attr_reader :current_line_number, :current_line_length
-
-      def initialize(file_contents: '')
-        @lines = file_contents.lines
-        @comment_handlers = []
-        @non_comment_handlers = []
-        @class_handlers = []
-        @module_handlers = []
-      end
-
-      def on_comment(&blk)
-        @comment_handlers << blk
-      end
-
-      def on_class(&blk)
-        @class_handlers << blk
-      end
-
-      def on_module(&blk)
-        @module_handlers << blk
-      end
-
-      def on_ruby_line(&blk)
-        @non_comment_handlers << blk
-      end
-
-      def parse
-        @lines
-          .map(&:rstrip)
-          .each_with_index do |line, i|
-          @current_line_number = i
-          @current_line_length = line.length
-
-          if is_comment?(line)
-            comment_content = line.gsub(/#\s*/, '')
-            @comment_handlers.each { |handler| handler.call(comment_content) }
-          else
-            @non_comment_handlers.each { |handler| handler.call(line) }
-          end
-
-          if is_class?(line)
-            line.scan(/(?:(?<!<\s)(?:(\b\w+\b)\:\:))/).flatten.each do |inline_module_name|
-              @module_handlers.each { | handler| handler.call(inline_module_name) }
-            end
-            line.match(/class\s+(?:\w*?(?:\:\:))*([A-Z]\w*)/)
-            klass_name = $1
-            line.match(/(?:<\s+)((?:[A-Z]\w*(?:\:\:)?)*)/)
-            superklass_name = $1
-            @class_handlers.each { |handler| handler.call(klass_name, superklass_name) }
-          end
-
-          if is_module?(line)
-            module_name = line.match(/^\s*module\s*?([A-Z]\w+)/)[1]
-            @module_handlers.each { |handler| handler.call(module_name) }
-          end
-        end
-      end
-
-      private
-
-      def is_comment?(line)
-        line =~ (/^\s*#/)
-      end
-
-      def is_class?(line)
-        line =~ /^[^#]?.*?class\s+?[A-Z]/
-      end
-
-      def is_module?(line)
-        line =~ (/^\s*module\s*?([A-Z]\w+)/)
-      end
-    end
-  end
-end