rbs_rails 0.3.0 → 0.4.0

data/bin/postprocess.rb

@@ -2,21 +2,26 @@
 
 # TODO: Expose me to user
 
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'rbs', '>= 0.16'
+end
+
 require 'rbs'
 require 'rbs/cli'
 require 'optparse'
 
 def env(options:)
-  loader = RBS::EnvironmentLoader.new()
-  options.setup(loader)
+  loader = options.loader
   RBS::Environment.from_loader(loader).resolve_type_names
 end
 
 def parse_option(argv)
   opt = OptionParser.new
   options = RBS::CLI::LibraryOptions.new
-  cli = RBS::CLI.new(stdout: nil, stderr: nil)
-  cli.library_parse(opt, options: options)
+  options.setup_library_options(opt)
 
   return opt.parse(argv), options
 end
@@ -79,8 +84,10 @@ def may_eql_member?(a, b)
   a.name.to_s.split('::').last == b.name.to_s.split('::').last
 end
 
-def update!(update_targets:)
+def update!(update_targets:, only:)
   update_targets.group_by { |decl, _concern| decl.location.name }.each do |fname, target_decls|
+    next unless only.match?(fname)
+
     tree = RBS::Parser.parse_signature(File.read(fname))
     target_decls.each do |target_decl, concern|
       catch(:break) do
@@ -109,6 +116,8 @@ def run(argv)
   builder = RBS::DefinitionBuilder.new(env: env)
   matcher = FileMatcher.new(targets: targets)
 
+  only = ENV['ONLY']&.then { Regexp.new(_1) } || //
+
   update_targets = []
 
   env.class_decls.each do |_name, entry|
@@ -122,7 +131,7 @@ def run(argv)
     end
   end
 
-  update!(update_targets: update_targets)
+  update!(update_targets: update_targets, only: only)
 end
 
 run(ARGV)

data/bin/rbs

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rbs -rlogger -rpathname -rmutex_m -Isig -Iassets/sig $@
+rbs -rlogger -rpathname -rmutex_m -rdate -Isig -Iassets/sig $@

data/lib/rbs_rails/active_record.rb

@@ -66,21 +66,45 @@ module RbsRails
 
       private def has_many
         klass.reflect_on_all_associations(:has_many).map do |a|
-          "def #{a.name}: () -> #{a.klass.name}::ActiveRecord_Associations_CollectionProxy"
+          singular_name = a.name.to_s.singularize
+          type = a.klass.name
+          collection_type = "#{type}::ActiveRecord_Associations_CollectionProxy"
+          <<~RUBY.chomp
+            def #{a.name}: () -> #{collection_type}
+            def #{a.name}=: (#{collection_type} | Array[#{type}]) -> (#{collection_type} | Array[#{type}])
+            def #{singular_name}_ids: () -> Array[Integer]
+            def #{singular_name}_ids=: (Array[Integer]) -> Array[Integer]
+          RUBY
         end.join("\n")
       end
 
       private def has_one
         klass.reflect_on_all_associations(:has_one).map do |a|
           type = a.polymorphic? ? 'untyped' : a.klass.name
-          "def #{a.name}: () -> #{type}"
+          type_optional = optional(type)
+          <<~RUBY.chomp
+            def #{a.name}: () -> #{type}
+            def #{a.name}=: (#{type_optional}) -> #{type_optional}
+            def build_#{a.name}: (untyped) -> #{type}
+            def create_#{a.name}: (untyped) -> #{type}
+            def create_#{a.name}!: (untyped) -> #{type}
+            def reload_#{a.name}: () -> #{type_optional}
+          RUBY
         end.join("\n")
       end
 
       private def belongs_to
         klass.reflect_on_all_associations(:belongs_to).map do |a|
           type = a.polymorphic? ? 'untyped' : a.klass.name
-          "def #{a.name}: () -> #{type}"
+          type_optional = optional(type)
+          <<~RUBY.chomp
+            def #{a.name}: () -> #{type}
+            def #{a.name}=: (#{type_optional}) -> #{type_optional}
+            def build_#{a.name}: (untyped) -> #{type}
+            def create_#{a.name}: (untyped) -> #{type}
+            def create_#{a.name}!: (untyped) -> #{type}
+            def reload_#{a.name}: () -> #{type_optional}
+          RUBY
         end.join("\n")
       end
 
@@ -238,7 +262,11 @@ module RbsRails
 
       private def columns
         klass.columns.map do |col|
-          class_name = sql_type_to_class(col.type)
+          class_name = if enum_definitions.any? { |hash| hash.key?(col.name) || hash.key?(col.name.to_sym) }
+                         'String'
+                       else
+                         sql_type_to_class(col.type)
+                       end
           class_name_opt = optional(class_name)
           column_type = col.null ? class_name_opt : class_name
           sig = <<~EOS
@@ -265,15 +293,17 @@ module RbsRails
       private def sql_type_to_class(t)
         case t
         when :integer
-          Integer.name
+          'Integer'
         when :float
-          Float.name
-        when :string, :text, :uuid, :binary
-          String.name
+          'Float'
+        when :decimal
+          'BigDecimal'
+        when :string, :text, :citext, :uuid, :binary
+          'String'
         when :datetime
           # TODO
           # ActiveSupport::TimeWithZone.name
-          Time.name
+          'Time'
         when :boolean
           "TrueClass | FalseClass"
         when :jsonb, :json
@@ -283,7 +313,7 @@ module RbsRails
           # Date.name
           'untyped'
         when :time
-          Time.name
+          'Time'
         when :inet
           "IPAddr"
         else

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.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -48,6 +48,7 @@ files:
 - assets/sig/erubi.rbs
 - assets/sig/generated/actionpack.rbs
 - assets/sig/generated/actionview.rbs
+- assets/sig/generated/activejob.rbs
 - assets/sig/generated/activemodel.rbs
 - assets/sig/generated/activerecord-meta-programming.rbs
 - assets/sig/generated/activerecord.rbs
@@ -57,16 +58,30 @@ files:
 - assets/sig/libxml.rbs
 - assets/sig/minitest.rbs
 - assets/sig/nokogiri.rbs
+- assets/sig/patches/README.md
+- assets/sig/patches/for_actionpack.rbs
+- assets/sig/patches/for_actionview.rbs
+- assets/sig/patches/for_activemodel.rbs
+- assets/sig/patches/for_activerecord.rbs
+- assets/sig/patches/for_activesupport.rbs
+- assets/sig/patches/for_railties.rbs
+- assets/sig/pg.rbs
+- assets/sig/que.rbs
+- assets/sig/queue_classic.rbs
 - assets/sig/racc.rbs
 - assets/sig/rack-test.rbs
 - assets/sig/rack.rbs
 - assets/sig/rails.rbs
 - assets/sig/rdoc.rbs
+- assets/sig/sidekiq.rbs
+- assets/sig/sneakers.rbs
 - assets/sig/stdlib.rbs
+- assets/sig/sucker_punch.rbs
 - assets/sig/thor.rbs
 - assets/sig/tzinfo.rbs
 - bin/add-type-params.rb
 - bin/console
+- bin/generate_rbs_from_rails_source_code.rb
 - bin/postprocess.rb
 - bin/rbs
 - bin/rbs-prototype-rb.rb
@@ -104,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.0.rc.2
 signing_key:
 specification_version: 4
 summary: A RBS files generator for Rails application