tapioca 0.11.3 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0409ff7f6d35e2767d201fc3b920d9c3febdd94017dd2f51dda7ddbade8cf322'
-  data.tar.gz: 2a328485d2bd7b961531edd123e8f9b88172078d32f63dcf1bc7d8d120725640
+  metadata.gz: 49ff67fe6f34923e27d8c7ab2dbb0f616fa056d0f57905cbff5284a9abb5fb40
+  data.tar.gz: fa92f0074e930ffbdc1fcf6ad0c1462e6e3aa3bbf05ae3febf467252763e8c9b
 SHA512:
-  metadata.gz: f815bf33068255e641484a8e642c665a782416a08d5b0c4ca7e30690a0ae2034a34fb7a75a2ed159bddaf9271e103f62dadaf16642adc918a3be81b1853efdf2
-  data.tar.gz: 88d826dc3de171edca2dd81d4157ba6c91d6c0177b2a354aa7ccd3b9b9bac35030213f03b1fc256abd91b35f671ce370dd579d3c9c829ef82a5b750b0d4fe28c
+  metadata.gz: 3ba1fa737b5474b4433dd30ebb9104974c0d9a61c92e597546595ea142f2dadd7bea6b3915b742920176fec7d2670a1cf453d29f1ec633705373bb7b50958927
+  data.tar.gz: 2dc119e28e7d09d6dfe6bda01dfb185358a1a7db2d9d433a99d470a210eab40c9f476e9fb065cc6d6156f68cff6c16e3c1016f040cc86262afda1827892685cb

data/lib/tapioca/dsl/compilers/active_record_scope.rb

@@ -105,7 +105,7 @@ module Tapioca
             constant = T.cast(superclass, T.class_of(ActiveRecord::Base))
           end
 
-          scope_methods
+          scope_methods.uniq
         end
 
         sig do

data/lib/tapioca/dsl/compilers/identity_cache.rb

@@ -172,7 +172,6 @@ module Tapioca
           ).void
         end
         def create_index_fetch_by_methods(field, klass)
-          field_length = field.key_fields.length
           fields_name = field.key_fields.join("_and_")
           name = "fetch_by_#{fields_name}"
           parameters = field.key_fields.map do |arg|
@@ -205,17 +204,15 @@ module Tapioca
             )
           end
 
-          if field_length == 1
-            klass.create_method(
-              "fetch_multi_by_#{fields_name}",
-              class_method: true,
-              parameters: [
-                create_param("index_values", type: "T::Enumerable[T.untyped]"),
-                create_kw_opt_param("includes", default: "nil", type: "T.untyped"),
-              ],
-              return_type: COLLECTION_TYPE.call(constant),
-            )
-          end
+          klass.create_method(
+            "fetch_multi_by_#{fields_name}",
+            class_method: true,
+            parameters: [
+              create_param("index_values", type: "T::Enumerable[T.untyped]"),
+              create_kw_opt_param("includes", default: "nil", type: "T.untyped"),
+            ],
+            return_type: COLLECTION_TYPE.call(constant),
+          )
         end
 
         sig do

data/lib/tapioca/dsl/extensions/active_record.rb

@@ -23,7 +23,7 @@ module Tapioca
 
           attr_reader :__tapioca_secure_tokens
 
-          def has_secure_token(attribute = :token, length: ::ActiveRecord::SecureToken::MINIMUM_TOKEN_LENGTH)
+          def has_secure_token(attribute = :token, **)
             @__tapioca_secure_tokens ||= []
             @__tapioca_secure_tokens << attribute
 

data/lib/tapioca/dsl/helpers/active_record_column_type_helper.rb

@@ -69,10 +69,10 @@ module Tapioca
             "::String"
           when ActiveRecord::Type::Serialized
             serialized_column_type(column_type)
-          when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) &&
+          when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore) &&
             ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore
             "T::Hash[::String, ::String]"
-          when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) &&
+          when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array) &&
             ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
             "T::Array[#{type_for_activerecord_value(column_type.subtype)}]"
           else

data/lib/tapioca/dsl.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "rbi"
+require "spoom"
 
 require "tapioca"
 require "tapioca/runtime/reflection"

data/lib/tapioca/gem/listeners/methods.rb

@@ -118,7 +118,7 @@ module Tapioca
           sanitized_parameters.each do |type, name|
             case type
             when :req
-              rbi_method << RBI::Param.new(name)
+              rbi_method << RBI::ReqParam.new(name)
             when :opt
               rbi_method << RBI::OptParam.new(name, "T.unsafe(nil)")
             when :rest

data/lib/tapioca/helpers/gem_helper.rb

@@ -10,7 +10,7 @@ module Tapioca
       app_dir = to_realpath(app_dir)
       full_gem_path = to_realpath(full_gem_path)
 
-      !gem_in_bundle_path?(full_gem_path) && path_in_dir?(full_gem_path, app_dir)
+      !gem_in_bundle_path?(full_gem_path) && !gem_in_ruby_path?(full_gem_path) && path_in_dir?(full_gem_path, app_dir)
     end
 
     sig { params(full_gem_path: String).returns(T::Boolean) }
@@ -18,6 +18,11 @@ module Tapioca
       path_in_dir?(full_gem_path, Bundler.bundle_path) || path_in_dir?(full_gem_path, Bundler.app_cache)
     end
 
+    sig { params(full_gem_path: String).returns(T::Boolean) }
+    def gem_in_ruby_path?(full_gem_path)
+      path_in_dir?(full_gem_path, RbConfig::CONFIG["rubylibprefix"])
+    end
+
     sig { params(path: T.any(String, Pathname)).returns(String) }
     def to_realpath(path)
       path_string = path.to_s

data/lib/tapioca/helpers/rbi_helper.rb

@@ -40,7 +40,7 @@ module Tapioca
 
     sig { params(name: String, type: String).returns(RBI::TypedParam) }
     def create_param(name, type:)
-      create_typed_param(RBI::Param.new(name), type)
+      create_typed_param(RBI::ReqParam.new(name), type)
     end
 
     sig { params(name: String, type: String, default: String).returns(RBI::TypedParam) }

data/lib/tapioca/helpers/sorbet_helper.rb

@@ -19,6 +19,8 @@ module Tapioca
 
     SORBET_PAYLOAD_URL = "https://github.com/sorbet/sorbet/tree/master/rbi"
 
+    SPOOM_CONTEXT = T.let(Spoom::Context.new("."), Spoom::Context)
+
     FEATURE_REQUIREMENTS = T.let(
       {
         # feature_name: ::Gem::Requirement.new(">= ___"), # https://github.com/sorbet/sorbet/pull/___
@@ -29,7 +31,7 @@ module Tapioca
 
     sig { params(sorbet_args: String).returns(Spoom::ExecResult) }
     def sorbet(*sorbet_args)
-      Spoom::Sorbet.srb(sorbet_args.join(" "), sorbet_bin: sorbet_path, capture_err: true)
+      SPOOM_CONTEXT.srb(sorbet_args.join(" "), sorbet_bin: sorbet_path)
     end
 
     sig { returns(String) }

data/lib/tapioca/runtime/dynamic_mixin_compiler.rb

@@ -145,7 +145,7 @@ module Tapioca
 
           class_attribute_writers.each do |attribute|
             mod << RBI::Method.new("#{attribute}=") do |method|
-              method << RBI::Param.new("value")
+              method << RBI::ReqParam.new("value")
             end
           end
 
@@ -162,7 +162,7 @@ module Tapioca
 
           instance_attribute_writers.each do |attribute|
             mod << RBI::Method.new("#{attribute}=") do |method|
-              method << RBI::Param.new("value")
+              method << RBI::ReqParam.new("value")
             end
           end
 

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.5
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,20 +95,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard