tapioca 0.14.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b033940feb12f528b3995f645ed709aa18a3e5397ec188f795df4cdbfb4c57
-  data.tar.gz: 0f38fe25358b09d6ebeb40c582014948bbf06787c947bd17f2bdb7cc0ed9dfd8
+  metadata.gz: 7488dd17c4950978384fa4da4908f6e2f7ad0ad87266a018044e21d565f704aa
+  data.tar.gz: 572b9cb88a228d86c46b36c3bb1b938781dfaf528301c1c0a61e0e3258e5b65a
 SHA512:
-  metadata.gz: 8feb5a4f612517906add3ef224f13ac73296955c097352349d4bcf52f19951a1b97bc79ecdc184355123c22285eaffb98f8037bcf58be1bb56f60e1607b332b5
-  data.tar.gz: 41caacbc97da0c7dc1c0ee8260ac8d860908138fb709cc7bbe1a0bd8170953daeb6d88a82cad9f8979c28471d5a4d1b84b87c39ff6c7756ef6f152e703c26dc4
+  metadata.gz: 1565590d51799b64e7bf57a4d4d25bfe5e20d1455345183412773be5eb5c4f3c7bfecca49438aa2ce67283d1260695d2f072303a5951d7daa1540bd3d4f8ef5c
+  data.tar.gz: 00e81fc94389204d15f54e0eb469ca1da367d3b69fedd73e2146f2b0a768d3928848decc94c52fd212e7405d7e8d177571de8e92986090c07ba694c030ae7e66

data/lib/tapioca/commands/abstract_dsl.rb

@@ -127,7 +127,7 @@ module Tapioca
           error_handler: ->(error) {
             say_error(error, :bold, :red)
           },
-          skipped_constants: constantize(@skip_constant),
+          skipped_constants: constantize(@skip_constant, ignore_missing: true),
           number_of_workers: @number_of_workers,
         )
       end

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

@@ -102,6 +102,10 @@ module Tapioca
           def gather_constants
             return [] unless defined?(Rails.application) && Rails.application
 
+            # Load routes if they haven't been loaded yet (see https://github.com/rails/rails/pull/51614).
+            routes_reloader = Rails.application.routes_reloader
+            routes_reloader.execute_unless_loaded if routes_reloader&.respond_to?(:execute_unless_loaded)
+
             Object.const_set(:GeneratedUrlHelpersModule, Rails.application.routes.named_routes.url_helpers_module)
             Object.const_set(:GeneratedPathHelpersModule, Rails.application.routes.named_routes.path_helpers_module)
 

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

@@ -19,32 +19,32 @@ module Tapioca
             super
           end
 
-          def kredis_string(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_string(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
 
-          def kredis_integer(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_integer(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
 
-          def kredis_decimal(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_decimal(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
 
-          def kredis_datetime(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_datetime(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
 
-          def kredis_flag(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_flag(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Flag")
             super
           end
 
-          def kredis_float(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_float(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
@@ -54,22 +54,23 @@ module Tapioca
             super
           end
 
-          def kredis_json(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_json(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end
 
-          def kredis_list(name, key: nil, typed: :string, config: :shared, after_change: nil)
+          def kredis_list(name, key: nil, default: nil, typed: :string, config: :shared, after_change: nil)
             collect_kredis_type(name, "Kredis::Types::List")
             super
           end
 
-          def kredis_unique_list(name, limit: nil, key: nil, typed: :string, config: :shared, after_change: nil)
+          def kredis_unique_list(name, limit: nil, key: nil, default: nil, typed: :string, config: :shared,
+            after_change: nil)
             collect_kredis_type(name, "Kredis::Types::UniqueList")
             super
           end
 
-          def kredis_set(name, key: nil, typed: :string, config: :shared, after_change: nil)
+          def kredis_set(name, key: nil, default: nil, typed: :string, config: :shared, after_change: nil)
             collect_kredis_type(name, "Kredis::Types::Set")
             super
           end
@@ -84,17 +85,17 @@ module Tapioca
             super
           end
 
-          def kredis_counter(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_counter(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Counter")
             super
           end
 
-          def kredis_hash(name, key: nil, typed: :string, config: :shared, after_change: nil)
+          def kredis_hash(name, key: nil, default: nil, typed: :string, config: :shared, after_change: nil)
             collect_kredis_type(name, "Kredis::Types::Hash")
             super
           end
 
-          def kredis_boolean(name, key: nil, config: :shared, after_change: nil, expires_in: nil)
+          def kredis_boolean(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)
             collect_kredis_type(name, "Kredis::Types::Scalar")
             super
           end

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.1"
+  VERSION = "0.14.3"
 end

metadata

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