solargraph-rails 1.2.4 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c75700c14be9b0c73c8f6ec22b567dccc1acf54bc085fe7b592b946ed8fc1fa
-  data.tar.gz: 6e785a2772256e6b4276e55d699715bad92afe52e659ae523bd289fdbe62a0bc
+  metadata.gz: 7b24e92621f34f70e86ce1e93841489deac1c977cc12f80bcb5d097fd0ba2e7c
+  data.tar.gz: 8d0299494e027dd55fa9270e4aa7212c00b768c5952cf223f2b998bdb224de20
 SHA512:
-  metadata.gz: 6d17000653dde7d3e5d7059805ce73a9cdeb65103775b7da1c6366862d8eb6178c4f3df1451deb0eb326890c12a000128f9dc0204f8559fedc215a25643f48fc
-  data.tar.gz: e2999b7c83c2c45ab6955f3aff072bcd43b1b8a32b655076d29066d1f65a6d7087705a12f26d63fa2f6471311f90d97a25fa02f1be51f100cb09784c144ab2cd
+  metadata.gz: b63b981c50f993725af679aa99ed89572656005c5114e408c90d33b37fbdcc450be4ddd0e07cd2876babf41f0b4efc84e0b866a121ca94a5e79b1592e8383552
+  data.tar.gz: 0a1ed573aa727c4aa0a96488c23e27ce34f813840ec44f0c58d6d214c6d49df0d53e9158a648bb2101fe0fff901097979e045906f0b60baaf329b123bbb75f7b

data/.github/workflows/linter.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.4
-          bundler: latest
+          bundler: Gemfile.lock
           bundler-cache: true
           cache-version: ${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}-2025-06-06
         env:

data/.github/workflows/rails_new.yml

@@ -0,0 +1,101 @@
+# To debug locally:
+#   npm install -g act
+#   act pull_request
+#
+
+name: New Rails project
+
+on:
+  workflow_dispatch: {}
+  pull_request:
+    branches: [main]
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+
+jobs:
+  typecheck_strong:
+    name: strong typecheck
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        versions:
+          # ruby 3.2 is minimum Ruby supported by Rails 8.0
+          - ruby: "3.2"
+            rails-major: "8"
+            rails-minor: "0"
+          - ruby: "3.2"
+            rails-major: "7"
+            rails-minor: "0"
+          - ruby: "3.2"
+            rails-major: "7"
+            rails-minor: "1"
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.versions.ruby }}
+          bundler: Gemfile.lock
+          bundler-cache: true
+          cache-version: ${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}-2025-09-09
+        env:
+          MATRIX_RAILS_MAJOR_VERSION: ${{ matrix.versions.rails-major }}
+          MATRIX_RAILS_VERSION: ${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: yq
+          version: 1.0
+      - name: Restore cache of gem annotations
+        id: dot-cache-restore
+        uses: actions/cache/restore@v4
+        with:
+          key: |
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}--${{ matrix.versions.rails-minor }}-${{ hashFiles('spec/**/Gemfile.lock') }}-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}-${{ matrix.versions.rails-minor }}-${{ hashFiles('spec/**/Gemfile.lock') }}-
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}-${{ matrix.versions.rails-minor }}-
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}-
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-
+          path: |
+            /home/runner/.cache/solargraph
+
+      - name: Typecheck default 'rails new' code
+        run: |
+          set -ex
+          bundle update solargraph
+          gem install rails -v '~> ${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}.0'
+          gem uninstall -I concurrent-ruby
+          # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+          gem install concurrent-ruby -v 1.3.4
+          pwd
+          cd ..
+          rails new test-project
+          cd test-project
+          echo 'gem "solargraph-rails", path: "../solargraph-rails"' >> Gemfile
+          echo 'gem "solargraph", github: "castwide/solargraph", branch: "master"' >> Gemfile
+          # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+          echo "gem 'concurrent-ruby', '1.3.4'" >> Gemfile
+          bundle install
+          bundle info solargraph
+          bundle info solargraph-rails
+          bin/rails --version
+          bundle exec rbs collection init
+          bundle exec rbs collection install
+          bundle exec solargraph config
+          yq -yi '.plugins += ["solargraph-rails"]' .solargraph.yml
+          bundle exec solargraph typecheck --level strong
+        env:
+          MATRIX_RAILS_MAJOR_VERSION: ${{ matrix.versions.rails-major }}
+          MATRIX_RAILS_VERSION: ${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}
+      - name: Cache gem annotations
+        id: dot-cache-save
+        if: always() && steps.dot-cache-restore.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          key: |
+            2025-09-09-${{ runner.os }}-dot-cache-${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}--${{ matrix.versions.rails-minor }}-${{ hashFiles('spec/**/Gemfile.lock') }}-${{ hashFiles('Gemfile.lock') }}
+          path: |
+            /home/runner/.cache/solargraph

data/.github/workflows/test.yml

@@ -47,6 +47,7 @@ jobs:
           - "0.56.1"
           - "0.56.2"
           - "0.57.0"
+          # - "0.58.0"
           - "branch-castwide-master"
         include:
           - versions:
@@ -62,7 +63,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.versions.ruby }}
-          bundler: latest
+          bundler: Gemfile.lock
           bundler-cache: true
           cache-version: ${{ matrix.solargraph-version }}-${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}-2025-09-09
         env:

data/.github/workflows/typecheck.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.4
-          bundler: latest
+          bundler: Gemfile.lock
           bundler-cache: true
           cache-version: ${{ matrix.versions.rails-major }}.${{ matrix.versions.rails-minor }}-2025-06-06
         env:

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Changes
 
+### v1.3
+
+Features/fixes:
+- Add support for Puma DSL
+- Add support for importmap.rb DSL
+- Type annotations for schema.rb
+- Remove Solargraph upper limit in gemspec
+
+Internal improvements:
+- Create a 'rails new' GitHub Actions workflow
+
 ### v1.2.4
 
 Features / fixes:

data/DEVELOPMENT.md

@@ -73,7 +73,7 @@ Move .yml files into place, then make sure to review the script and uncomment re
 ## Preparing a release (maintainers)
 
 1. Look up [most recent release](https://rubygems.org/gems/solargraph-rails)
-2. Open up [commit list](https://github.com/iftheshoefritz/solargraph-rails/compare/v1.2.3...main)
+2. Open up [commit list](https://github.com/iftheshoefritz/solargraph-rails/compare/v1.2.4...main)
 3. Update [CHANGELOG.md](./CHANGELOG.md)
 4. Flip to 'files changed view' and refine updates
 5. Bump [version](./lib/solargraph/rails/version.rb) appropriately

data/lib/solargraph/rails/annotations/active_record.rb

@@ -16,6 +16,129 @@ class ActiveRecord::ConnectionAdapters::SchemaStatements
   def change_table(table_name, **options); end
 end
 
+class ActiveRecord::ConnectionAdapters::ColumnMethods
+  # included do
+  #   define_column_methods :bigint, :binary, :boolean, :date, :datetime, :decimal,
+  #     :float, :integer, :json, :string, :text, :time, :timestamp, :virtual
+  #   alias :blob :binary
+  #   alias :numeric :decimal
+  # end
+
+  # def define_column_methods(*column_types) # :nodoc:
+  #   column_types.each do |column_type|
+  #     module_eval <<-RUBY, __FILE__, __LINE__ + 1
+  #       def #{column_type}(*names, **options)
+  #         raise ArgumentError, "Missing column name(s) for #{column_type}" if names.empty?
+  #         names.each { |name| column(name, :#{column_type}, **options) }
+  #       end
+  #     RUBY
+  #   end
+
+  # decimal
+  #
+  # @param names [Array<Symbol, String>]
+  # @param precision [Integer, nil]
+  # @param scale [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def decimal(*names, precision: nil, scale: nil, **options); end
+  # bigint
+  #
+  # @param names [Array<Symbol, String>]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def bigint(*names, **options); end
+  # virtual
+  #
+  # @param names [Array<Symbol, String>]
+  # @param type [Symbol, String]
+  # @param as [String]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def virtual(*names, type, as:, **options); end
+  # json
+  #
+  # @param names [Array<Symbol, String>]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def json(*names, **options); end
+  # jsonb
+  #
+  # @param names [Array<Symbol, String>]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def jsonb(*names, **options); end
+  # boolean
+  #
+  # @param names [Array<Symbol, String>]
+  # @param options [Hash{Symbol => undefined}]
+  # @param names [Array<Symbol, String>]
+  # @return [void]
+  def boolean(*names, **options); end
+  # string
+  #
+  # @param names [Array<Symbol, String>]
+  # @param limit [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def string(*names, limit: nil, **options); end
+  # text
+  #
+  # @param names [Array<Symbol, String>]
+  # @param limit [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def text(*names, limit: nil, **options); end
+  # integer
+  #
+  # @param names [Array<Symbol, String>]
+  # @param limit [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def integer(*names, limit: nil, **options); end
+  # float
+  #
+  # @param names [Array<Symbol, String>]
+  # @param limit [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def float(*names, limit: nil, **options); end
+  # binary
+  #
+  # @param names [Array<Symbol, String>]
+  # @param limit [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def binary(*names, limit: nil, **options); end
+  # date
+  #
+  # @param names [Array<Symbol, String>]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def date(*names, **options); end
+  # datetime
+  #
+  # @param names [Array<Symbol, String>]
+  # @param precision [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def datetime(*names, precision: nil, **options); end
+  # time
+  #
+  # @param names [Array<Symbol, String>]
+  # @param precision [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def time(*names, precision: nil, **options); end
+  # timestamp
+  #
+  # @param names [Array<Symbol, String>]
+  # @param precision [Integer, nil]
+  # @param options [Hash{Symbol => undefined}]
+  # @return [void]
+  def timestamp(*names, precision: nil, **options); end
+end
+
 module ActiveRecord::Core
   # @param methods [Symbol]
   # @return [ActiveSupport::HashWithIndifferentAccess<Symbol>]
@@ -35,6 +158,18 @@ class ActiveRecord::Relation
   include ActiveRecord::RelationMethods
 end
 
+module ActiveRecord
+  class Schema
+    # @param version [Numeric]
+    #
+    # @return [Class<ActiveRecord::Schema>]
+    def self.[](version); end
+
+    # @yieldreceiver [ActiveRecord::ConnectionAdapters::SchemaStatements]
+    def self.define(info = {}, &block); end
+  end
+end
+
 class ActiveRecord::Base
   extend Enumerable
   extend ActiveRecord::QueryMethods

data/lib/solargraph/rails/importmap.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Rails
+    class Importmap
+      EMPTY_ENVIRON = Environ.new
+
+      # @return [Solargraph::Rails::Importmap]
+      def self.instance
+        @instance ||= new
+      end
+
+      # @param environ [Solargraph::Environ]
+      # @param basename [String]
+      #
+      # @return [void]
+      def add_dsl(environ, basename)
+        return unless basename == 'importmap.rb'
+
+        environ.requires.push('importmap-rails')
+        environ.domains.push('Importmap::Map')
+
+        Solargraph.logger.debug(
+          "[Rails][Importmap] added DSL to environ: #{environ.inspect}"
+        )
+      end
+    end
+  end
+end

data/lib/solargraph/rails/puma.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Rails
+    class Puma
+      EMPTY_ENVIRON = Environ.new
+
+      # @return [Solargraph::Rails::Puma]
+      def self.instance
+        @instance ||= new
+      end
+
+      # @param environ [Solargraph::Environ]
+      # @param basename [String]
+      #
+      # @return [void]
+      def add_dsl(environ, basename)
+        return unless basename == 'puma.rb'
+
+        environ.requires.push('puma')
+        environ.domains.push('Puma::DSL')
+
+        Solargraph.logger.debug(
+          "[Rails][Puma] added DSL to environ: #{environ.inspect}"
+        )
+      end
+    end
+  end
+end

data/lib/solargraph/rails/version.rb

@@ -1,5 +1,5 @@
 module Solargraph
   module Rails
-    VERSION = '1.2.4'
+    VERSION = '1.3'
   end
 end

data/lib/solargraph-rails.rb

@@ -13,6 +13,8 @@ require_relative 'solargraph/rails/walker'
 require_relative 'solargraph/rails/rails_api'
 require_relative 'solargraph/rails/delegate'
 require_relative 'solargraph/rails/storage'
+require_relative 'solargraph/rails/puma'
+require_relative 'solargraph/rails/importmap'
 require_relative 'solargraph/rails/debug'
 require_relative 'solargraph/rails/version'
 
@@ -23,6 +25,9 @@ module Solargraph
     end
 
     class Convention < Solargraph::Convention::Base
+      # @param yard_map [Solargraph::DocMap]
+      #
+      # @return [Solargraph::Environ]
       def global(yard_map)
         Solargraph::Environ.new(
           pins: Solargraph::Rails::RailsApi.instance.global(yard_map)
@@ -34,6 +39,9 @@ module Solargraph
         EMPTY_ENVIRON
       end
 
+      # @param source_map [Solargraph::SourceMap]
+      #
+      # @return [Solargraph::Environ]
       def local(source_map)
         pins = []
         ds =
@@ -42,7 +50,13 @@ module Solargraph
           end
         ns = ds.first
 
-        return EMPTY_ENVIRON unless ns
+        basename = File.basename(source_map.filename)
+
+        environ = Solargraph::Environ.new
+        Puma.instance.add_dsl(environ, basename)
+        Importmap.instance.add_dsl(environ, basename)
+
+        return environ unless ns
 
         pins += run_feature { Schema.instance.process(source_map, ns) }
         pins += run_feature { Annotate.instance.process(source_map, ns) }
@@ -53,11 +67,16 @@ module Solargraph
         pins += run_feature { Delegate.instance.process(source_map, ns) } if Delegate.supported?
         pins += run_feature { RailsApi.instance.local(source_map, ns) }
 
-        Solargraph::Environ.new(pins: pins)
+        environ = Solargraph::Environ.new(pins: pins)
+        Puma.instance.add_dsl(environ, basename)
+        environ
       end
 
       private
 
+      # @yieldreturn [Array<Solargraph::Pin::Base>]
+      #
+      # @return [Array<Solargraph::Pin::Base>]
       def run_feature(&block)
         yield
       rescue => error

data/solargraph-rails.gemspec

@@ -6,14 +6,10 @@ require 'solargraph/rails/version'
 solargraph_force_ci_version = (ENV['CI'] && ENV['MATRIX_SOLARGRAPH_VERSION'])
 solargraph_version =
   if solargraph_force_ci_version && !solargraph_force_ci_version.start_with?('branch-')
-    [solargraph_force_ci_version]
+    solargraph_force_ci_version
   else
-    [
-      # below this isn't tested in CI
-      '>= 0.48.0',
-      # above this hasn't been tested
-      '<= 0.57'
-    ]
+    # below this isn't tested in CI
+    '>= 0.48.0'
   end
 
 Gem::Specification.new do |spec|
@@ -37,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'bundler', '>= 2.2.33'
   spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.76'

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: '1.3'
 platform: ruby
 authors:
 - Fritz Meissner
 bindir: exe
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2026-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,9 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.48.0
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '0.57'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,9 +107,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.48.0
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/workflows/linter.yml"
+- ".github/workflows/rails_new.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/typecheck.yml"
 - ".gitignore"
@@ -184,7 +179,9 @@ files:
 - lib/solargraph/rails/debug.rb
 - lib/solargraph/rails/delegate.rb
 - lib/solargraph/rails/devise.rb
+- lib/solargraph/rails/importmap.rb
 - lib/solargraph/rails/model.rb
+- lib/solargraph/rails/puma.rb
 - lib/solargraph/rails/rails_api.rb
 - lib/solargraph/rails/schema.rb
 - lib/solargraph/rails/storage.rb