sorbet-rails 0.7.4 → 0.7.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (360) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +7 -0
  3. data/.github/workflows/ci-master.yml +28 -0
  4. data/.github/workflows/ci.yml +26 -0
  5. data/.github/workflows/publish-gem.yml +27 -0
  6. data/CONTRIBUTING.md +1 -2
  7. data/Gemfile +5 -9
  8. data/README.md +18 -4
  9. data/Rakefile +13 -24
  10. data/lib/sorbet-rails/active_record_rbi_formatter.rb +12 -9
  11. data/lib/sorbet-rails/dependent_gem_rbis/activerecord.rbi +4 -0
  12. data/lib/sorbet-rails/dependent_gem_rbis/parlour.rbi +1 -1
  13. data/lib/sorbet-rails/gem_plugins/aasm_plugin.rb +50 -0
  14. data/lib/sorbet-rails/gem_plugins/money_rails_plugin.rb +76 -0
  15. data/lib/sorbet-rails/job_rbi_formatter.rb +1 -1
  16. data/lib/sorbet-rails/model_plugins/active_record_querying.rb +25 -1
  17. data/lib/sorbet-rails/model_plugins/active_record_serialized_attribute.rb +3 -2
  18. data/lib/sorbet-rails/model_plugins/base.rb +8 -1
  19. data/lib/sorbet-rails/model_plugins/custom_finder_methods.rb +1 -1
  20. data/lib/sorbet-rails/model_plugins/plugins.rb +6 -0
  21. data/lib/sorbet-rails/model_utils.rb +14 -7
  22. data/lib/sorbet-rails/rails_mixins/custom_finder_methods.rb +4 -0
  23. data/lib/sorbet-rails/railtie.rb +1 -1
  24. data/lib/sorbet-rails/routes_rbi_formatter.rb +8 -0
  25. data/lib/sorbet-rails/tasks/rails_rbi.rake +12 -8
  26. data/sorbet-rails.gemspec +2 -2
  27. data/spec/bin/run_all_specs.sh +3 -4
  28. data/spec/bin/run_spec.sh +4 -1
  29. data/spec/generators/rails-template.rb +3 -20
  30. data/spec/generators/sorbet_test_cases.rb +26 -4
  31. data/spec/rails_helper.rb +5 -5
  32. data/spec/rake_rails_rbi_models_spec.rb +11 -4
  33. data/spec/sorbet_spec.rb +2 -1
  34. data/spec/support/v5.2/Gemfile +1 -3
  35. data/spec/support/v5.2/Gemfile.lock +66 -71
  36. data/spec/support/v5.2/app/controllers/application_controller.rb +1 -1
  37. data/spec/support/v5.2/app/mailers/application_mailer.rb +1 -1
  38. data/spec/support/v5.2/app/mailers/daily_prophet_mailer.rb +1 -1
  39. data/spec/support/v5.2/app/mailers/hogwarts_acceptance_mailer.rb +1 -1
  40. data/spec/support/v5.2/app/models/spell_book.rb +1 -1
  41. data/spec/support/v5.2/app/models/wand.rb +1 -1
  42. data/spec/support/v5.2/app/models/wizard.rb +1 -1
  43. data/spec/support/v5.2/config/environments/development.rb +1 -1
  44. data/spec/support/v5.2/config/environments/production.rb +1 -1
  45. data/spec/support/v5.2/config/environments/test.rb +1 -1
  46. data/spec/support/v5.2/config/routes.rb +1 -1
  47. data/spec/support/v5.2/sorbet_test_cases.rb +26 -4
  48. data/spec/support/v6.0/Gemfile +1 -1
  49. data/spec/support/v6.0/Gemfile.lock +81 -85
  50. data/spec/support/v6.0/app/mailers/application_mailer.rb +1 -1
  51. data/spec/support/v6.0/config/environments/development.rb +1 -1
  52. data/spec/support/v6.0/config/environments/test.rb +1 -1
  53. data/spec/support/v6.0/config/initializers/cookies_serializer.rb +1 -1
  54. data/spec/support/v6.0/config/initializers/sorbet_rails.rb +1 -1
  55. data/spec/support/v6.0/config/routes.rb +1 -1
  56. data/spec/support/v6.0/sorbet_test_cases.rb +26 -4
  57. data/spec/support/{v5.1 → v6.1}/.gitignore +13 -2
  58. data/spec/support/{v5.1 → v6.1}/Gemfile +12 -15
  59. data/spec/support/{v5.1 → v6.1}/Gemfile.lock +87 -59
  60. data/spec/support/{v5.0 → v6.1}/README.md +0 -0
  61. data/spec/support/{v5.0 → v6.1}/Rakefile +0 -0
  62. data/spec/support/{v5.0 → v6.1}/app/assets/config/manifest.js +0 -0
  63. data/spec/support/{v5.0 → v6.1}/app/assets/images/.keep +0 -0
  64. data/spec/support/{v5.1 → v6.1}/app/assets/stylesheets/application.css +0 -0
  65. data/spec/support/{v5.0 → v6.1}/app/controllers/application_controller.rb +1 -2
  66. data/spec/support/{v5.0 → v6.1}/app/controllers/concerns/.keep +0 -0
  67. data/spec/support/{v5.0 → v6.1}/app/helpers/application_helper.rb +0 -0
  68. data/spec/support/{v5.0 → v6.1}/app/helpers/bar_helper.rb +0 -0
  69. data/spec/support/{v5.0 → v6.1}/app/helpers/baz_helper.rb +0 -0
  70. data/spec/support/{v5.0 → v6.1}/app/helpers/foo_helper.rb +0 -0
  71. data/spec/support/v6.1/app/jobs/application_job.rb +8 -0
  72. data/spec/support/{v5.0 → v6.1}/app/jobs/award_house_point_hourglasses.rb +0 -0
  73. data/spec/support/{v5.1 → v6.1}/app/mailers/application_mailer.rb +1 -1
  74. data/spec/support/{v5.0 → v6.1}/app/mailers/daily_prophet_mailer.rb +0 -0
  75. data/spec/support/{v5.0 → v6.1}/app/mailers/hogwarts_acceptance_mailer.rb +0 -0
  76. data/spec/support/{v5.0 → v6.1}/app/models/application_record.rb +0 -0
  77. data/spec/support/{v5.0 → v6.1}/app/models/concerns/.keep +0 -0
  78. data/spec/support/{v5.0 → v6.1}/app/models/concerns/mythical.rb +0 -0
  79. data/spec/support/{v5.1 → v6.1}/app/models/headmaster.rb +1 -1
  80. data/spec/support/{v5.1 → v6.1}/app/models/potion.rb +0 -0
  81. data/spec/support/{v5.1 → v6.1}/app/models/robe.rb +0 -0
  82. data/spec/support/{v5.0 → v6.1}/app/models/school.rb +1 -1
  83. data/spec/support/{v5.1 → v6.1}/app/models/spell.rb +0 -0
  84. data/spec/support/{v5.0 → v6.1}/app/models/spell_book.rb +0 -0
  85. data/spec/support/{v5.0 → v6.1}/app/models/squib.rb +0 -0
  86. data/spec/support/{v5.1 → v6.1}/app/models/subject.rb +0 -0
  87. data/spec/support/{v5.0 → v6.1}/app/models/wand.rb +0 -0
  88. data/spec/support/{v5.0 → v6.1}/app/models/wizard.rb +2 -1
  89. data/spec/support/{v5.1 → v6.1}/app/views/layouts/application.html.erb +2 -1
  90. data/spec/support/{v5.0 → v6.1}/app/views/layouts/mailer.html.erb +0 -0
  91. data/spec/support/{v5.0 → v6.1}/app/views/layouts/mailer.text.erb +0 -0
  92. data/spec/support/v6.1/bin/bundle +114 -0
  93. data/spec/support/{v5.0 → v6.1}/bin/rails +0 -0
  94. data/spec/support/{v5.0 → v6.1}/bin/rake +0 -0
  95. data/spec/support/{v5.1 → v6.1}/bin/setup +6 -11
  96. data/spec/support/{v5.1 → v6.1}/config/application.rb +8 -4
  97. data/spec/support/{v5.0 → v6.1}/config/boot.rb +0 -0
  98. data/spec/support/{v5.1 → v6.1}/config/database.yml +1 -1
  99. data/spec/support/{v5.0 → v6.1}/config/environment.rb +0 -0
  100. data/spec/support/{v5.1 → v6.1}/config/environments/development.rb +12 -4
  101. data/spec/support/{v5.1 → v6.1}/config/environments/production.rb +29 -7
  102. data/spec/support/{v5.1 → v6.1}/config/environments/test.rb +13 -7
  103. data/spec/support/{v5.0 → v6.1}/config/initializers/application_controller_renderer.rb +0 -0
  104. data/spec/support/{v5.0 → v6.1}/config/initializers/backtrace_silencers.rb +0 -0
  105. data/spec/support/v6.1/config/initializers/content_security_policy.rb +29 -0
  106. data/spec/support/{v5.1 → v6.1}/config/initializers/cookies_serializer.rb +1 -1
  107. data/spec/support/{v5.0 → v6.1}/config/initializers/filter_parameter_logging.rb +0 -0
  108. data/spec/support/{v5.0 → v6.1}/config/initializers/inflections.rb +0 -0
  109. data/spec/support/{v5.0 → v6.1}/config/initializers/mime_types.rb +0 -0
  110. data/spec/support/{v5.0 → v6.1}/config/initializers/sorbet_rails.rb +1 -1
  111. data/spec/support/{v5.0 → v6.1}/config/initializers/wrap_parameters.rb +0 -0
  112. data/spec/support/{v5.1 → v6.1}/config/locales/en.yml +1 -1
  113. data/spec/support/{v5.1 → v6.1}/config/puma.rb +8 -26
  114. data/spec/support/v6.1/config/routes.rb +5 -0
  115. data/spec/support/v6.1/config/storage.yml +34 -0
  116. data/spec/support/{v5.0 → v6.1}/config.ru +0 -0
  117. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000001_create_wizards.rb +2 -2
  118. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000002_create_wands.rb +2 -2
  119. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000003_create_spell_books.rb +2 -2
  120. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000004_add_more_column_types_to_wands.rb +2 -2
  121. data/spec/support/v6.1/db/migrate/20190620000005_add_broom_to_wizard.rb +6 -0
  122. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000006_add_more_enums_to_wizard.rb +2 -2
  123. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000007_add_type_to_wizard.rb +2 -2
  124. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000008_add_robe_to_wizard.rb +2 -2
  125. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000009_add_school.rb +2 -2
  126. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000010_add_subject.rb +2 -2
  127. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000011_add_subjects_wizards.rb +2 -2
  128. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000012_add_spell.rb +2 -2
  129. data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000013_add_spells_spell_books.rb +2 -2
  130. data/spec/support/{v5.0 → v6.1}/db/migrate/20190620000014_create_headmasters.rb +2 -2
  131. data/spec/support/{v5.0 → v6.1}/db/migrate/20190620000015_add_serialized_to_wizards.rb +2 -2
  132. data/spec/support/{v5.1 → v6.1}/db/schema.rb +14 -11
  133. data/spec/support/{v5.0 → v6.1}/db/seeds.rb +0 -0
  134. data/spec/support/{v5.0 → v6.1}/lib/assets/.keep +0 -0
  135. data/spec/support/{v5.0 → v6.1}/lib/mythical_rbi_plugin.rb +0 -0
  136. data/spec/support/{v5.0 → v6.1}/lib/tasks/.keep +0 -0
  137. data/spec/support/{v5.0 → v6.1}/log/.keep +0 -0
  138. data/spec/support/{v5.0 → v6.1}/sorbet_test_cases.rb +26 -4
  139. data/spec/support/{v5.0/tmp → v6.1/storage}/.keep +0 -0
  140. data/spec/support/{v5.0/vendor/assets/stylesheets → v6.1/tmp}/.keep +0 -0
  141. data/spec/support/{v5.1/app/assets/images → v6.1/tmp/pids}/.keep +0 -0
  142. data/spec/support/{v5.1/app/controllers/concerns → v6.1/vendor}/.keep +0 -0
  143. data/spec/test_data/v5.2/expected_active_record_base.rbi +10 -10
  144. data/spec/test_data/v5.2/expected_active_record_relation.rbi +10 -10
  145. data/spec/test_data/v5.2/expected_attachment.rbi +13 -7
  146. data/spec/test_data/v5.2/expected_blob.rbi +13 -7
  147. data/spec/test_data/v5.2/expected_headmaster.rbi +13 -7
  148. data/spec/test_data/v5.2/expected_internal_metadata.rbi +13 -7
  149. data/spec/test_data/v5.2/expected_potion.rbi +13 -7
  150. data/spec/test_data/v5.2/expected_robe.rbi +13 -7
  151. data/spec/test_data/v5.2/expected_routes.rbi +8 -0
  152. data/spec/test_data/v5.2/expected_schema_migration.rbi +13 -7
  153. data/spec/test_data/v5.2/expected_school.rbi +13 -7
  154. data/spec/test_data/v5.2/expected_spell/habtm_spell_books.rbi +13 -7
  155. data/spec/test_data/v5.2/expected_spell.rbi +13 -7
  156. data/spec/test_data/v5.2/expected_spell_book/habtm_spells.rbi +13 -7
  157. data/spec/test_data/v5.2/expected_spell_book.rbi +13 -7
  158. data/spec/test_data/v5.2/expected_squib.rbi +15 -9
  159. data/spec/test_data/v5.2/expected_subject/habtm_wizards.rbi +13 -7
  160. data/spec/test_data/v5.2/expected_subject.rbi +13 -7
  161. data/spec/test_data/v5.2/expected_wand.rbi +13 -7
  162. data/spec/test_data/v5.2/expected_wizard/habtm_subjects.rbi +13 -7
  163. data/spec/test_data/v5.2/expected_wizard.rbi +15 -9
  164. data/spec/test_data/v5.2/expected_wizard_wo_spellbook.rbi +15 -9
  165. data/spec/test_data/v6.0/expected_active_record_base.rbi +10 -10
  166. data/spec/test_data/v6.0/expected_active_record_relation.rbi +10 -10
  167. data/spec/test_data/v6.0/expected_attachment.rbi +13 -7
  168. data/spec/test_data/v6.0/expected_blob.rbi +13 -7
  169. data/spec/test_data/v6.0/expected_headmaster.rbi +13 -7
  170. data/spec/test_data/v6.0/expected_internal_metadata.rbi +13 -7
  171. data/spec/test_data/v6.0/expected_potion.rbi +13 -7
  172. data/spec/test_data/v6.0/expected_robe.rbi +13 -7
  173. data/spec/test_data/v6.0/expected_routes.rbi +8 -0
  174. data/spec/test_data/v6.0/expected_schema_migration.rbi +13 -7
  175. data/spec/test_data/v6.0/expected_school.rbi +13 -7
  176. data/spec/test_data/v6.0/expected_spell/habtm_spell_books.rbi +13 -7
  177. data/spec/test_data/v6.0/expected_spell.rbi +13 -7
  178. data/spec/test_data/v6.0/expected_spell_book/habtm_spells.rbi +13 -7
  179. data/spec/test_data/v6.0/expected_spell_book.rbi +13 -7
  180. data/spec/test_data/v6.0/expected_squib.rbi +15 -9
  181. data/spec/test_data/v6.0/expected_subject/habtm_wizards.rbi +13 -7
  182. data/spec/test_data/v6.0/expected_subject.rbi +13 -7
  183. data/spec/test_data/v6.0/expected_wand.rbi +13 -7
  184. data/spec/test_data/v6.0/expected_wizard/habtm_subjects.rbi +13 -7
  185. data/spec/test_data/v6.0/expected_wizard.rbi +15 -9
  186. data/spec/test_data/v6.0/expected_wizard_wo_spellbook.rbi +15 -9
  187. data/spec/test_data/{v5.1 → v6.1}/expected_active_record_base.rbi +16 -16
  188. data/spec/test_data/{v5.1 → v6.1}/expected_active_record_relation.rbi +26 -29
  189. data/spec/test_data/{v5.0 → v6.1}/expected_application_job.rbi +0 -0
  190. data/spec/test_data/{v5.0 → v6.1}/expected_application_mailer.rbi +0 -0
  191. data/spec/test_data/v6.1/expected_attachment.rbi +334 -0
  192. data/spec/test_data/{v5.0 → v6.1}/expected_award_house_point_hourglasses.rbi +0 -0
  193. data/spec/test_data/v6.1/expected_blob.rbi +382 -0
  194. data/spec/test_data/{v5.0 → v6.1}/expected_custom_application_job.rbi +0 -0
  195. data/spec/test_data/{v5.0 → v6.1}/expected_custom_application_mailer.rbi +0 -0
  196. data/spec/test_data/{v5.0 → v6.1}/expected_custom_award_house_point_hourglasses.rbi +0 -0
  197. data/spec/test_data/{v5.0 → v6.1}/expected_custom_daily_prophet_mailer.rbi +0 -0
  198. data/spec/test_data/{v5.0 → v6.1}/expected_custom_hogwarts_acceptance_mailer.rbi +0 -0
  199. data/spec/test_data/{v5.0 → v6.1}/expected_daily_prophet_mailer.rbi +0 -0
  200. data/spec/test_data/{v5.1 → v6.1}/expected_habtm_subjects.rbi +48 -0
  201. data/spec/test_data/{v5.1 → v6.1}/expected_habtm_wizards.rbi +48 -0
  202. data/spec/test_data/{v5.1 → v6.1}/expected_headmaster.rbi +33 -3
  203. data/spec/test_data/{v5.0 → v6.1}/expected_helpers.rbi +0 -0
  204. data/spec/test_data/{v5.0 → v6.1}/expected_helpers_with_application_and_devise_helpers.rbi +0 -0
  205. data/spec/test_data/{v5.0 → v6.1}/expected_hogwarts_acceptance_mailer.rbi +0 -0
  206. data/spec/test_data/{v5.1 → v6.1}/expected_internal_metadata.rbi +33 -3
  207. data/spec/test_data/{v5.0 → v6.1}/expected_no_routes.rbi +0 -0
  208. data/spec/test_data/{v5.1 → v6.1}/expected_potion.rbi +33 -3
  209. data/spec/test_data/v6.1/expected_record.rbi +295 -0
  210. data/spec/test_data/{v5.1 → v6.1}/expected_robe.rbi +33 -3
  211. data/spec/test_data/v6.1/expected_routes.rbi +175 -0
  212. data/spec/test_data/{v5.1 → v6.1}/expected_schema_migration.rbi +33 -3
  213. data/spec/test_data/{v5.1 → v6.1}/expected_school.rbi +33 -3
  214. data/spec/test_data/{v5.1 → v6.1}/expected_spell/habtm_spell_books.rbi +33 -3
  215. data/spec/test_data/{v5.1 → v6.1}/expected_spell.rbi +33 -3
  216. data/spec/test_data/{v5.1 → v6.1}/expected_spell_book/habtm_spell_books.rbi +48 -0
  217. data/spec/test_data/{v5.1 → v6.1}/expected_spell_book/habtm_spells.rbi +33 -3
  218. data/spec/test_data/{v5.1 → v6.1}/expected_spell_book.rbi +69 -3
  219. data/spec/test_data/{v5.1 → v6.1}/expected_squib.rbi +505 -61
  220. data/spec/test_data/{v5.0 → v6.1}/expected_srb_tc_output.txt +0 -0
  221. data/spec/test_data/{v5.1 → v6.1}/expected_subject/habtm_wizards.rbi +33 -3
  222. data/spec/test_data/{v5.1 → v6.1}/expected_subject.rbi +33 -3
  223. data/spec/test_data/v6.1/expected_variant_record.rbi +370 -0
  224. data/spec/test_data/{v5.1 → v6.1}/expected_wand.rbi +99 -3
  225. data/spec/test_data/{v5.1 → v6.1}/expected_wizard/habtm_subjects.rbi +33 -3
  226. data/spec/test_data/{v5.1 → v6.1}/expected_wizard.rbi +505 -61
  227. data/spec/test_data/{v5.1 → v6.1}/expected_wizard_wo_spellbook.rbi +499 -55
  228. metadata +266 -501
  229. data/.travis.yml +0 -42
  230. data/lib/sorbet-rails/type_assert/actionpack.rbi +0 -4
  231. data/spec/support/v5.0/.gitignore +0 -21
  232. data/spec/support/v5.0/Gemfile +0 -37
  233. data/spec/support/v5.0/Gemfile.lock +0 -161
  234. data/spec/support/v5.0/app/assets/stylesheets/application.css +0 -15
  235. data/spec/support/v5.0/app/jobs/application_job.rb +0 -3
  236. data/spec/support/v5.0/app/mailers/application_mailer.rb +0 -5
  237. data/spec/support/v5.0/app/models/headmaster.rb +0 -8
  238. data/spec/support/v5.0/app/models/potion.rb +0 -6
  239. data/spec/support/v5.0/app/models/robe.rb +0 -4
  240. data/spec/support/v5.0/app/models/spell.rb +0 -5
  241. data/spec/support/v5.0/app/models/subject.rb +0 -5
  242. data/spec/support/v5.0/app/views/layouts/application.html.erb +0 -13
  243. data/spec/support/v5.0/bin/bundle +0 -3
  244. data/spec/support/v5.0/bin/setup +0 -34
  245. data/spec/support/v5.0/bin/update +0 -29
  246. data/spec/support/v5.0/config/application.rb +0 -27
  247. data/spec/support/v5.0/config/database.yml +0 -25
  248. data/spec/support/v5.0/config/environments/development.rb +0 -48
  249. data/spec/support/v5.0/config/environments/production.rb +0 -75
  250. data/spec/support/v5.0/config/environments/test.rb +0 -43
  251. data/spec/support/v5.0/config/initializers/cookies_serializer.rb +0 -6
  252. data/spec/support/v5.0/config/initializers/new_framework_defaults.rb +0 -27
  253. data/spec/support/v5.0/config/initializers/session_store.rb +0 -4
  254. data/spec/support/v5.0/config/locales/en.yml +0 -23
  255. data/spec/support/v5.0/config/puma.rb +0 -48
  256. data/spec/support/v5.0/config/routes.rb +0 -5
  257. data/spec/support/v5.0/db/migrate/20190620000001_create_wizards.rb +0 -14
  258. data/spec/support/v5.0/db/migrate/20190620000002_create_wands.rb +0 -12
  259. data/spec/support/v5.0/db/migrate/20190620000003_create_spell_books.rb +0 -10
  260. data/spec/support/v5.0/db/migrate/20190620000004_add_more_column_types_to_wands.rb +0 -17
  261. data/spec/support/v5.0/db/migrate/20190620000005_add_broom_to_wizard.rb +0 -6
  262. data/spec/support/v5.0/db/migrate/20190620000006_add_more_enums_to_wizard.rb +0 -9
  263. data/spec/support/v5.0/db/migrate/20190620000007_add_type_to_wizard.rb +0 -6
  264. data/spec/support/v5.0/db/migrate/20190620000008_add_robe_to_wizard.rb +0 -8
  265. data/spec/support/v5.0/db/migrate/20190620000009_add_school.rb +0 -10
  266. data/spec/support/v5.0/db/migrate/20190620000010_add_subject.rb +0 -8
  267. data/spec/support/v5.0/db/migrate/20190620000011_add_subjects_wizards.rb +0 -8
  268. data/spec/support/v5.0/db/migrate/20190620000012_add_spell.rb +0 -8
  269. data/spec/support/v5.0/db/migrate/20190620000013_add_spells_spell_books.rb +0 -8
  270. data/spec/support/v5.0/db/schema.rb +0 -96
  271. data/spec/support/v5.0/public/robots.txt +0 -5
  272. data/spec/support/v5.1/README.md +0 -24
  273. data/spec/support/v5.1/Rakefile +0 -6
  274. data/spec/support/v5.1/app/assets/config/manifest.js +0 -2
  275. data/spec/support/v5.1/app/controllers/application_controller.rb +0 -4
  276. data/spec/support/v5.1/app/helpers/application_helper.rb +0 -3
  277. data/spec/support/v5.1/app/helpers/bar_helper.rb +0 -3
  278. data/spec/support/v5.1/app/helpers/baz_helper.rb +0 -3
  279. data/spec/support/v5.1/app/helpers/foo_helper.rb +0 -3
  280. data/spec/support/v5.1/app/jobs/application_job.rb +0 -3
  281. data/spec/support/v5.1/app/jobs/award_house_point_hourglasses.rb +0 -12
  282. data/spec/support/v5.1/app/mailers/daily_prophet_mailer.rb +0 -9
  283. data/spec/support/v5.1/app/mailers/hogwarts_acceptance_mailer.rb +0 -29
  284. data/spec/support/v5.1/app/models/application_record.rb +0 -4
  285. data/spec/support/v5.1/app/models/concerns/.keep +0 -0
  286. data/spec/support/v5.1/app/models/concerns/mythical.rb +0 -11
  287. data/spec/support/v5.1/app/models/school.rb +0 -5
  288. data/spec/support/v5.1/app/models/spell_book.rb +0 -18
  289. data/spec/support/v5.1/app/models/squib.rb +0 -6
  290. data/spec/support/v5.1/app/models/wand.rb +0 -19
  291. data/spec/support/v5.1/app/models/wizard.rb +0 -65
  292. data/spec/support/v5.1/app/views/layouts/mailer.html.erb +0 -13
  293. data/spec/support/v5.1/app/views/layouts/mailer.text.erb +0 -1
  294. data/spec/support/v5.1/bin/bundle +0 -3
  295. data/spec/support/v5.1/bin/rails +0 -4
  296. data/spec/support/v5.1/bin/rake +0 -4
  297. data/spec/support/v5.1/bin/update +0 -29
  298. data/spec/support/v5.1/bin/yarn +0 -11
  299. data/spec/support/v5.1/config/boot.rb +0 -4
  300. data/spec/support/v5.1/config/environment.rb +0 -6
  301. data/spec/support/v5.1/config/initializers/application_controller_renderer.rb +0 -9
  302. data/spec/support/v5.1/config/initializers/backtrace_silencers.rb +0 -8
  303. data/spec/support/v5.1/config/initializers/filter_parameter_logging.rb +0 -5
  304. data/spec/support/v5.1/config/initializers/inflections.rb +0 -17
  305. data/spec/support/v5.1/config/initializers/mime_types.rb +0 -5
  306. data/spec/support/v5.1/config/initializers/sorbet_rails.rb +0 -3
  307. data/spec/support/v5.1/config/initializers/wrap_parameters.rb +0 -15
  308. data/spec/support/v5.1/config/routes.rb +0 -5
  309. data/spec/support/v5.1/config.ru +0 -5
  310. data/spec/support/v5.1/db/migrate/20190620000005_add_broom_to_wizard.rb +0 -6
  311. data/spec/support/v5.1/db/migrate/20190620000014_create_headmasters.rb +0 -9
  312. data/spec/support/v5.1/db/migrate/20190620000015_add_serialized_to_wizards.rb +0 -9
  313. data/spec/support/v5.1/db/seeds.rb +0 -8
  314. data/spec/support/v5.1/lib/assets/.keep +0 -0
  315. data/spec/support/v5.1/lib/mythical_rbi_plugin.rb +0 -16
  316. data/spec/support/v5.1/lib/tasks/.keep +0 -0
  317. data/spec/support/v5.1/log/.keep +0 -0
  318. data/spec/support/v5.1/package.json +0 -5
  319. data/spec/support/v5.1/public/robots.txt +0 -1
  320. data/spec/support/v5.1/sorbet_test_cases.rb +0 -409
  321. data/spec/support/v5.1/tmp/.keep +0 -0
  322. data/spec/support/v5.1/vendor/.keep +0 -0
  323. data/spec/test_data/v5.0/expected_active_record_base.rbi +0 -113
  324. data/spec/test_data/v5.0/expected_active_record_relation.rbi +0 -198
  325. data/spec/test_data/v5.0/expected_habtm_subjects.rbi +0 -660
  326. data/spec/test_data/v5.0/expected_habtm_wizards.rbi +0 -660
  327. data/spec/test_data/v5.0/expected_headmaster.rbi +0 -328
  328. data/spec/test_data/v5.0/expected_internal_metadata.rbi +0 -298
  329. data/spec/test_data/v5.0/expected_potion.rbi +0 -280
  330. data/spec/test_data/v5.0/expected_robe.rbi +0 -301
  331. data/spec/test_data/v5.0/expected_routes.rbi +0 -27
  332. data/spec/test_data/v5.0/expected_schema_migration.rbi +0 -271
  333. data/spec/test_data/v5.0/expected_school.rbi +0 -301
  334. data/spec/test_data/v5.0/expected_spell/habtm_spell_books.rbi +0 -319
  335. data/spec/test_data/v5.0/expected_spell.rbi +0 -292
  336. data/spec/test_data/v5.0/expected_spell_book/habtm_spell_books.rbi +0 -637
  337. data/spec/test_data/v5.0/expected_spell_book/habtm_spells.rbi +0 -319
  338. data/spec/test_data/v5.0/expected_spell_book.rbi +0 -415
  339. data/spec/test_data/v5.0/expected_squib.rbi +0 -832
  340. data/spec/test_data/v5.0/expected_subject/habtm_wizards.rbi +0 -319
  341. data/spec/test_data/v5.0/expected_subject.rbi +0 -292
  342. data/spec/test_data/v5.0/expected_wand.rbi +0 -497
  343. data/spec/test_data/v5.0/expected_wizard/habtm_subjects.rbi +0 -319
  344. data/spec/test_data/v5.0/expected_wizard.rbi +0 -908
  345. data/spec/test_data/v5.0/expected_wizard_wo_spellbook.rbi +0 -902
  346. data/spec/test_data/v5.1/expected_application_job.rbi +0 -20
  347. data/spec/test_data/v5.1/expected_application_mailer.rbi +0 -5
  348. data/spec/test_data/v5.1/expected_award_house_point_hourglasses.rbi +0 -20
  349. data/spec/test_data/v5.1/expected_custom_application_job.rbi +0 -21
  350. data/spec/test_data/v5.1/expected_custom_application_mailer.rbi +0 -6
  351. data/spec/test_data/v5.1/expected_custom_award_house_point_hourglasses.rbi +0 -21
  352. data/spec/test_data/v5.1/expected_custom_daily_prophet_mailer.rbi +0 -8
  353. data/spec/test_data/v5.1/expected_custom_hogwarts_acceptance_mailer.rbi +0 -21
  354. data/spec/test_data/v5.1/expected_daily_prophet_mailer.rbi +0 -7
  355. data/spec/test_data/v5.1/expected_helpers.rbi +0 -27
  356. data/spec/test_data/v5.1/expected_helpers_with_application_and_devise_helpers.rbi +0 -34
  357. data/spec/test_data/v5.1/expected_hogwarts_acceptance_mailer.rbi +0 -20
  358. data/spec/test_data/v5.1/expected_no_routes.rbi +0 -4
  359. data/spec/test_data/v5.1/expected_routes.rbi +0 -27
  360. data/spec/test_data/v5.1/expected_srb_tc_output.txt +0 -1
@@ -16,12 +16,12 @@ namespace :rails_rbi do
16
16
  FileUtils.rm_rf(rails_rbi_root_path)
17
17
 
18
18
  # run all rake tasks
19
- Rake::Task['rails_rbi:routes'].invoke
20
- Rake::Task['rails_rbi:models'].invoke
21
- Rake::Task['rails_rbi:helpers'].invoke
22
- Rake::Task['rails_rbi:mailers'].invoke
23
- Rake::Task['rails_rbi:jobs'].invoke
24
- Rake::Task['rails_rbi:custom'].invoke
19
+ Rake::Task[rails_rbi_task_name(t, 'routes')].invoke
20
+ Rake::Task[rails_rbi_task_name(t, 'models')].invoke
21
+ Rake::Task[rails_rbi_task_name(t, 'helpers')].invoke
22
+ Rake::Task[rails_rbi_task_name(t, 'mailers')].invoke
23
+ Rake::Task[rails_rbi_task_name(t, 'jobs')].invoke
24
+ Rake::Task[rails_rbi_task_name(t, 'custom')].invoke
25
25
  end
26
26
 
27
27
  desc "Generate rbis for rails routes"
@@ -36,7 +36,7 @@ namespace :rails_rbi do
36
36
  end
37
37
 
38
38
  desc "Copy custom rbis for typed_params, pluck_to_struct, etc."
39
- task custom: :environment do
39
+ task custom: :environment do |t, args|
40
40
  copy_bundled_rbi('type_assert.rbi')
41
41
  copy_bundled_rbi('pluck_to_tstruct.rbi')
42
42
  copy_bundled_rbi('typed_params.rbi')
@@ -44,7 +44,7 @@ namespace :rails_rbi do
44
44
 
45
45
  # These files were previously bundled_rbi but are now generated so this
46
46
  # is needed for backwards compatibility with anyone using `rails_rbi:custom`
47
- Rake::Task['rails_rbi:active_record'].invoke
47
+ Rake::Task[rails_rbi_task_name(t, 'active_record')].invoke
48
48
  end
49
49
 
50
50
  desc "Generate rbis for rails active_record base"
@@ -182,4 +182,8 @@ namespace :rails_rbi do
182
182
  FileUtils.mkdir_p(File.dirname(copy_to_path))
183
183
  FileUtils.cp(bundled_rbi_file_path, copy_to_path)
184
184
  end
185
+
186
+ def rails_rbi_task_name(current_task, target_task_suffix)
187
+ current_task.to_s.sub(/\w+$/, target_task_suffix)
188
+ end
185
189
  end
data/sorbet-rails.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = %q{sorbet-rails}
3
- s.version = "0.7.4"
3
+ s.version = "0.7.#{ENV['GITHUB_RUN_NUMBER'] || 100}".strip
4
4
  s.date = %q{2019-04-18}
5
5
  s.summary = %q{Set of tools to make Sorbet work with Rails seamlessly.}
6
6
  s.authors = ["Chan Zuckerberg Initiative"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
25
25
  s.add_development_dependency 'rspec', '~> 3.8', '>= 3.8'
26
26
  # Debugging
27
27
  s.add_development_dependency 'awesome_print', '~>1.8.0', '>=1.8.0'
28
- s.add_development_dependency 'byebug', '~>11.0.1', '>=11.0.1'
28
+ s.add_development_dependency 'byebug', '~>11.1.3', '>=11.1.3'
29
29
 
30
30
  # for testing a gem with a rails app (controller specs)
31
31
  s.add_development_dependency 'rspec-rails', '>=3.8.2'
@@ -3,9 +3,8 @@
3
3
 
4
4
  wd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5
5
 
6
- RAILS_VERSION=5.0 bash $wd/run_spec.sh
7
- RAILS_VERSION=5.1 bash $wd/run_spec.sh
8
- RAILS_VERSION=6.0 bash $wd/run_spec.sh
6
+ RAILS_VERSION=5.2 bash $wd/run_spec.sh
7
+ RAILS_VERSION=6.1 bash $wd/run_spec.sh
9
8
 
10
- # Always end with the default version, which is Rails 5.2
9
+ # Always end with the default version, which is Rails 6.0
11
10
  bash $wd/run_spec.sh
data/spec/bin/run_spec.sh CHANGED
@@ -6,7 +6,7 @@ wd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
6
6
  current_dir=$(pwd)
7
7
 
8
8
  if [[ -z $RAILS_VERSION ]]; then
9
- rails_dir="$wd/../support/v5.2"
9
+ rails_dir="$wd/../support/v6.0"
10
10
  else
11
11
  rails_dir="$wd/../support/v$RAILS_VERSION"
12
12
  fi
@@ -15,7 +15,10 @@ fi
15
15
  rm $wd/../../Gemfile.lock 2>/dev/null # clean up Gemfile.lock first
16
16
  bundle install
17
17
 
18
+ echo "===================================================================="
19
+ echo "Run test for folder:"
18
20
  echo $rails_dir
21
+ echo "===================================================================="
19
22
 
20
23
  # update gems in rails_dir
21
24
  cd $rails_dir
@@ -127,7 +127,7 @@ def create_models
127
127
 
128
128
  # A nasty hack to add has_one_attached and has_many_attached to the models/wizard.rb file.
129
129
  attachments = nil
130
- if ['5.2', '6.0'].include?(ENV["RAILS_VERSION"])
130
+ if ['5.2', '6.0', '6.1'].include?(ENV["RAILS_VERSION"])
131
131
  attachments = "has_one_attached :school_photo\n has_many_attached :hats"
132
132
  end
133
133
 
@@ -313,11 +313,8 @@ def create_migrations
313
313
  add_column :wands, :broken_at, :datetime, null: true
314
314
  add_column :wands, :chosen_at_date, :date
315
315
  add_column :wands, :chosen_at_time, :time
316
- # JSON column type is only supported on 5.2 or higher
317
- unless ['5.0', '5.1'].include?(ENV['RAILS_VERSION'])
318
- add_column :wands, :spell_history, :json
319
- add_column :wands, :maker_info, :json, null: false, default: '{}'
320
- end
316
+ add_column :wands, :spell_history, :json
317
+ add_column :wands, :maker_info, :json, null: false, default: '{}'
321
318
  end
322
319
  end
323
320
  RUBY
@@ -507,20 +504,6 @@ end
507
504
  # Main setup
508
505
  source_paths
509
506
 
510
- if ['5.0'].include?(ENV["RAILS_VERSION"])
511
- File.open('Gemfile', 'r+') do |f|
512
- out = ""
513
- f.each do |line|
514
- # We remove sdoc and web-console because they misbehave.
515
- # sqlite needs to be limited to 1.3.x or it won't work.
516
- out << line.gsub("gem 'sqlite3'", "gem 'sqlite3', '~> 1.3.6'") unless line =~ /gem \'(sdoc|web-console)\'.*/
517
- end
518
- f.pos = 0
519
- f.print out
520
- f.truncate(f.pos)
521
- end
522
- end
523
-
524
507
  add_gems
525
508
 
526
509
  after_bundle do
@@ -84,6 +84,8 @@ T.assert_type!(Wizard.where.not(id: 1), Wizard::ActiveRecord_Relation)
84
84
  T.assert_type!(Wizard.preload(:spell_books), Wizard::ActiveRecord_Relation)
85
85
  T.assert_type!(Wizard.eager_load(:spell_books), Wizard::ActiveRecord_Relation)
86
86
  T.assert_type!(Wizard.order(:id), Wizard::ActiveRecord_Relation)
87
+ T.assert_type!(Wizard.select { |r| r.id == 1 }, T::Array[Wizard])
88
+ T.assert_type!(Wizard.select_columns(:id, :name), Wizard::ActiveRecord_Relation)
87
89
 
88
90
  # Finder methods -- ActiveRecord::Relation
89
91
  T.assert_type!(Wizard.all.exists?(name: 'Harry Potter'), T::Boolean)
@@ -121,12 +123,17 @@ T.assert_type!(Wizard.all.find_each, T::Enumerator[Wizard])
121
123
  Wizard.all.find_in_batches { |w| T.assert_type!(w, T::Array[Wizard]) }
122
124
  T.assert_type!(Wizard.all.find_in_batches, T::Enumerator[T::Array[Wizard]])
123
125
  Wizard.all.in_batches { |w| T.assert_type!(w, Wizard::ActiveRecord_Relation) }
124
- T.assert_type!(Wizard.all.in_batches, T::Enumerable[Wizard::ActiveRecord_Relation])
126
+ T.assert_type!(Wizard.all.in_batches, ActiveRecord::Batches::BatchEnumerator)
125
127
  # T.assert_type!(Wizard.all.destroy_all, T::Array[Wizard]) # Ignored until we add support
126
128
  T.assert_type!(Wizard.all.any?, T::Boolean)
127
129
  T.assert_type!(Wizard.all.many?, T::Boolean)
128
130
  T.assert_type!(Wizard.all.none?, T::Boolean)
129
131
  T.assert_type!(Wizard.all.one?, T::Boolean)
132
+ T.assert_type!(Wizard.all.any? { |r| r.id > 1 }, T::Boolean)
133
+ T.assert_type!(Wizard.all.many? { |r| r.id > 1 }, T::Boolean)
134
+ T.assert_type!(Wizard.all.none? { |r| r.id > 1 }, T::Boolean)
135
+ T.assert_type!(Wizard.all.one? { |r| r.id > 1 }, T::Boolean)
136
+
130
137
  # T.assert_type!(Wizard.all.update_all(name: 'Harry Potter'), Integer) # Ignored until we add support
131
138
  # T.assert_type!(Wizard.all.delete_all, Integer) # Ignored until we add support
132
139
  # Query methods
@@ -141,6 +148,8 @@ T.assert_type!(Wizard.all.where.not(id: 1), Wizard::ActiveRecord_Relation)
141
148
  T.assert_type!(Wizard.all.preload(:spell_books), Wizard::ActiveRecord_Relation)
142
149
  T.assert_type!(Wizard.all.eager_load(:spell_books), Wizard::ActiveRecord_Relation)
143
150
  T.assert_type!(Wizard.all.order(:id), Wizard::ActiveRecord_Relation)
151
+ T.assert_type!(Wizard.all.select { |r| r.id == 1 }, T::Array[Wizard])
152
+ T.assert_type!(Wizard.all.select_columns(:id, :name), Wizard::ActiveRecord_Relation)
144
153
  # Enumerable methods
145
154
  Wizard.all.each { |w| T.assert_type!(w, Wizard) }
146
155
  Wizard.all.map { |w| T.assert_type!(w, Wizard) }
@@ -185,12 +194,16 @@ T.assert_type!(spell_books.find_each, T::Enumerator[SpellBook])
185
194
  spell_books.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
186
195
  T.assert_type!(spell_books.find_in_batches, T::Enumerator[T::Array[SpellBook]])
187
196
  spell_books.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
188
- T.assert_type!(spell_books.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
197
+ T.assert_type!(spell_books.in_batches, ActiveRecord::Batches::BatchEnumerator)
189
198
  # T.assert_type!(spell_books.destroy_all, T::Array[SpellBook]) # Ignored until we add support
190
199
  T.assert_type!(spell_books.any?, T::Boolean)
191
200
  T.assert_type!(spell_books.many?, T::Boolean)
192
201
  T.assert_type!(spell_books.none?, T::Boolean)
193
202
  T.assert_type!(spell_books.one?, T::Boolean)
203
+ T.assert_type!(spell_books.any? { |r| r.id > 1 }, T::Boolean)
204
+ T.assert_type!(spell_books.many? { |r| r.id > 1 }, T::Boolean)
205
+ T.assert_type!(spell_books.none? { |r| r.id > 1 }, T::Boolean)
206
+ T.assert_type!(spell_books.one? { |r| r.id > 1 }, T::Boolean)
194
207
  # T.assert_type!(spell_books.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
195
208
  # T.assert_type!(spell_books.delete_all, Integer) # Ignored until we add support
196
209
  # Query methods
@@ -205,6 +218,9 @@ T.assert_type!(spell_books.where.not(id: 1), SpellBook::ActiveRecord_Association
205
218
  T.assert_type!(spell_books.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
206
219
  T.assert_type!(spell_books.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
207
220
  T.assert_type!(spell_books.order(:id), SpellBook::ActiveRecord_AssociationRelation)
221
+ T.assert_type!(spell_books.select { |r| r.id == 1 }, T::Array[SpellBook])
222
+ T.assert_type!(spell_books.select_columns(:id, :name), SpellBook::ActiveRecord_AssociationRelation)
223
+
208
224
  # Enumerable methods
209
225
  spell_books.each { |s| T.assert_type!(s, SpellBook) }
210
226
  spell_books.map { |s| T.assert_type!(s, SpellBook) }
@@ -257,12 +273,16 @@ T.assert_type!(spell_books_query.find_each, T::Enumerator[SpellBook])
257
273
  spell_books_query.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
258
274
  T.assert_type!(spell_books_query.find_in_batches, T::Enumerator[T::Array[SpellBook]])
259
275
  spell_books_query.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
260
- T.assert_type!(spell_books_query.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
276
+ T.assert_type!(spell_books_query.in_batches, ActiveRecord::Batches::BatchEnumerator)
261
277
  # T.assert_type!(spell_books_query.destroy_all, T::Array[SpellBook]) # Ignored until we add support
262
278
  T.assert_type!(spell_books_query.any?, T::Boolean)
263
279
  T.assert_type!(spell_books_query.many?, T::Boolean)
264
280
  T.assert_type!(spell_books_query.none?, T::Boolean)
265
281
  T.assert_type!(spell_books_query.one?, T::Boolean)
282
+ T.assert_type!(spell_books_query.any? { |r| r.id > 1 }, T::Boolean)
283
+ T.assert_type!(spell_books_query.many? { |r| r.id > 1 }, T::Boolean)
284
+ T.assert_type!(spell_books_query.none? { |r| r.id > 1 }, T::Boolean)
285
+ T.assert_type!(spell_books_query.one? { |r| r.id > 1 }, T::Boolean)
266
286
  # T.assert_type!(spell_books_query.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
267
287
  # T.assert_type!(spell_books_query.delete_all, Integer) # Ignored until we add support
268
288
  # Query methods
@@ -277,6 +297,8 @@ T.assert_type!(spell_books_query.where.not(id: 1), SpellBook::ActiveRecord_Assoc
277
297
  T.assert_type!(spell_books_query.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
278
298
  T.assert_type!(spell_books_query.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
279
299
  T.assert_type!(spell_books_query.order(:id), SpellBook::ActiveRecord_AssociationRelation)
300
+ T.assert_type!(spell_books.select { |r| r.id == 1 }, T::Array[SpellBook])
301
+ T.assert_type!(spell_books.select_columns(:id, :name), SpellBook::ActiveRecord_AssociationRelation)
280
302
  # Enumerable methods
281
303
  spell_books_query.each { |s| T.assert_type!(s, SpellBook) }
282
304
  spell_books_query.map { |s| T.assert_type!(s, SpellBook) }
@@ -316,7 +338,7 @@ T.assert_type!(
316
338
  )
317
339
  T.assert_type!(
318
340
  wizard.patronus_characteristics,
319
- T.nilable(T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[String, T.untyped], Integer, String))
341
+ T.nilable(ActiveRecord::Coders::JSON),
320
342
  )
321
343
  T.assert_type!(wizard.pets, T.nilable(T::Array[T.untyped]))
322
344
 
data/spec/rails_helper.rb CHANGED
@@ -13,14 +13,14 @@ rails_version = ENV["RAILS_VERSION"] || "default"
13
13
 
14
14
  rails_folder =
15
15
  case rails_version
16
- when "5.0"
17
- "v5.0"
18
- when "5.1"
19
- "v5.1"
16
+ when "5.2"
17
+ "v5.2"
20
18
  when "6.0"
21
19
  "v6.0"
20
+ when "6.1"
21
+ "v6.1"
22
22
  else
23
- "v5.2"
23
+ "v6.0"
24
24
  end
25
25
 
26
26
  TEST_DATA_FOLDER = "spec/test_data/#{rails_folder}"
@@ -29,12 +29,19 @@ RSpec.describe 'rake rails_rbi:models', type: :task do
29
29
  ]
30
30
  )
31
31
  if Object.const_defined?('ActiveStorage')
32
+ files = [
33
+ 'attachment.rbi',
34
+ 'blob.rbi',
35
+ ]
36
+ if ENV["RAILS_VERSION"] == '6.1'
37
+ files += [
38
+ 'record.rbi',
39
+ 'variant_record.rbi',
40
+ ]
41
+ end
32
42
  expect_files(
33
43
  base_dir: generated_dir_path.join('active_storage'),
34
- files: [
35
- 'attachment.rbi',
36
- 'blob.rbi',
37
- ],
44
+ files: files,
38
45
  )
39
46
  end
40
47
  if Object.const_defined?('ActiveRecord::InternalMetadata')
data/spec/sorbet_spec.rb CHANGED
@@ -79,7 +79,8 @@ RSpec.describe 'sorbet' do
79
79
 
80
80
  it 'returns expected sorbet tc result' do
81
81
  stdout, stderr, status = Open3.capture3(
82
- 'bundle', 'exec', 'srb', 'tc',
82
+ # 'bundle', 'exec', 'srb', 'tc',
83
+ 'srb', 'tc',
83
84
  chdir: Rails.root.to_path,
84
85
  )
85
86
  expected_file_path = 'expected_srb_tc_output.txt'
@@ -1,8 +1,6 @@
1
1
  source 'https://rubygems.org'
2
2
  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
3
3
 
4
- ruby '2.5.5'
5
-
6
4
  # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7
5
  gem 'rails', '~> 5.2.4', '>= 5.2.4.2'
8
6
  # Use sqlite3 as the database for Active Record
@@ -36,4 +34,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
36
34
 
37
35
  gem 'sorbet-rails', path: '../../../.'
38
36
  gem 'sorbet'
39
- gem 'sorbet-runtime'
37
+ gem 'sorbet-runtime'
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ../../..
3
3
  specs:
4
- sorbet-rails (0.7.4)
4
+ sorbet-rails (0.7.100)
5
5
  method_source (>= 0.9.2)
6
6
  parlour (>= 4.0.1)
7
7
  parser (>= 2.7)
@@ -11,43 +11,43 @@ PATH
11
11
  GEM
12
12
  remote: https://rubygems.org/
13
13
  specs:
14
- actioncable (5.2.4.2)
15
- actionpack (= 5.2.4.2)
14
+ actioncable (5.2.6)
15
+ actionpack (= 5.2.6)
16
16
  nio4r (~> 2.0)
17
17
  websocket-driver (>= 0.6.1)
18
- actionmailer (5.2.4.2)
19
- actionpack (= 5.2.4.2)
20
- actionview (= 5.2.4.2)
21
- activejob (= 5.2.4.2)
18
+ actionmailer (5.2.6)
19
+ actionpack (= 5.2.6)
20
+ actionview (= 5.2.6)
21
+ activejob (= 5.2.6)
22
22
  mail (~> 2.5, >= 2.5.4)
23
23
  rails-dom-testing (~> 2.0)
24
- actionpack (5.2.4.2)
25
- actionview (= 5.2.4.2)
26
- activesupport (= 5.2.4.2)
24
+ actionpack (5.2.6)
25
+ actionview (= 5.2.6)
26
+ activesupport (= 5.2.6)
27
27
  rack (~> 2.0, >= 2.0.8)
28
28
  rack-test (>= 0.6.3)
29
29
  rails-dom-testing (~> 2.0)
30
30
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
31
- actionview (5.2.4.2)
32
- activesupport (= 5.2.4.2)
31
+ actionview (5.2.6)
32
+ activesupport (= 5.2.6)
33
33
  builder (~> 3.1)
34
34
  erubi (~> 1.4)
35
35
  rails-dom-testing (~> 2.0)
36
36
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
37
- activejob (5.2.4.2)
38
- activesupport (= 5.2.4.2)
37
+ activejob (5.2.6)
38
+ activesupport (= 5.2.6)
39
39
  globalid (>= 0.3.6)
40
- activemodel (5.2.4.2)
41
- activesupport (= 5.2.4.2)
42
- activerecord (5.2.4.2)
43
- activemodel (= 5.2.4.2)
44
- activesupport (= 5.2.4.2)
40
+ activemodel (5.2.6)
41
+ activesupport (= 5.2.6)
42
+ activerecord (5.2.6)
43
+ activemodel (= 5.2.6)
44
+ activesupport (= 5.2.6)
45
45
  arel (>= 9.0)
46
- activestorage (5.2.4.2)
47
- actionpack (= 5.2.4.2)
48
- activerecord (= 5.2.4.2)
49
- marcel (~> 0.3.1)
50
- activesupport (5.2.4.2)
46
+ activestorage (5.2.6)
47
+ actionpack (= 5.2.6)
48
+ activerecord (= 5.2.6)
49
+ marcel (~> 1.0.0)
50
+ activesupport (5.2.6)
51
51
  concurrent-ruby (~> 1.0, >= 1.0.2)
52
52
  i18n (>= 0.7, < 2)
53
53
  minitest (~> 5.1)
@@ -56,43 +56,41 @@ GEM
56
56
  ast (2.4.2)
57
57
  bindex (0.8.1)
58
58
  builder (3.2.4)
59
- byebug (11.1.1)
59
+ byebug (11.1.3)
60
60
  commander (4.6.0)
61
61
  highline (~> 2.0.0)
62
- concurrent-ruby (1.1.6)
62
+ concurrent-ruby (1.1.9)
63
63
  crass (1.0.6)
64
- erubi (1.9.0)
64
+ erubi (1.10.0)
65
65
  globalid (0.4.2)
66
66
  activesupport (>= 4.2.0)
67
67
  highline (2.0.3)
68
- i18n (1.8.2)
68
+ i18n (1.8.10)
69
69
  concurrent-ruby (~> 1.0)
70
- jbuilder (2.10.0)
70
+ jbuilder (2.11.2)
71
71
  activesupport (>= 5.0.0)
72
- loofah (2.4.0)
72
+ loofah (2.10.0)
73
73
  crass (~> 1.0.2)
74
74
  nokogiri (>= 1.5.9)
75
75
  mail (2.7.1)
76
76
  mini_mime (>= 0.1.1)
77
- marcel (0.3.3)
78
- mimemagic (~> 0.3.2)
77
+ marcel (1.0.1)
79
78
  method_source (1.0.0)
80
- mimemagic (0.3.4)
81
- mini_mime (1.0.2)
82
- mini_portile2 (2.5.0)
83
- minitest (5.14.0)
84
- nio4r (2.5.2)
85
- nokogiri (1.11.1)
79
+ mini_mime (1.1.0)
80
+ mini_portile2 (2.5.3)
81
+ minitest (5.14.4)
82
+ nio4r (2.5.7)
83
+ nokogiri (1.11.7)
86
84
  mini_portile2 (~> 2.5.0)
87
85
  racc (~> 1.4)
88
- nokogiri (1.11.1-x86_64-darwin)
86
+ nokogiri (1.11.7-x86_64-darwin)
89
87
  racc (~> 1.4)
90
- parlour (6.0.0)
88
+ parlour (6.0.1)
91
89
  commander (~> 4.5)
92
90
  parser
93
91
  rainbow (~> 3.0)
94
92
  sorbet-runtime (>= 0.5)
95
- parser (3.0.1.1)
93
+ parser (3.0.2.0)
96
94
  ast (~> 2.4.1)
97
95
  polyfill (1.9.0)
98
96
  puma (3.12.6)
@@ -100,65 +98,65 @@ GEM
100
98
  rack (2.2.3)
101
99
  rack-test (1.1.0)
102
100
  rack (>= 1.0, < 3)
103
- rails (5.2.4.2)
104
- actioncable (= 5.2.4.2)
105
- actionmailer (= 5.2.4.2)
106
- actionpack (= 5.2.4.2)
107
- actionview (= 5.2.4.2)
108
- activejob (= 5.2.4.2)
109
- activemodel (= 5.2.4.2)
110
- activerecord (= 5.2.4.2)
111
- activestorage (= 5.2.4.2)
112
- activesupport (= 5.2.4.2)
101
+ rails (5.2.6)
102
+ actioncable (= 5.2.6)
103
+ actionmailer (= 5.2.6)
104
+ actionpack (= 5.2.6)
105
+ actionview (= 5.2.6)
106
+ activejob (= 5.2.6)
107
+ activemodel (= 5.2.6)
108
+ activerecord (= 5.2.6)
109
+ activestorage (= 5.2.6)
110
+ activesupport (= 5.2.6)
113
111
  bundler (>= 1.3.0)
114
- railties (= 5.2.4.2)
112
+ railties (= 5.2.6)
115
113
  sprockets-rails (>= 2.0.0)
116
114
  rails-dom-testing (2.0.3)
117
115
  activesupport (>= 4.2.0)
118
116
  nokogiri (>= 1.6)
119
117
  rails-html-sanitizer (1.3.0)
120
118
  loofah (~> 2.3)
121
- railties (5.2.4.2)
122
- actionpack (= 5.2.4.2)
123
- activesupport (= 5.2.4.2)
119
+ railties (5.2.6)
120
+ actionpack (= 5.2.6)
121
+ activesupport (= 5.2.6)
124
122
  method_source
125
123
  rake (>= 0.8.7)
126
124
  thor (>= 0.19.0, < 2.0)
127
125
  rainbow (3.0.0)
128
- rake (13.0.1)
126
+ rake (13.0.6)
129
127
  safe_type (1.1.1)
130
- sorbet (0.5.5480)
131
- sorbet-static (= 0.5.5480)
132
- sorbet-coerce (0.4.0)
128
+ sorbet (0.5.6519)
129
+ sorbet-static (= 0.5.6519)
130
+ sorbet-coerce (0.5.0)
133
131
  polyfill (~> 1.8)
134
132
  safe_type (~> 1.1, >= 1.1.1)
135
133
  sorbet-runtime (>= 0.4.4704)
136
- sorbet-runtime (0.5.5480)
137
- sorbet-static (0.5.5480-universal-darwin-19)
138
- sprockets (4.0.0)
134
+ sorbet-runtime (0.5.6519)
135
+ sorbet-static (0.5.6519-universal-darwin-20)
136
+ sprockets (4.0.2)
139
137
  concurrent-ruby (~> 1.0)
140
138
  rack (> 1, < 3)
141
- sprockets-rails (3.2.1)
139
+ sprockets-rails (3.2.2)
142
140
  actionpack (>= 4.0)
143
141
  activesupport (>= 4.0)
144
142
  sprockets (>= 3.0.0)
145
143
  sqlite3 (1.4.2)
146
- thor (1.0.1)
144
+ thor (1.1.0)
147
145
  thread_safe (0.3.6)
148
- tzinfo (1.2.6)
146
+ tzinfo (1.2.9)
149
147
  thread_safe (~> 0.1)
150
148
  web-console (3.7.0)
151
149
  actionview (>= 5.0)
152
150
  activemodel (>= 5.0)
153
151
  bindex (>= 0.4.0)
154
152
  railties (>= 5.0)
155
- websocket-driver (0.7.1)
153
+ websocket-driver (0.7.5)
156
154
  websocket-extensions (>= 0.1.0)
157
155
  websocket-extensions (0.1.5)
158
156
 
159
157
  PLATFORMS
160
158
  ruby
161
- x86_64-darwin-19
159
+ x86_64-darwin-20
162
160
 
163
161
  DEPENDENCIES
164
162
  byebug
@@ -172,8 +170,5 @@ DEPENDENCIES
172
170
  tzinfo-data
173
171
  web-console (>= 3.3.0)
174
172
 
175
- RUBY VERSION
176
- ruby 2.5.5p157
177
-
178
173
  BUNDLED WITH
179
- 2.2.0
174
+ 2.2.24
@@ -1,3 +1,3 @@
1
- # typed: strong
1
+ # typed: ignore
2
2
  class ApplicationController < ActionController::Base
3
3
  end
@@ -1,4 +1,4 @@
1
- # typed: strict
1
+ # typed: ignore
2
2
  class ApplicationMailer < ActionMailer::Base
3
3
  default from: 'from@example.com'
4
4
  layout 'mailer'
@@ -1,4 +1,4 @@
1
- # typed: strong
1
+ # typed: ignore
2
2
  class DailyProphetMailer < ApplicationMailer
3
3
  extend T::Sig
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: false
1
+ # typed: ignore
2
2
  class HogwartsAcceptanceMailer < ApplicationMailer
3
3
  extend T::Sig
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: strict
1
+ # typed: false
2
2
  class SpellBook < ApplicationRecord
3
3
  validates :name, length: { minimum: 5 }, presence: true
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: true
1
+ # typed: false
2
2
  class Wand < ApplicationRecord
3
3
  include Mythical
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: strict
1
+ # typed: false
2
2
  class Wizard < ApplicationRecord
3
3
  validates :name, length: { minimum: 5 }, presence: true
4
4
  # simulate conditional validation
@@ -1,4 +1,4 @@
1
- # typed: false
1
+ # typed: ignore
2
2
  Rails.application.configure do
3
3
  # Settings specified here will take precedence over those in config/application.rb.
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: false
1
+ # typed: ignore
2
2
  Rails.application.configure do
3
3
  # Settings specified here will take precedence over those in config/application.rb.
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: false
1
+ # typed: ignore
2
2
  Rails.application.configure do
3
3
  # Settings specified here will take precedence over those in config/application.rb.
4
4
 
@@ -1,4 +1,4 @@
1
- # typed: false
1
+ # typed: ignore
2
2
  Rails.application.routes.draw do
3
3
  get 'test/index' => 'test#index'
4
4
  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html