rbs_rails 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66770df53a677c589c39cfd828149a60b4ef261979e11cc7dc823a1df475495f
-  data.tar.gz: 88de9ae8cc7597b4e28978f9a72a696742a5ece83b4d401fed92061fdd2b1590
+  metadata.gz: cb24ff75184c9065e46c16a3dc7b5822320255c0d7045ac82dae766b753c6638
+  data.tar.gz: 23ed2ffdbfe910c0140610016b2a6d7671a99a6bc72e569c03dfd77b9418e78f
 SHA512:
-  metadata.gz: e76c5de12b626f50db6f7e032dc323de1c79067a3cb9f8e0c4e3ba5ebd71d30d4e1679144573b3eec2788d75edd33b4ff084c5ffb7ccb8839f2293e5f061595e
-  data.tar.gz: b259952abf7664a8335a8cebda843e869a1b38c27fa010d0a927134aa56d11d63e4df20ce3850c9c2d12f62228593bd14f75ff95b7f782d00dc90d19610e71c1
+  metadata.gz: 9f3c61ac885a8a3a8c607a9452ac21ce216a77aec13a84a2e77ec9285fdfcb4c7e43a6ff712825d538c297e29c611fad4978ef0cdebdca166c042dfb6cab8a2d
+  data.tar.gz: 2301cbe92bf518435e5f4323e3cc5bfbba5a4b01bfe6511916bdbfbb8f2a034421e41dc90f61035e8db8dad3bffc0108454ca62c7cf380edee967aa3ba35694e

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master (unreleased)
 
+## 0.12.0
+
+* Support RBS v3. [#246](https://github.com/pocke/rbs_rails/pull/246)
+* Ignore `_scope` as enum field name. [#249](https://github.com/pocke/rbs_rails/pull/249)
+
 ## 0.11.0 (2022-03-24)
 
 ### New Features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_rails (0.11.0)
+    rbs_rails (0.12.0)
       parser
       rbs (>= 1)
 
@@ -163,7 +163,6 @@ GEM
 
 PLATFORMS
   ruby
-  x86_64-linux
 
 DEPENDENCIES
   minitest

data/lib/rbs_rails/active_record.rb

@@ -12,6 +12,8 @@ module RbsRails
     end
 
     class Generator
+      IGNORED_ENUM_KEYS = %i[_prefix _suffix _default _scopes]
+
       def initialize(klass, dependencies:)
         @klass = klass
         @dependencies = dependencies
@@ -159,11 +161,13 @@ module RbsRails
         klass.reflect_on_all_associations(:belongs_to).map do |a|
           @dependencies << a.klass.name unless a.polymorphic?
 
+          is_optional = a.options[:optional]
+
           type = a.polymorphic? ? 'untyped' : Util.module_name(a.klass)
           type_optional = optional(type)
           # @type var methods: Array[String]
           methods = []
-          methods << "def #{a.name}: () -> #{type}"
+          methods << "def #{a.name}: () -> #{is_optional ? type_optional : type}"
           methods << "def #{a.name}=: (#{type_optional}) -> #{type_optional}"
           methods << "def reload_#{a.name}: () -> #{type_optional}"
           if !a.polymorphic?
@@ -316,7 +320,7 @@ module RbsRails
         methods = []
         enum_definitions.each do |hash|
           hash.each do |name, values|
-            next if name == :_prefix || name == :_suffix || name == :_default
+            next if IGNORED_ENUM_KEYS.include?(name)
 
             values.each do |label, value|
               value_method_name = enum_method_name(hash, name, label)
@@ -334,7 +338,7 @@ module RbsRails
         methods = []
         enum_definitions.each do |hash|
           hash.each do |name, values|
-            next if name == :_prefix || name == :_suffix || name == :_default
+            next if IGNORED_ENUM_KEYS.include?(name)
 
             values.each do |label, value|
               value_method_name = enum_method_name(hash, name, label)

data/lib/rbs_rails/util.rb

@@ -16,7 +16,16 @@ module RbsRails
     end
 
     def format_rbs(rbs)
-      decls = RBS::Parser.parse_signature(rbs)
+      decls =
+        if Gem::Version.new('3') <= Gem::Version.new(RBS::VERSION) 
+          # TODO: Remove this type annotation when rbs_rails depends on RBS v3
+          # @type var parsed: [RBS::Buffer, untyped, RBS::Declarations::t]
+          parsed = _ = RBS::Parser.parse_signature(rbs)
+          parsed[1] + parsed[2]
+        else
+          RBS::Parser.parse_signature(rbs)
+        end
+
       StringIO.new.tap do |io|
         RBS::Writer.new(out: io).write(decls)
       end.string

data/lib/rbs_rails/version.rb

@@ -2,5 +2,5 @@ module RbsRails
   # Because of copy_signatures is defined by lib/rbs_rails.rb
   # @dynamic self.copy_signatures
 
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/sig/rbs_rails/active_record.rbs

@@ -7,6 +7,8 @@ class RbsRails::ActiveRecord::Generator
   @parse_model_file: nil | Parser::AST::Node
   @dependencies: Array[String]
 
+  IGNORED_ENUM_KEYS: Array[Symbol]
+
   def initialize: (singleton(ActiveRecord::Base) klass, dependencies: Array[String]) -> untyped
 
   def generate: () -> String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A RBS files generator for Rails application