orthoses-rails 0.4.0 → 0.5.0

data/examples/rails/tasks/active_support.rake

@@ -0,0 +1,92 @@
+stdlib_dependencies = %w[benchmark date digest json logger monitor mutex_m pathname singleton time minitest]
+gem_dependencies = %w[nokogiri]
+rails_dependencies = %w[]
+
+VERSIONS.each do |version|
+  namespace version do
+    namespace :active_support do
+      export = "export/activesupport/#{version}"
+
+      desc "export to #{export}"
+      task :export do
+        sh "rm -fr #{export}"
+        sh "mkdir -p #{export}"
+
+        # minimum
+        sh "cp -a out/#{version}/active_support.rbs #{export}"
+        sh "cp -a out/#{version}/active_support #{export}"
+        sh "rm #{export}/active_support/railtie.rbs"
+
+        # core_ext
+        %w[
+          array benchmark big_decimal class date date_and_time date_time digest
+          enumerable file hash integer kernel load_error marshal module name_error numeric
+          object pathname range regexp securerandom string symbol time uri
+        ].each do |lib|
+          out = "out/#{version}/#{lib}"
+          sh "cp -a #{out} #{export}" if File.exist?(out)
+          sh "cp -a #{out}.rbs #{export}" if File.exist?("#{out}.rbs")
+        end
+
+        Pathname(export).join("EXTERNAL_TODO.rbs").write(<<~RBS)
+          # !!! GENERATED CODE !!!
+          # Please see generators/rails-generator
+
+          module DRb
+            module DRbUndumped
+            end
+          end
+          module Concurrent
+            class Map
+            end
+          end
+        RBS
+
+        case version
+        when "6.0", "6.1"
+          sh "rm -fr #{export}/uri"
+        when "7.0"
+          # deprecated
+          sh "rm -fr #{export}/uri{,.rbs}"
+        end
+
+        generate_test_script(
+          gem: :activesupport,
+          version: version,
+          export: export,
+          stdlib_dependencies: stdlib_dependencies,
+          gem_dependencies: gem_dependencies,
+          rails_dependencies: rails_dependencies,
+        )
+
+        Pathname(export).join('_test').join('test.rb').write(<<~'RUBY')
+          # !!! GENERATED CODE !!!
+          # Please see generators/rails-generator
+
+          require 'active_support/all'
+
+          # Test ActiveSupport::NumericWithFormat
+          42.to_s
+          42.to_s(:phone)
+
+          3.days.ago + 1.minute
+        RUBY
+      end
+
+      desc "validate version=#{version} gem=active_support"
+      task :validate do
+        stdlib_opt = stdlib_dependencies.map{"-r #{_1}"}.join(" ")
+        gem_opt = gem_dependencies.map{"-I ../../.gem_rbs_collection/#{_1}"}.join(" ")
+        rails_opt = rails_dependencies.map{"-I export/#{_1}/#{version}"}.join(" ")
+        sh "rbs #{stdlib_opt} #{gem_opt} #{rails_opt} -I #{export} validate --silent"
+      end
+
+      desc "install to ../../../gems/activesupport/#{version}"
+      task :install do
+        install_to = File.expand_path("../../../gems/activesupport/#{version}", __dir__)
+        sh "rm -fr #{install_to}"
+        sh "cp -a #{export} #{install_to}"
+      end
+    end
+  end
+end

data/lib/orthoses/active_model.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
 require_relative 'active_model/has_secure_password'
-require_relative 'active_model/known_sig'

data/lib/orthoses/active_record.rb

@@ -4,5 +4,4 @@ require_relative 'active_record/belongs_to'
 require_relative 'active_record/generated_attribute_methods'
 require_relative 'active_record/has_many'
 require_relative 'active_record/has_one'
-require_relative 'active_record/known_sig'
 require_relative 'active_record/query_methods'

data/lib/orthoses/active_support/delegation.rb

@@ -35,7 +35,7 @@ module Orthoses
                 receiver_content << "# defined by `delegate` to: #{to_module_name}"
                 receiver_content << sig
               else
-                Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{arg.inspect}")
+                Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore since missing type for #{to_module_name}.#{arg.inspect} in #{capture.argument.inspect}")
               end
             end
           else
@@ -43,22 +43,22 @@ module Orthoses
             tag, to_return_type = resource.find(receiver_name, to_name, :instance, false)
             raise "bug" if tag == :multi
             if to_return_type.nil?
-              Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{capture.argument.inspect}")
+              Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore since missing type for #{receiver_name}##{to_name.inspect} in #{capture.argument.inspect}")
               next
             end
             if to_return_type.instance_of?(RBS::Types::Bases::Any)
               capture.argument[:methods].each do |method|
-                receiver_content << "# defined by `delegate` to: :#{to_name}(#{to_return_type})"
+                receiver_content << "# defined by `delegate` to: #{to_return_type}##{to_name}"
                 receiver_content << "def #{method}: (*untyped, **untyped) -> untyped"
               end
             else
               to_typename = to_return_type.name.relative!.to_s
               capture.argument[:methods].each do |method|
                 if sig = resource.build_signature(to_typename, method, :instance, true)
-                  receiver_content << "# defined by `delegate` to: :#{to_name}(#{to_return_type})"
+                  receiver_content << "# defined by `delegate` to #{to_return_type}##{to_name}"
                   receiver_content << sig
                 else
-                  Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{method.inspect}")
+                  Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore since missing type for #{to_typename}##{method.inspect} in #{capture.argument.inspect}")
                 end
               end
             end
@@ -146,7 +146,7 @@ module Orthoses
             when RBS::AST::Members::Mixin, RBS::AST::Members::LocationOnly
               next
             else
-              binding.irb
+              raise "bug: #{member.class} is not supported yet"
             end
           end
 

data/lib/orthoses/active_support/time_with_zone.rb

@@ -22,16 +22,22 @@ module Orthoses
 
       private
 
-      NOT_DELEGATE_METHODS = %i[
+      NOT_DELEGATE_METHODS = Set.new(%i[
         utc
         getgm
         getutc
         gmtime
         localtime
-      ]
+      ])
+
+      TYPE_MERGE_METHODS = Set.new(%i[
+        +
+        -
+      ])
 
       def each_line_from_core_time_definition(store)
         type_name_time = TypeName("::Time")
+        type_name_time_with_zone = TypeName("::ActiveSupport::TimeWithZone")
         env = Utils.rbs_environment(collection: true, cache: false)
         env << store["Time"].to_decl
         env << store["DateAndTime"].to_decl
@@ -48,6 +54,7 @@ module Orthoses
         one_ancestors.included_modules.each do |included_module|
           yield "include #{included_module.source.name}"
         end
+        twz_methods = builder.build_instance(type_name_time_with_zone).methods
         builder.build_instance(type_name_time).methods.each do |sym, definition_method|
           next if !definition_method.public?
           definition_method.defs.reject! do |type_def|
@@ -65,7 +72,18 @@ module Orthoses
           end
 
           if definition_method.alias_of.nil?
-            yield "def #{sym}: #{definition_method.method_types.join(" | ")}"
+            method_types = definition_method.method_types
+
+            if TYPE_MERGE_METHODS.include?(sym)
+              if twz_definition_method = twz_methods[sym]
+                twz_definition_method.defs.each do |type_def|
+                  if type_def.implemented_in == type_name_time_with_zone
+                    method_types << type_def.type
+                  end
+                end
+              end
+            end
+            yield "def #{sym}: #{method_types.join(" | ")}"
           else
             yield "alias #{sym} #{definition_method.alias_of.defs.first.member.name}"
           end

data/lib/orthoses/active_support.rb

@@ -5,7 +5,6 @@ require_relative 'active_support/configurable'
 require_relative 'active_support/delegation'
 require_relative 'active_support/mattr_accessor'
 require_relative 'active_support/time_with_zone'
-require_relative 'active_support/known_sig'
 
 module Orthoses
   module ActiveSupport
@@ -18,7 +17,6 @@ module Orthoses
       yield Delegation
       yield MattrAccessor
       yield TimeWithZone
-      yield KnownSig
     end
   end
 end

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/orthoses/rails.rb

@@ -3,7 +3,6 @@
 require 'orthoses'
 
 require_relative "rails/version"
-require_relative "rails/known_sig_helper"
 
 require_relative 'active_model'
 require_relative 'active_record'

data/orthoses-rails.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "orthoses", ">= 0.8"
+  spec.add_dependency "orthoses", ">= 0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -35,106 +35,35 @@ files:
 - LICENSE.txt
 - README.md
 - examples/rails/Rakefile
-- examples/rails/known_sig/action_cable/connection/test_cookie_jar.rbs
-- examples/rails/known_sig/action_controller/metal.rbs
-- examples/rails/known_sig/action_dispatch/cookies/cookie_jar.rbs
-- examples/rails/known_sig/action_dispatch/response.rbs
-- examples/rails/patch/drb.rbs
-- examples/rails/patch/drb/drb_undumped.rbs
-- examples/rails/patch/erubi.rbs
-- examples/rails/patch/erubi/engine.rbs
-- examples/rails/patch/minitest/kernel.rbs
-- examples/rails/patch/minitest/minitest.rbs
-- examples/rails/patch/minitest/minitest/abstract_reporter.rbs
-- examples/rails/patch/minitest/minitest/assertion.rbs
-- examples/rails/patch/minitest/minitest/assertions.rbs
-- examples/rails/patch/minitest/minitest/backtrace_filter.rbs
-- examples/rails/patch/minitest/minitest/bench_spec.rbs
-- examples/rails/patch/minitest/minitest/benchmark.rbs
-- examples/rails/patch/minitest/minitest/composite_reporter.rbs
-- examples/rails/patch/minitest/minitest/expectations.rbs
-- examples/rails/patch/minitest/minitest/guard.rbs
-- examples/rails/patch/minitest/minitest/mock.rbs
-- examples/rails/patch/minitest/minitest/parallel.rbs
-- examples/rails/patch/minitest/minitest/parallel/executor.rbs
-- examples/rails/patch/minitest/minitest/parallel/test.rbs
-- examples/rails/patch/minitest/minitest/parallel/test/class_methods.rbs
-- examples/rails/patch/minitest/minitest/pride_io.rbs
-- examples/rails/patch/minitest/minitest/pride_lol.rbs
-- examples/rails/patch/minitest/minitest/progress_reporter.rbs
-- examples/rails/patch/minitest/minitest/reportable.rbs
-- examples/rails/patch/minitest/minitest/reporter.rbs
-- examples/rails/patch/minitest/minitest/result.rbs
-- examples/rails/patch/minitest/minitest/runnable.rbs
-- examples/rails/patch/minitest/minitest/skip.rbs
-- examples/rails/patch/minitest/minitest/spec.rbs
-- examples/rails/patch/minitest/minitest/spec/dsl.rbs
-- examples/rails/patch/minitest/minitest/spec/dsl/instance_methods.rbs
-- examples/rails/patch/minitest/minitest/statistics_reporter.rbs
-- examples/rails/patch/minitest/minitest/summary_reporter.rbs
-- examples/rails/patch/minitest/minitest/test.rbs
-- examples/rails/patch/minitest/minitest/test/lifecycle_hooks.rbs
-- examples/rails/patch/minitest/minitest/unexpected_error.rbs
-- examples/rails/patch/minitest/minitest/unit.rbs
-- examples/rails/patch/minitest/minitest/unit/test_case.rbs
-- examples/rails/patch/pg.rbs
-- examples/rails/patch/pg/simple_decoder.rbs
-- examples/rails/patch/qc.rbs
-- examples/rails/patch/qc/queue.rbs
-- examples/rails/patch/que.rbs
-- examples/rails/patch/que/job.rbs
-- examples/rails/patch/rack/cache.rbs
-- examples/rails/patch/rack/cache/entity_store.rbs
-- examples/rails/patch/rack/cache/meta_store.rbs
-- examples/rails/patch/rack/session.rbs
-- examples/rails/patch/rack/session/dalli.rbs
-- examples/rails/patch/rboc.rbs
-- examples/rails/patch/rdoc/generator.rbs
-- examples/rails/patch/rdoc/generator/sdoc.rbs
-- examples/rails/patch/rdoc/task.rbs
-- examples/rails/patch/ripper.rbs
-- examples/rails/patch/sidekiq.rbs
-- examples/rails/patch/sidekiq/worker.rbs
-- examples/rails/patch/sneakers.rbs
-- examples/rails/patch/sneakers/worker.rbs
-- examples/rails/patch/sucker_punch.rbs
-- examples/rails/patch/sucker_punch/job.rbs
-- examples/rails/patch/thor.rbs
-- examples/rails/patch/thor/actions.rbs
-- examples/rails/patch/thor/actions/create_file.rbs
-- examples/rails/patch/thor/error.rbs
-- examples/rails/patch/thor/group.rbs
+- examples/rails/config/database.yml
+- examples/rails/config/storage.yml
+- examples/rails/gemfiles/Gemfile_6_0
+- examples/rails/gemfiles/Gemfile_6_0.lock
+- examples/rails/gemfiles/Gemfile_6_1
+- examples/rails/gemfiles/Gemfile_6_1.lock
+- examples/rails/gemfiles/Gemfile_7_0
+- examples/rails/gemfiles/Gemfile_7_0.lock
+- examples/rails/tasks/active_job.rake
+- examples/rails/tasks/active_model.rake
+- examples/rails/tasks/active_record.rake
+- examples/rails/tasks/active_storage.rake
+- examples/rails/tasks/active_support.rake
 - lib/orthoses-rails.rb
 - lib/orthoses/active_model.rb
 - lib/orthoses/active_model/has_secure_password.rb
-- lib/orthoses/active_model/known_sig.rb
-- lib/orthoses/active_model/known_sig/7.0/serialization.rbs
-- lib/orthoses/active_model/known_sig/7.0/validations.rbs
 - lib/orthoses/active_record.rb
 - lib/orthoses/active_record/belongs_to.rb
 - lib/orthoses/active_record/generated_attribute_methods.rb
 - lib/orthoses/active_record/has_many.rb
 - lib/orthoses/active_record/has_one.rb
-- lib/orthoses/active_record/known_sig.rb
-- lib/orthoses/active_record/known_sig/6.0/result.rbs
-- lib/orthoses/active_record/known_sig/6.1/result.rbs
-- lib/orthoses/active_record/known_sig/7.0/encryption/context.rbs
-- lib/orthoses/active_record/known_sig/7.0/result.rbs
 - lib/orthoses/active_record/query_methods.rb
 - lib/orthoses/active_support.rb
 - lib/orthoses/active_support/class_attribute.rb
 - lib/orthoses/active_support/configurable.rb
 - lib/orthoses/active_support/delegation.rb
-- lib/orthoses/active_support/known_sig.rb
-- lib/orthoses/active_support/known_sig/7.0/active_support/callbacks/callback_chain.rbs
-- lib/orthoses/active_support/known_sig/7.0/active_support/hash_with_indifferent_access.rbs
-- lib/orthoses/active_support/known_sig/7.0/active_support/multibyte/chars.rbs
-- lib/orthoses/active_support/known_sig/7.0/hash_with_indifferent_access.rbs
-- lib/orthoses/active_support/known_sig/7.0/time.rbs
 - lib/orthoses/active_support/mattr_accessor.rb
 - lib/orthoses/active_support/time_with_zone.rb
 - lib/orthoses/rails.rb
-- lib/orthoses/rails/known_sig_helper.rb
 - lib/orthoses/rails/version.rb
 - orthoses-rails.gemspec
 - sig/orthoses/rails.rbs
@@ -160,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails

data/examples/rails/known_sig/action_cable/connection/test_cookie_jar.rbs

@@ -1,2 +0,0 @@
-class ActionCable::Connection::TestCookieJar < ActiveSupport::HashWithIndifferentAccess[untyped, untyped]
-end

data/examples/rails/known_sig/action_controller/metal.rbs

@@ -1,4 +0,0 @@
-class ActionController::Metal < ::AbstractController::Base
-  @_request: ::ActionDispatch::Request
-  @_response: ::ActionDispatch::Response
-end

data/examples/rails/known_sig/action_dispatch/cookies/cookie_jar.rbs

@@ -1,3 +0,0 @@
-class ActionDispatch::Cookies::CookieJar
-  def to_h: () -> Hash[untyped, untyped]
-end

data/examples/rails/known_sig/action_dispatch/response.rbs

@@ -1,4 +0,0 @@
-class ActionDispatch::Response
-  # The HTTP status code.
-  attr_reader status: Integer
-end

data/examples/rails/patch/drb/drb_undumped.rbs

@@ -1,2 +0,0 @@
-module DRb::DRbUndumped
-end

data/examples/rails/patch/drb.rbs

@@ -1,2 +0,0 @@
- module DRb
- end

data/examples/rails/patch/erubi/engine.rbs

@@ -1,4 +0,0 @@
-module Erubi
-  class Engine
-  end
-end

data/examples/rails/patch/erubi.rbs

@@ -1,2 +0,0 @@
-module Erubi
-end

data/examples/rails/patch/minitest/kernel.rbs

@@ -1,44 +0,0 @@
-%a{annotate:rdoc:skip}
-module Kernel : ::BasicObject
-  private
-
-  # <!--
-  #   rdoc-file=lib/minitest/spec.rb
-  #   - describe(desc, *additional_desc, &block)
-  # -->
-  # Describe a series of expectations for a given target `desc`.
-  #
-  # Defines a test class subclassing from either Minitest::Spec or from the
-  # surrounding describe's class. The surrounding class may subclass
-  # Minitest::Spec manually in order to easily share code:
-  #
-  #     class MySpec < Minitest::Spec
-  #       # ... shared code ...
-  #     end
-  #
-  #     class TestStuff < MySpec
-  #       it "does stuff" do
-  #         # shared code available here
-  #       end
-  #       describe "inner stuff" do
-  #         it "still does stuff" do
-  #           # ...and here
-  #         end
-  #       end
-  #     end
-  #
-  # For more information on getting started with writing specs, see:
-  #
-  # http://www.rubyinside.com/a-minitestspec-tutorial-elegant-spec-style-testing-t
-  # hat-comes-with-ruby-5354.html
-  #
-  # For some suggestions on how to improve your specs, try:
-  #
-  # http://betterspecs.org
-  #
-  # but do note that several items there are debatable or specific to rspec.
-  #
-  # For more information about expectations, see Minitest::Expectations.
-  #
-  def describe: (untyped desc, *untyped additional_desc) { () -> untyped } -> untyped
-end

data/examples/rails/patch/minitest/minitest/abstract_reporter.rbs

@@ -1,49 +0,0 @@
-# <!-- rdoc-file=lib/minitest.rb -->
-# Defines the API for Reporters. Subclass this and override whatever you want.
-# Go nuts.
-#
-class Minitest::AbstractReporter
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - start()
-  # -->
-  # Starts reporting on the run.
-  #
-  def start: () -> nil
-
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - prerecord(klass, name)
-  # -->
-  # About to start running a test. This allows a reporter to show that it is
-  # starting or that we are in the middle of a test run.
-  #
-  def prerecord: (untyped klass, untyped name) -> nil
-
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - record(result)
-  # -->
-  # Output and record the result of the test. Call
-  # [result#result_code](rdoc-ref:Runnable#result_code) to get the result
-  # character string. Stores the result of the run if the run did not pass.
-  #
-  def record: (untyped result) -> nil
-
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - report()
-  # -->
-  # Outputs the summary of the run.
-  #
-  def report: () -> nil
-
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - passed?()
-  # -->
-  # Did this run pass?
-  #
-  def passed?: () -> true
-  include Mutex_m
-end

data/examples/rails/patch/minitest/minitest/assertion.rbs

@@ -1,16 +0,0 @@
-# <!-- rdoc-file=lib/minitest.rb -->
-# Represents run failures.
-#
-class Minitest::Assertion < ::Exception
-  def error: () -> self
-
-  # <!--
-  #   rdoc-file=lib/minitest.rb
-  #   - location()
-  # -->
-  # Where was this run before an assertion was raised?
-  #
-  def location: () -> untyped
-  def result_code: () -> untyped
-  def result_label: () -> "Failure"
-end