tapioca 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8cfe1d421099c152f602f65792f694adf8a880014589ff23dc16547c60897d
-  data.tar.gz: c941e055640e4ef5caf4a26ed50268908fce7098b51c4423144615e04295f6a1
+  metadata.gz: 7488dd17c4950978384fa4da4908f6e2f7ad0ad87266a018044e21d565f704aa
+  data.tar.gz: 572b9cb88a228d86c46b36c3bb1b938781dfaf528301c1c0a61e0e3258e5b65a
 SHA512:
-  metadata.gz: 3d6522f57d604948443018620f625859e8676ddd2978a6e2c6b9252ee39a055526a1fe7dd3ff76f3ed330e3c00f9580fed5ef2fb4a86fdb87c572007f1b43297
-  data.tar.gz: f1e3c8fbfcfe728906c76b55d8f89762d3e55178c5d89631af7161296b7bb117e3b64bc0b8b03c31ca36cb0181b4b0b3eaede640c54fd1312daacb8ec35f6b4a
+  metadata.gz: 1565590d51799b64e7bf57a4d4d25bfe5e20d1455345183412773be5eb5c4f3c7bfecca49438aa2ce67283d1260695d2f072303a5951d7daa1540bd3d4f8ef5c
+  data.tar.gz: 00e81fc94389204d15f54e0eb469ca1da367d3b69fedd73e2146f2b0a768d3928848decc94c52fd212e7405d7e8d177571de8e92986090c07ba694c030ae7e66

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

@@ -69,6 +69,14 @@ module Tapioca
             "::Money"
           when ActiveRecord::Type::Integer
             "::Integer"
+          when ActiveRecord::Encryption::EncryptedAttributeType
+            # Reflect to see if `ActiveModel::Type::Value` is being used first.
+            getter_type = Tapioca::Dsl::Helpers::ActiveModelTypeHelper.type_for(column_type)
+            return getter_type unless getter_type == "T.untyped"
+
+            # Otherwise fallback to String as `ActiveRecord::Encryption::EncryptedAttributeType` inherits from
+            # `ActiveRecord::Type::Text` which inherits from `ActiveModel::Type::String`.
+            "::String"
           when ActiveRecord::Type::String
             "::String"
           when ActiveRecord::Type::Date
@@ -93,6 +101,9 @@ module Tapioca
           when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid) &&
             ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid
             "::String"
+          when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Cidr) &&
+            ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Cidr
+            "::IPAddr"
           when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore) &&
             ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore
             "T::Hash[::String, ::String]"

data/lib/tapioca/helpers/rbi_files_helper.rb

@@ -174,7 +174,21 @@ module Tapioca
       shims_or_todos = extract_shims_and_todos(nodes, shim_rbi_dir: shim_rbi_dir, todo_rbi_file: todo_rbi_file)
       return false if shims_or_todos.empty?
 
+      not_shims_or_todos = nodes - shims_or_todos
       shims_or_todos_empty_scopes = extract_empty_scopes(shims_or_todos)
+
+      # We need to discard classes that are redefining the parent of a class
+      shims_or_todos_empty_scopes.select! do |scope|
+        # Empty modules are always duplicates
+        next true unless scope.is_a?(RBI::Class)
+
+        # Empty classes without parents are also duplicates
+        parent_name = scope.superclass_name
+        next true unless parent_name
+
+        # Empty classes that are not redefining the parent are also duplicates
+        not_shims_or_todos.any? { |node| node.is_a?(RBI::Class) && node.superclass_name == parent_name }
+      end
       return true unless shims_or_todos_empty_scopes.empty?
 
       mixins = extract_mixins(shims_or_todos)

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler