From 9419ca8ae400c381cacb7335b86604fdc07081fc Mon Sep 17 00:00:00 2001
From: Fritz Meissner <fritz.meissner@gmail.com>
Date: Mon, 4 Jan 2021 08:12:19 +0200
Subject: [PATCH] Bump version to 0.2.0.pre and update files for name change

Gem is now named solargraph-rails, had to change the directory structure
for the naming to make sense.
---
 README.md                                     |  4 +-
 bin/console                                   |  2 +-
 lib/solargraph-rails.rb                       | 32 +++++++
 lib/solargraph/rails/files_loader.rb          | 16 ++++
 lib/solargraph/rails/pin_creator.rb           | 88 +++++++++++++++++++
 lib/solargraph/rails/ruby_parser.rb           | 70 +++++++++++++++
 lib/solargraph/rails/version.rb               |  5 ++
 lib/solargraph_rails.rb                       | 30 -------
 lib/solargraph_rails/files_loader.rb          | 14 ---
 lib/solargraph_rails/pin_creator.rb           | 86 ------------------
 lib/solargraph_rails/ruby_parser.rb           | 68 --------------
 lib/solargraph_rails/version.rb               |  3 -
 ..._rails.gemspec => solargraph-rails.gemspec | 17 +---
 spec/dynamic_attributes_spec.rb               |  6 +-
 .../rails}/files_loader_spec.rb               |  8 +-
 .../rails}/pin_creator_spec.rb                | 36 ++++----
 .../rails}/ruby_parser_spec.rb                | 30 +++----
 spec/solargraph_rails_spec.rb                 |  4 +-
 spec/spec_helper.rb                           |  2 +-
 19 files changed, 261 insertions(+), 260 deletions(-)
 create mode 100644 lib/solargraph-rails.rb
 create mode 100644 lib/solargraph/rails/files_loader.rb
 create mode 100644 lib/solargraph/rails/pin_creator.rb
 create mode 100644 lib/solargraph/rails/ruby_parser.rb
 create mode 100644 lib/solargraph/rails/version.rb
 delete mode 100644 lib/solargraph_rails.rb
 delete mode 100644 lib/solargraph_rails/files_loader.rb
 delete mode 100644 lib/solargraph_rails/pin_creator.rb
 delete mode 100644 lib/solargraph_rails/ruby_parser.rb
 delete mode 100644 lib/solargraph_rails/version.rb
 rename solargraph_rails.gemspec => solargraph-rails.gemspec (64%)
 rename spec/lib/{solargraph_rails => solargraph/rails}/files_loader_spec.rb (76%)
 rename spec/lib/{solargraph_rails => solargraph/rails}/pin_creator_spec.rb (89%)
 rename spec/lib/{solargraph_rails => solargraph/rails}/ruby_parser_spec.rb (84%)

diff --git a/README.md b/README.md
index b3ac5d9..2ac8d82 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# SolargraphRails - Help solargraph with Rails
+# Solargraph::Rails - Help solargraph with Rails
 
 ## Work in progress - here be dragons
 There are significant rough edges to this gem still. Don't use it if you're not willing to do things like build gems from source and install them locally. See `Installation` below for more info.
@@ -84,7 +84,7 @@ plugins:
 ```
 
 ### Add annotate
-Add schema comments your model files using [Annotate](https://github.com/ctran/annotate_models/). At the moment SolargraphRails assumes your schema comments are at the top of the source file.
+Add schema comments your model files using [Annotate](https://github.com/ctran/annotate_models/). At the moment Solargraph::Rails assumes your schema comments are at the top of the source file.
 
 ## Development
 
diff --git a/bin/console b/bin/console
index 81be4f3..8a679f6 100755
--- a/bin/console
+++ b/bin/console
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "solargraph_rails"
+require "solargraph-rails"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
diff --git a/lib/solargraph-rails.rb b/lib/solargraph-rails.rb
new file mode 100644
index 0000000..84e8c5b
--- /dev/null
+++ b/lib/solargraph-rails.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'solargraph'
+require 'solargraph/rails/version'
+require_relative 'solargraph/rails/pin_creator'
+require_relative 'solargraph/rails/ruby_parser'
+require_relative 'solargraph/rails/files_loader'
+
+module Solargraph
+  module Rails
+    class DynamicAttributes < Solargraph::Convention::Base
+      def global yard_map
+        Solargraph::Environ.new(pins: parse_models)
+      end
+
+      private
+
+      def parse_models
+        pins = []
+
+        FilesLoader.new(
+          Dir[File.join(Dir.pwd, 'app', 'models', '**', '*.rb')]
+        ).each { |file, contents| pins.push *PinCreator.new(file, contents).create_pins }
+
+        pins
+      end
+    end
+  end
+end
+
+
+Solargraph::Convention.register Solargraph::Rails::DynamicAttributes
diff --git a/lib/solargraph/rails/files_loader.rb b/lib/solargraph/rails/files_loader.rb
new file mode 100644
index 0000000..51fef22
--- /dev/null
+++ b/lib/solargraph/rails/files_loader.rb
@@ -0,0 +1,16 @@
+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
diff --git a/lib/solargraph/rails/pin_creator.rb b/lib/solargraph/rails/pin_creator.rb
new file mode 100644
index 0000000..6451b40
--- /dev/null
+++ b/lib/solargraph/rails/pin_creator.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+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.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]]}]",
+            location: attr[:location],
+            closure: Solargraph::Pin::Namespace.new(name: module_names.join('::') + "::#{model_name}"),
+            scope: :instance,
+            attribute: true
+          )
+        end
+      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
diff --git a/lib/solargraph/rails/ruby_parser.rb b/lib/solargraph/rails/ruby_parser.rb
new file mode 100644
index 0000000..650281f
--- /dev/null
+++ b/lib/solargraph/rails/ruby_parser.rb
@@ -0,0 +1,70 @@
+module Solargraph
+  module Rails
+    class RubyParser
+      attr_reader :current_line_number, :current_line_length
+
+      def initialize(file_contents: '')
+        @lines = file_contents.lines
+        @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 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) }
+          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
diff --git a/lib/solargraph/rails/version.rb b/lib/solargraph/rails/version.rb
new file mode 100644
index 0000000..f954b3a
--- /dev/null
+++ b/lib/solargraph/rails/version.rb
@@ -0,0 +1,5 @@
+module Solargraph
+  module Rails
+    VERSION = '0.2.0.pre'
+  end
+end
diff --git a/lib/solargraph_rails.rb b/lib/solargraph_rails.rb
deleted file mode 100644
index 599258c..0000000
--- a/lib/solargraph_rails.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'solargraph_rails/version'
-require 'solargraph'
-require_relative 'solargraph_rails/pin_creator'
-require_relative 'solargraph_rails/ruby_parser'
-require_relative 'solargraph_rails/files_loader'
-
-module SolargraphRails
-  class DynamicAttributes < Solargraph::Convention::Base
-    def global yard_map
-      Solargraph::Environ.new(pins: parse_models)
-    end
-
-    private
-
-    def parse_models
-      pins = []
-
-      FilesLoader.new(
-        Dir[File.join(Dir.pwd, 'app', 'models', '**', '*.rb')]
-      ).each { |file, contents| pins.push *PinCreator.new(file, contents).create_pins }
-
-      pins
-    end
-  end
-end
-
-
-Solargraph::Convention.register SolargraphRails::DynamicAttributes
diff --git a/lib/solargraph_rails/files_loader.rb b/lib/solargraph_rails/files_loader.rb
deleted file mode 100644
index 73143df..0000000
--- a/lib/solargraph_rails/files_loader.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module SolargraphRails
-  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
diff --git a/lib/solargraph_rails/pin_creator.rb b/lib/solargraph_rails/pin_creator.rb
deleted file mode 100644
index a56df11..0000000
--- a/lib/solargraph_rails/pin_creator.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module SolargraphRails
-  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.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]]}]",
-          location: attr[:location],
-          closure: Solargraph::Pin::Namespace.new(name: module_names.join('::') + "::#{model_name}"),
-          scope: :instance,
-          attribute: true
-        )
-      end
-    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
diff --git a/lib/solargraph_rails/ruby_parser.rb b/lib/solargraph_rails/ruby_parser.rb
deleted file mode 100644
index 167d6a5..0000000
--- a/lib/solargraph_rails/ruby_parser.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-module SolargraphRails
-  class RubyParser
-    attr_reader :current_line_number, :current_line_length
-
-    def initialize(file_contents: '')
-      @lines = file_contents.lines
-      @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 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) }
-        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
diff --git a/lib/solargraph_rails/version.rb b/lib/solargraph_rails/version.rb
deleted file mode 100644
index 8249f0c..0000000
--- a/lib/solargraph_rails/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module SolargraphRails
-  VERSION = "0.1.1"
-end
diff --git a/solargraph_rails.gemspec b/solargraph-rails.gemspec
similarity index 64%
rename from solargraph_rails.gemspec
rename to solargraph-rails.gemspec
index 3a9efce..3a3ee36 100644
--- a/solargraph_rails.gemspec
+++ b/solargraph-rails.gemspec
@@ -1,28 +1,19 @@
 
 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       = SolargraphRails::VERSION
+  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.homepage      = 'https://github.com/iftheshoefritz/solargraph-rails'
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
diff --git a/spec/dynamic_attributes_spec.rb b/spec/dynamic_attributes_spec.rb
index a1d9f16..3d47fc6 100644
--- a/spec/dynamic_attributes_spec.rb
+++ b/spec/dynamic_attributes_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe SolargraphRails::DynamicAttributes do
+RSpec.describe Solargraph::Rails::DynamicAttributes do
   it 'adds pins' do
     files = [
       [
@@ -19,12 +19,12 @@ class MyModel < ApplicationRecord
         FILE
       ]
     ]
-    allow_any_instance_of(SolargraphRails::FilesLoader).to receive(:each) do |&blk|
+    allow_any_instance_of(Solargraph::Rails::FilesLoader).to receive(:each) do |&blk|
       blk.call(*files[0])
       blk.call(*files[1])
     end
 
-    environ = SolargraphRails::DynamicAttributes
+    environ = Solargraph::Rails::DynamicAttributes
                 .new
                 .global(double('Solargraph::YardMap'))
 
diff --git a/spec/lib/solargraph_rails/files_loader_spec.rb b/spec/lib/solargraph/rails/files_loader_spec.rb
similarity index 76%
rename from spec/lib/solargraph_rails/files_loader_spec.rb
rename to spec/lib/solargraph/rails/files_loader_spec.rb
index 7cf9632..5b51115 100644
--- a/spec/lib/solargraph_rails/files_loader_spec.rb
+++ b/spec/lib/solargraph/rails/files_loader_spec.rb
@@ -1,9 +1,9 @@
-require 'solargraph_rails/files_loader'
+require 'solargraph/rails/files_loader'
 
-RSpec.describe SolargraphRails::FilesLoader do
+RSpec.describe Solargraph::Rails::FilesLoader do
   it 'passes file contents to block' do
     file_fixture('test.txt')
-    loader = SolargraphRails::FilesLoader.new(['test.txt'])
+    loader = Solargraph::Rails::FilesLoader.new(['test.txt'])
     blk = lambda do |file_name, content|
       expect(file_name).to eq('test.txt')
       expect(content).to eq(file_contents)
@@ -17,7 +17,7 @@
     file_fixture('test3.txt')
     blk = lambda {}
     expect(blk).to receive(:call).exactly(3).times
-    loader = SolargraphRails::FilesLoader.new(
+    loader = Solargraph::Rails::FilesLoader.new(
       ['test1.txt', 'test2.txt', 'test3.txt']
     ).each(&blk)
   end
diff --git a/spec/lib/solargraph_rails/pin_creator_spec.rb b/spec/lib/solargraph/rails/pin_creator_spec.rb
similarity index 89%
rename from spec/lib/solargraph_rails/pin_creator_spec.rb
rename to spec/lib/solargraph/rails/pin_creator_spec.rb
index b04d4f9..43c45f3 100644
--- a/spec/lib/solargraph_rails/pin_creator_spec.rb
+++ b/spec/lib/solargraph/rails/pin_creator_spec.rb
@@ -1,10 +1,10 @@
-require 'solargraph_rails/files_loader'
+require 'solargraph/rails/files_loader'
 
-RSpec.describe SolargraphRails::PinCreator do
+RSpec.describe Solargraph::Rails::PinCreator do
   context 'non-ruby file' do
     it 'creates no pins' do
       expect(
-        SolargraphRails::PinCreator.new(
+        Solargraph::Rails::PinCreator.new(
           'nonruby.txt',
           'xyz$&*^'
         ).create_pins
@@ -15,7 +15,7 @@
   context 'non-model ruby file' do
     it 'creates no pins' do
       expect(
-        SolargraphRails::PinCreator.new(
+        Solargraph::Rails::PinCreator.new(
           'non_model.rb',
           "# PORO\nclass NonModel\nend\n"
         ).create_pins
@@ -26,7 +26,7 @@
   context 'model without annotations' do
     it 'creates no pins' do
       expect(
-        SolargraphRails::PinCreator.new(
+        Solargraph::Rails::PinCreator.new(
           'unannotated_model.rb',
           'class UnannotatedModel < AppliationRecord; end'
         ).create_pins
@@ -42,7 +42,7 @@
           class MyModel < ApplicationRecord
         FILE
 
-        @pin_creator = SolargraphRails::PinCreator.new(
+        @pin_creator = Solargraph::Rails::PinCreator.new(
           'files/my_file/my_model.rb',
           contents
         )
@@ -92,7 +92,7 @@ class MyModel < ApplicationRecord
           class MyModel < ApplicationRecord
         FILE
 
-        pin_creator = SolargraphRails::PinCreator.new(
+        pin_creator = Solargraph::Rails::PinCreator.new(
           'files/my_file/my_model.rb',
           contents
         )
@@ -105,7 +105,7 @@ class MyModel < ApplicationRecord
           class MyModel < ApplicationRecord
         FILE
 
-        pin_creator = SolargraphRails::PinCreator.new(
+        pin_creator = Solargraph::Rails::PinCreator.new(
           'files/my_file/my_model.rb',
           contents
         )
@@ -126,7 +126,7 @@ class MyModel < ApplicationRecord
           class MyModel < ApplicationRecord
         FILE
 
-        pins = SolargraphRails::PinCreator.new('app/models/my_model.rb', contents).create_pins
+        pins = Solargraph::Rails::PinCreator.new('app/models/my_model.rb', contents).create_pins
         attrs = pins.each_with_object({}) do |pin, memo|
           memo[pin.name] = pin.return_type.to_s
         end
@@ -155,7 +155,7 @@ class MyModel < ApplicationRecord
       FILE
 
       expect(
-        SolargraphRails::PinCreator.new(
+        Solargraph::Rails::PinCreator.new(
           'my_model.rb',
           contents
         ).create_pins.count
@@ -174,7 +174,7 @@ class MyModel < ApplicationRecord
       FILE
 
       expect(
-        SolargraphRails::PinCreator.new(
+        Solargraph::Rails::PinCreator.new(
           'my_model.rb',
           contents
         ).create_pins.count
@@ -186,7 +186,7 @@ class MyModel < ApplicationRecord
     context 'with one annotation' do
       it 'has one pin' do
         expect(
-          SolargraphRails::PinCreator.new(
+          Solargraph::Rails::PinCreator.new(
             'my_model.rb',
             <<-FILE
               #  start_date  :date
@@ -203,7 +203,7 @@ class MyModel < ApplicationRecord
     context 'with one annotation' do
       it 'has one pin' do
         expect(
-          SolargraphRails::PinCreator.new(
+          Solargraph::Rails::PinCreator.new(
             'my_model.rb',
             <<-FILE
               #  start_date  :date
@@ -220,7 +220,7 @@ class MyModel < ActiveRecord::Base
     context 'with one annotation' do
       it 'has one pin' do
         expect(
-          SolargraphRails::PinCreator.new(
+          Solargraph::Rails::PinCreator.new(
             'my_model.rb',
             <<-FILE
               # frozen_string_literal: true
@@ -237,7 +237,7 @@ class MyModel < ActiveRecord::Base
 
   context 'nested class and module' do
     it 'Module::Class' do
-      pins = SolargraphRails::PinCreator.new(
+      pins = Solargraph::Rails::PinCreator.new(
         'my_model.rb',
         <<-FILE
         # frozen_string_literal: true
@@ -257,7 +257,7 @@ class MyModule::MyModel < ActiveRecord::Base
     end
 
     it 'module and class on separate lines' do
-      pins = SolargraphRails::PinCreator.new(
+      pins = Solargraph::Rails::PinCreator.new(
         'my_model.rb',
         <<-FILE
         # frozen_string_literal: true
@@ -279,7 +279,7 @@ class MyModel < ActiveRecord::Base
     end
 
     it 'more than one module' do
-      pins = SolargraphRails::PinCreator.new(
+      pins = Solargraph::Rails::PinCreator.new(
         'my_model.rb',
         <<-FILE
         # frozen_string_literal: true
@@ -303,7 +303,7 @@ class MyModel < ActiveRecord::Base
     end
 
     it 'inline and standalone module names' do
-      pins = SolargraphRails::PinCreator.new(
+      pins = Solargraph::Rails::PinCreator.new(
         'my_model.rb',
         <<-FILE
         # frozen_string_literal: true
diff --git a/spec/lib/solargraph_rails/ruby_parser_spec.rb b/spec/lib/solargraph/rails/ruby_parser_spec.rb
similarity index 84%
rename from spec/lib/solargraph_rails/ruby_parser_spec.rb
rename to spec/lib/solargraph/rails/ruby_parser_spec.rb
index fdd0530..62ba35d 100644
--- a/spec/lib/solargraph_rails/ruby_parser_spec.rb
+++ b/spec/lib/solargraph/rails/ruby_parser_spec.rb
@@ -1,9 +1,9 @@
-require 'solargraph_rails/ruby_parser'
+require 'solargraph/rails/ruby_parser'
 
-RSpec.describe SolargraphRails::RubyParser do
+RSpec.describe Solargraph::Rails::RubyParser do
   context 'callbacks' do
     it 'empty file calls nothing' do
-      parser = SolargraphRails::RubyParser.new(file_contents: '')
+      parser = Solargraph::Rails::RubyParser.new(file_contents: '')
 
       handler = ->(x) { }
       parser.on_comment(&handler)
@@ -16,7 +16,7 @@
 
     context 'comments' do
       it 'passes content of comment without "#"' do
-        parser = SolargraphRails::RubyParser.new(
+        parser = Solargraph::Rails::RubyParser.new(
           file_contents: "# a comment\n"
         )
         handler = proc { |x| expect(x).to eq('a comment') }
@@ -28,7 +28,7 @@
       end
 
       it 'calls handler once for each comment' do
-        parser = SolargraphRails::RubyParser.new(
+        parser = Solargraph::Rails::RubyParser.new(
           file_contents: "# a comment\n# another comment\n"
         )
         handler = proc {}
@@ -42,7 +42,7 @@
 
     context 'class declaration' do
       it 'passes correct class name' do
-        parser = SolargraphRails::RubyParser.new(
+        parser = Solargraph::Rails::RubyParser.new(
           file_contents: "class X\nend"
         )
         handler = proc { |klass_name| expect(klass_name).to eq('X') }
@@ -54,7 +54,7 @@
       end
 
       it 'passes class name with superclass' do
-        parser = SolargraphRails::RubyParser.new(
+        parser = Solargraph::Rails::RubyParser.new(
           file_contents: "class X < Y\nend"
         )
         handler = proc do |klass, superklass|
@@ -70,7 +70,7 @@
       end
 
       it 'passes superklass with namespace' do
-        parser = SolargraphRails::RubyParser.new(
+        parser = Solargraph::Rails::RubyParser.new(
           file_contents: "class X < Yabc::Zabc\nend"
         )
         handler = proc do |klass, superklass|
@@ -89,7 +89,7 @@
     context 'module declaration' do
       context 'standalone module' do
         it 'passes correct module name' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "module MyModule\n"
           )
           handler = proc { |mod| expect(mod).to eq('MyModule') }
@@ -101,7 +101,7 @@
         end
 
         it 'calls handler once for each module declaration' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "module MyModule\n  module MyModule2\n  end\nend"
           )
           handler = proc { }
@@ -115,7 +115,7 @@
 
       context 'inline module and class' do
         it 'calls module handler with inline module name' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "class MyModule::MyClass\nend"
           )
           module_handler = proc { |mod| expect(mod).to eq('MyModule') }
@@ -128,7 +128,7 @@
         end
 
         it 'calls class handler with class name' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "class MyModule::MyClass\nend"
           )
           class_handler = proc { |klass| expect(klass).to eq('MyClass') }
@@ -141,7 +141,7 @@
         end
 
         it 'multiple inline module names' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "class MyModule1::MyModule2::MyModule3::MyClass\nend"
           )
           handler = proc { }
@@ -154,7 +154,7 @@
         end
 
         it 'does not process namespace in superclass' do
-          parser = SolargraphRails::RubyParser.new(
+          parser = Solargraph::Rails::RubyParser.new(
             file_contents: "class MyModule1::MyClass < SuperNamespace::Superclass\nend"
           )
           handler = proc { }
@@ -172,7 +172,7 @@
   end
 
   it 'line info' do
-    parser = SolargraphRails::RubyParser.new(
+    parser = Solargraph::Rails::RubyParser.new(
       file_contents: "class X\n# a comment\n"
     )
 
diff --git a/spec/solargraph_rails_spec.rb b/spec/solargraph_rails_spec.rb
index 6308712..dd9d69f 100644
--- a/spec/solargraph_rails_spec.rb
+++ b/spec/solargraph_rails_spec.rb
@@ -1,5 +1,5 @@
-RSpec.describe SolargraphRails do
+RSpec.describe Solargraph::Rails do
   it "has a version number" do
-    expect(SolargraphRails::VERSION).not_to be nil
+    expect(Solargraph::Rails::VERSION).not_to be nil
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bce0483..75d67c7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'byebug'
-require 'solargraph_rails'
+require 'solargraph-rails'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure