tapioca 0.8.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69afa82ceccd1bd2fa9da5483011763edf2d1913d508a955a3c0b9c91fa2d04a
-  data.tar.gz: b59721eb57b52b5be09ddfa443eaae90f0b74b6985506da7240159a4c34a21dd
+  metadata.gz: bb8747fff200d370504c4ae3119ab567335b4dc6b02a163a50217084a66bbe0d
+  data.tar.gz: 551715f2806d1038d4ed4d7ac9f23e7ca31051a8db153cf854878ad1aa529510
 SHA512:
-  metadata.gz: 536a4d8e3c9b910f14e3808de67020c0dace80354d86a938a415f503fbc49acec859b3d95a1b6d8fbf3ea0f3be925a5ecfd1c071520eb158abda0ffd61e5ad30
-  data.tar.gz: 7a43d61449279be2b77fb48e893452eb9a3086c9819fe0d6f75177e1bb8cc1c60748dc0696dcf97641ada93621be760815f356cb979eca771810b07835e0fcef
+  metadata.gz: 1a854413aaaa4f50464fd5be89cfd5de4770f9468a70627e8af556d2c953a0b1e4f86901a1907bebf8f367c2d94429bd52fe38ae977797582e1bf2e35432f00b
+  data.tar.gz: 00671d2d35d2e40fd7f2761c7e7b4994bb88b051311520b042fc950c0f1ce8c62017a8e79605f4397819f2233cb5c4342fe03f8f65b39c3fd25ca71e56a31db1

data/lib/tapioca/gemfile.rb

@@ -138,6 +138,7 @@ module Tapioca
 
     class GemSpec
       extend(T::Sig)
+      include GemHelper
 
       IGNORED_GEMS = T.let(["sorbet", "sorbet-static", "sorbet-runtime", "sorbet-static-and-runtime"].freeze,
         T::Array[String])
@@ -160,7 +161,7 @@ module Tapioca
 
       sig { params(gemfile_dir: String).returns(T::Boolean) }
       def ignore?(gemfile_dir)
-        gem_ignored? || gem_in_app_dir?(gemfile_dir)
+        gem_ignored? || gem_in_app_dir?(gemfile_dir, full_gem_path)
       end
 
       sig { returns(String) }
@@ -284,27 +285,10 @@ module Tapioca
         false
       end
 
-      sig { params(path: T.any(String, Pathname)).returns(String) }
-      def to_realpath(path)
-        path_string = path.to_s
-        path_string = File.realpath(path_string) if File.exist?(path_string)
-        path_string
-      end
-
       sig { returns(T::Boolean) }
       def gem_ignored?
         IGNORED_GEMS.include?(name)
       end
-
-      sig { params(gemfile_dir: String).returns(T::Boolean) }
-      def gem_in_app_dir?(gemfile_dir)
-        !gem_in_bundle_path? && full_gem_path.start_with?(gemfile_dir)
-      end
-
-      sig { returns(T::Boolean) }
-      def gem_in_bundle_path?
-        full_gem_path.start_with?(Bundler.bundle_path.to_s, Bundler.app_cache.to_s)
-      end
     end
   end
 end

data/lib/tapioca/helpers/gem_helper.rb

@@ -0,0 +1,26 @@
+# typed: true
+# frozen_string_literal: true
+
+module Tapioca
+  module GemHelper
+    extend T::Sig
+
+    sig { params(gemfile_dir: String, full_gem_path: String).returns(T::Boolean) }
+    def gem_in_app_dir?(gemfile_dir, full_gem_path)
+      !gem_in_bundle_path?(to_realpath(full_gem_path)) &&
+        full_gem_path.start_with?(to_realpath(gemfile_dir))
+    end
+
+    sig { params(full_gem_path: String).returns(T::Boolean) }
+    def gem_in_bundle_path?(full_gem_path)
+      full_gem_path.start_with?(Bundler.bundle_path.to_s, Bundler.app_cache.to_s)
+    end
+
+    sig { params(path: T.any(String, Pathname)).returns(String) }
+    def to_realpath(path)
+      path_string = path.to_s
+      path_string = File.realpath(path_string) if File.exist?(path_string)
+      path_string
+    end
+  end
+end

data/lib/tapioca/internal.rb

@@ -5,6 +5,7 @@ require "tapioca"
 require "tapioca/runtime/reflection"
 require "tapioca/runtime/trackers"
 require "tapioca/runtime/dynamic_mixin_compiler"
+require "tapioca/helpers/gem_helper"
 require "tapioca/runtime/loader"
 require "tapioca/helpers/sorbet_helper"
 require "tapioca/helpers/type_variable_helper"

data/lib/tapioca/runtime/loader.rb

@@ -5,6 +5,7 @@ module Tapioca
   module Runtime
     class Loader
       extend(T::Sig)
+      include Tapioca::GemHelper
 
       sig do
         params(gemfile: Tapioca::Gemfile, initialize_file: T.nilable(String), require_file: T.nilable(String)).void
@@ -54,8 +55,12 @@ module Tapioca
 
         safe_require("active_support/core_ext/class/subclasses")
 
+        project_path = Bundler.default_gemfile.parent.expand_path
         # We can use `Class#descendants` here, since we know Rails is loaded
-        Object.const_get("Rails::Engine").descendants.reject(&:abstract_railtie?)
+        Object.const_get("Rails::Engine")
+          .descendants
+          .reject(&:abstract_railtie?)
+          .reject { |engine| gem_in_app_dir?(project_path, engine.config.root.to_path) }
       end
 
       sig { params(path: String).void }

data/lib/tapioca/sorbet_ext/generic_name_patch.rb

@@ -21,47 +21,33 @@ module T
         Tapioca::Runtime::GenericTypeRegistry.register_type(constant, types)
       end
 
-      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
+      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_member` just instantiates a `T::Type::TypeMember` instance and returns it.
         # We use that when registering the type member and then later return it from this method.
-        hash = if blk
-          blk.call
-        else
-          {
-            fixed: fixed,
-            lower: lower,
-            upper: upper,
-          }
-        end
-
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Member,
           variance,
-          **hash,
+          fixed,
+          lower,
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
       end
 
-      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
+      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_template` just instantiates a `T::Type::TypeTemplate` instance and returns it.
         # We use that when registering the type template and then later return it from this method.
-        hash = if blk
-          blk.call
-        else
-          {
-            fixed: fixed,
-            lower: lower,
-            upper: upper,
-          }
-        end
-
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Template,
           variance,
-          **hash,
+          fixed,
+          lower,
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
@@ -136,18 +122,31 @@ module Tapioca
       end
     end
 
+    # rubocop:disable Metrics/ParameterLists
     sig do
-      params(context: Module, type: Type, variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void
+      params(
+        context: Module,
+        type: Type,
+        variance: Symbol,
+        fixed: T.untyped,
+        lower: T.untyped,
+        upper: T.untyped,
+        bounds_proc: T.nilable(T.proc.returns(T::Hash[Symbol, T.untyped]))
+      ).void
     end
-    def initialize(context, type, variance, fixed: nil, lower: nil, upper: nil)
+    def initialize(context, type, variance, fixed, lower, upper, bounds_proc)
       @context = context
       @type = type
       @variance = variance
-      @fixed = fixed
-      @lower = lower
-      @upper = upper
+      @bounds_proc = if bounds_proc
+        bounds_proc
+      else
+        build_bounds_proc(fixed, lower, upper)
+      end
+
       super()
     end
+    # rubocop:enable Metrics/ParameterLists
 
     sig { returns(T.nilable(String)) }
     def name
@@ -170,9 +169,10 @@ module Tapioca
 
     sig { returns(String) }
     def serialize
-      fixed = @fixed.to_s if @fixed
-      upper = @upper.to_s if @upper
-      lower = @lower.to_s if @lower
+      bounds = @bounds_proc.call
+      fixed = bounds[:fixed].to_s if bounds.key?(:fixed)
+      lower = bounds[:lower].to_s if bounds.key?(:lower)
+      upper = bounds[:upper].to_s if bounds.key?(:upper)
 
       TypeVariableHelper.serialize_type_variable(
         @type.serialize,
@@ -190,6 +190,19 @@ module Tapioca
 
     private
 
+    sig do
+      params(fixed: T.untyped, lower: T.untyped, upper: T.untyped)
+        .returns(T.proc.returns(T::Hash[Symbol, T.untyped]))
+    end
+    def build_bounds_proc(fixed, lower, upper)
+      bounds = {}
+      bounds[:fixed] = fixed unless fixed.nil?
+      bounds[:lower] = lower unless lower.nil?
+      bounds[:upper] = upper unless upper.nil?
+
+      -> { bounds }
+    end
+
     sig do
       type_parameters(:Result)
         .params(block: T.proc.returns(T.type_parameter(:Result)))

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.8.0"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.3
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/tapioca/gemfile.rb
 - lib/tapioca/helpers/cli_helper.rb
 - lib/tapioca/helpers/config_helper.rb
+- lib/tapioca/helpers/gem_helper.rb
 - lib/tapioca/helpers/rbi_helper.rb
 - lib/tapioca/helpers/shims_helper.rb
 - lib/tapioca/helpers/signatures_helper.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard