Skip to content

Commit 9ded7e1

Browse files
tk0miyatk0miya
authored
Merge branch 'main' into active_hash/fix_ActiveFile_Base_reload
2 parents 61071a9 + 363840b commit 9ded7e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+51695
-263
lines changed

‎Gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ GEM
2626
fileutils (1.7.3)
2727
i18n (1.14.7)
2828
concurrent-ruby (~> 1.0)
29-
json (2.11.3)
30-
language_server-protocol (3.17.0.4)
29+
json (2.12.2)
30+
language_server-protocol (3.17.0.5)
3131
lint_roller (1.1.0)
3232
listen (3.9.0)
3333
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -42,14 +42,14 @@ GEM
4242
prism (1.4.0)
4343
racc (1.8.1)
4444
rainbow (3.1.1)
45-
rake (13.2.1)
45+
rake (13.3.0)
4646
rb-fsevent (0.11.2)
4747
rb-inotify (0.11.1)
4848
ffi (~> 1.0)
4949
rbs (3.9.4)
5050
logger
5151
regexp_parser (2.10.0)
52-
rubocop (1.75.3)
52+
rubocop (1.75.8)
5353
json (~> 2.3)
5454
language_server-protocol (~> 3.17.0.2)
5555
lint_roller (~> 1.1.0)
@@ -63,7 +63,7 @@ GEM
6363
rubocop-ast (1.44.1)
6464
parser (>= 3.3.7.2)
6565
prism (~> 1.4)
66-
rubocop-on-rbs (1.6.0)
66+
rubocop-on-rbs (1.7.0)
6767
lint_roller (~> 1.1)
6868
rbs (~> 3.5)
6969
rubocop (>= 1.72.1, < 2.0)

‎gems/activerecord/.rubocop.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
inherit_from: ../../.rubocop.yml
22

3+
# Please specify only supported versions.
34
RBS/Layout:
45
Enabled: true
6+
Include:
7+
- "gems/activerecord/7.2/**/*.rbs"
8+
- "gems/activerecord/8.0/**/*.rbs"
59
RBS/Lint:
610
Enabled: true
11+
Include:
12+
- "gems/activerecord/7.2/**/*.rbs"
13+
- "gems/activerecord/8.0/**/*.rbs"
714
RBS/Style:
815
Enabled: true
16+
Include:
17+
- "gems/activerecord/7.2/**/*.rbs"
18+
- "gems/activerecord/8.0/**/*.rbs"

‎gems/activerecord/6.0/activerecord.rbs‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module ActiveRecord
22
class Base
3-
type condition[T] = Symbol | ^(T) [self: T] -> boolish
3+
# https://guides.rubyonrails.org/v6.0/active_record_callbacks.html#multiple-callback-conditions
4+
# https://guides.rubyonrails.org/v6.0/active_record_validations.html#combining-validation-conditions
5+
type conditions[T] = ActiveModel::Validations::ClassMethods::conditions[T]
46

57
# puts ActiveRecord::Base.singleton_class.ancestors.map(&:to_s).select { |s| /ClassMethods$/.match?(s) }.map{ |s| "extend ::#{s}" }.sort
68
extend ::ActiveModel::AttributeMethods::ClassMethods
@@ -49,8 +51,8 @@ module ActiveRecord
4951
def self.transaction: [T] (?requires_new: boolish, ?isolation: (:read_uncommitted | :read_committed | :repeatable_read | :serializable)?, ?joinable: boolish) { () -> T } -> T
5052
def self.create: (**untyped) -> instance
5153
def self.create!: (**untyped) -> instance
52-
def self.validate: (*untyped, ?if: condition[instance], ?unless: condition[instance], **untyped) -> void
53-
def self.validates: (*untyped, ?if: condition[instance], ?unless: condition[instance], **untyped) -> void
54+
def self.validate: (*untyped, ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void
55+
def self.validates: (*untyped, ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void
5456

5557
# callbacks
5658
interface _AfterCreateCallbackObject
@@ -96,29 +98,29 @@ module ActiveRecord
9698
type before_validation_callback[T] = callback[T] | _BeforeValidationCallbackObject
9799
type before_save_callback[T] = callback[T] | _BeforeSaveCallbackObject
98100

99-
def self.after_commit: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
100-
def self.after_create_commit: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) -> void | ...
101-
def self.after_update_commit: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) -> void | ...
102-
def self.after_destroy_commit: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) -> void | ...
103-
def self.after_save_commit: (*after_save_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) -> void | ...
104-
def self.after_create: (*after_create_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
105-
def self.after_destroy: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
106-
def self.after_rollback: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
107-
def self.after_save: (*after_save_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
108-
def self.after_update: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
109-
def self.after_validation: (*after_validation_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
110-
def self.after_initialize: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
111-
def self.after_find: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
112-
def self.after_touch: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
113-
def self.around_create: (*around_create_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
114-
def self.around_destroy: (*around_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
115-
def self.around_save: (*around_save_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
116-
def self.around_update: (*around_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
117-
def self.before_create: (*before_create_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
118-
def self.before_destroy: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
119-
def self.before_save: (*before_save_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
120-
def self.before_update: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
121-
def self.before_validation: (*before_validation_callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
101+
def self.after_commit: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
102+
def self.after_create_commit: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void | ...
103+
def self.after_update_commit: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void | ...
104+
def self.after_destroy_commit: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void | ...
105+
def self.after_save_commit: (*after_save_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) -> void | ...
106+
def self.after_create: (*after_create_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
107+
def self.after_destroy: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
108+
def self.after_rollback: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
109+
def self.after_save: (*after_save_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
110+
def self.after_update: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
111+
def self.after_validation: (*after_validation_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
112+
def self.after_initialize: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
113+
def self.after_find: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
114+
def self.after_touch: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
115+
def self.around_create: (*around_create_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
116+
def self.around_destroy: (*around_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
117+
def self.around_save: (*around_save_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
118+
def self.around_update: (*around_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
119+
def self.before_create: (*before_create_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
120+
def self.before_destroy: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
121+
def self.before_save: (*before_save_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
122+
def self.before_update: (*callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
123+
def self.before_validation: (*before_validation_callback[instance], ?if: conditions[instance], ?unless: conditions[instance], **untyped) ?{ () [self: instance] -> untyped } -> void
122124

123125
def self.columns: () -> Array[untyped]
124126
def self.reflect_on_all_associations: (?Symbol) -> Array[untyped]
@@ -133,7 +135,6 @@ module ActiveRecord
133135
def destroy: () -> bool
134136
def valid?: (?Symbol | Array[Symbol] context) -> bool
135137
def invalid?: (?Symbol | Array[Symbol] context) -> bool
136-
def errors: () -> untyped
137138
def []: (Symbol) -> untyped
138139
def []=: (Symbol, untyped) -> untyped
139140

‎gems/activerecord/6.1/_test/activerecord-6.1.rb‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎gems/activerecord/6.1/_test/activerecord-generated.rb‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gems/activerecord/6.1/_test/activerecord-generated.rbs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gems/activerecord/6.1/_test/metadata.yaml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gems/activerecord/7.0/_test/test.rb‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎gems/activerecord/7.0/_test/test.rbs‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎gems/activerecord/7.1/_test/test.rb‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)