rbs_rails 0.2.0 → 0.3.0

data/bin/to-ascii.rb

@@ -0,0 +1,5 @@
+#!ruby
+
+ARGV.each do |p|
+  File.write p, File.read(p).gsub(/[^[:ascii:]]+/, '(trim non-ascii characters)')
+end

data/lib/rbs_rails/active_record.rb

@@ -1,13 +1,12 @@
 module RbsRails
   module ActiveRecord
-    def self.class_to_rbs(klass, mode:)
-      Generator.new(klass, mode: mode).generate
+    def self.class_to_rbs(klass)
+      Generator.new(klass).generate
     end
 
     class Generator
-      def initialize(klass, mode:)
+      def initialize(klass)
         @klass = klass
-        @mode = mode
       end
 
       def generate
@@ -52,16 +51,9 @@ module RbsRails
 
 
       private def header
-        case mode
-        when :extension
-          "extension #{klass.name} (RbsRails)"
-        when :class
-          # @type var superclass: Class
-          superclass = _ = klass.superclass
-          "class #{klass.name} < #{superclass.name}"
-        else
-          raise "unexpected mode: #{mode}"
-        end
+        # @type var superclass: Class
+        superclass = _ = klass.superclass
+        "class #{klass.name} < #{superclass.name}"
       end
 
       private def associations
@@ -246,10 +238,30 @@ module RbsRails
 
       private def columns
         klass.columns.map do |col|
-          "attr_accessor #{col.name} (): #{sql_type_to_class(col.type)}"
+          class_name = sql_type_to_class(col.type)
+          class_name_opt = optional(class_name)
+          column_type = col.null ? class_name_opt : class_name
+          sig = <<~EOS
+            attr_accessor #{col.name} (): #{column_type}
+            def #{col.name}_changed?: () -> bool
+            def #{col.name}_change: () -> [#{class_name_opt}, #{class_name_opt}]
+            def #{col.name}_will_change!: () -> void
+            def #{col.name}_was: () -> #{class_name_opt}
+            def #{col.name}_previously_changed?: () -> bool
+            def #{col.name}_previous_change: () -> Array[#{class_name_opt}]?
+            def #{col.name}_previously_was: () -> #{class_name_opt}
+            def restore_#{col.name}!: () -> void
+            def clear_#{col.name}_change: () -> void
+          EOS
+          sig << "attr_accessor #{col.name}? (): #{class_name}\n" if col.type == :boolean
+          sig
         end.join("\n")
       end
 
+      private def optional(class_name)
+        class_name.include?("|") ? "(#{class_name})?" : "#{class_name}?"
+      end
+
       private def sql_type_to_class(t)
         case t
         when :integer
@@ -270,14 +282,18 @@ module RbsRails
           # TODO
           # Date.name
           'untyped'
+        when :time
+          Time.name
+        when :inet
+          "IPAddr"
         else
           raise "unexpected: #{t.inspect}"
         end
       end
 
       private
-      # @dynamic klass, mode
-      attr_reader :klass, :mode
+      # @dynamic klass
+      attr_reader :klass
     end
   end
 end

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.2.0"
+  VERSION = "0.3.0"
 end

data/sig/rbs_rails/active_record.rbs

@@ -1,11 +1,11 @@
 module RbsRails::ActiveRecord
-  def self.class_to_rbs: (untyped klass, mode: untyped mode) -> untyped
+  def self.class_to_rbs: (untyped klass) -> untyped
 end
 
 class RbsRails::ActiveRecord::Generator
   @parse_model_file: nil | Parser::AST::Node
 
-  def initialize: (singleton(ActiveRecord::Base) klass, mode: (:extension | :class) mode) -> untyped
+  def initialize: (singleton(ActiveRecord::Base) klass) -> untyped
 
   def generate: () -> String
 
@@ -53,7 +53,7 @@ class RbsRails::ActiveRecord::Generator
 
   def sql_type_to_class: (untyped t) -> untyped
 
-  attr_reader klass: singleton(ActiveRecord::Base)
+  def optional: (String) -> String
 
-  attr_reader mode: (:extension | :class)
+  attr_reader klass: singleton(ActiveRecord::Base)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -40,20 +40,38 @@ files:
 - Steepfile
 - assets/sig/action_controller.rbs
 - assets/sig/action_mailer.rbs
-- assets/sig/action_view.rbs
 - assets/sig/active_record.rbs
 - assets/sig/builtin.rbs
+- assets/sig/capybara.rbs
+- assets/sig/concurrent.rbs
+- assets/sig/erb.rbs
+- assets/sig/erubi.rbs
+- assets/sig/generated/actionpack.rbs
+- assets/sig/generated/actionview.rbs
 - assets/sig/generated/activemodel.rbs
+- assets/sig/generated/activerecord-meta-programming.rbs
+- assets/sig/generated/activerecord.rbs
 - assets/sig/generated/activesupport.rbs
+- assets/sig/generated/railties.rbs
+- assets/sig/i18n.rbs
 - assets/sig/libxml.rbs
 - assets/sig/minitest.rbs
 - assets/sig/nokogiri.rbs
+- assets/sig/racc.rbs
+- assets/sig/rack-test.rbs
+- assets/sig/rack.rbs
 - assets/sig/rails.rbs
+- assets/sig/rdoc.rbs
 - assets/sig/stdlib.rbs
+- assets/sig/thor.rbs
+- assets/sig/tzinfo.rbs
 - bin/add-type-params.rb
 - bin/console
-- bin/merge-duplicate-decls.rb
+- bin/postprocess.rb
+- bin/rbs
+- bin/rbs-prototype-rb.rb
 - bin/setup
+- bin/to-ascii.rb
 - lib/rbs_rails.rb
 - lib/rbs_rails/active_record.rb
 - lib/rbs_rails/path_helpers.rb
@@ -71,7 +89,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/pocke/rbs_rails
   source_code_uri: https://github.com/pocke/rbs_rails
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.2.0.rc.1
+signing_key:
 specification_version: 4
 summary: A RBS files generator for Rails application
 test_files: []

data/assets/sig/action_view.rbs

@@ -1,3 +0,0 @@
-module ActionView::Layouts::ClassMethods
-  def layout: (String) -> void
-end

data/bin/merge-duplicate-decls.rb

@@ -1,30 +0,0 @@
-require 'rbs'
-rbs = ARGF.read
-
-decls = RBS::Parser.parse_signature(rbs)
-decl_map = {}
-decls.each do |decl|
-  if d = decl_map[decl.name]
-    # TODO: Is it right for decl is not a class / module?
-    c = RBS::AST::Declarations::Class
-    m = RBS::AST::Declarations::Module
-    e = RBS::AST::Declarations::Extension
-    raise 'class mismatch' if d.class != decl.class
-    raise 'class mismatch' unless [c,m,e].include?(d.class)
-
-    d.members.concat decl.members
-    d.members.uniq! { if _1.is_a?(RBS::AST::Members::MethodDefinition) then [_1.name, _1.singleton?] else _1 end}
-    case d
-    when c
-      decl_map[decl.name] = c.new(name: d.name, type_params: d.type_params, super_class: d.super_class || decl.super_class, members: d.members, annotations: d.annotations, location: d.location, comment: d.comment)
-    when m
-      decl_map[decl.name] = m.new(name: d.name, type_params: d.type_params, members: d.members, self_type: d.self_type, annotations: d.annotations, location: d.location, comment: d.comment)
-    when e
-      decl_map[decl.name] = e.new(name: d.name, type_params: d.type_params, extension_name: d.extension_name, members: d.members, annotations: d.annotations, location: d.location, comment: d.comment)
-    end
-  else
-    decl_map[decl.name] = decl
-  end
-end
-
-puts RBS::Writer.new(out: $stdout).write(decl_map.values)