orthoses-rails 0.1.0 → 0.4.0

data/lib/orthoses/active_support/delegation.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module ActiveSupport
+    class Delegation
+      def initialize(loader)
+        @loader = loader
+      end
+
+      # def delegate(*methods, to: nil, prefix: nil, allow_nil: nil, private: nil)
+      # def delegate_missing_to(target, allow_nil: nil)
+      def call
+        target_method = begin
+          ::Module.method(:delegate)
+        rescue NameError => err
+          Orthoses.logger.warn("Run `require 'active_support/core_ext/module/delegation'` and retry because #{err}")
+          require 'active_support/core_ext/module/delegation'
+          retry
+        end
+        delegate = CallTracer.new
+        store = delegate.trace(target_method) do
+          @loader.call
+        end
+
+        resource = Resource.new(store)
+
+        delegate.captures.each do |capture|
+          receiver_name = Utils.module_name(capture.method.receiver) or next
+          receiver_content = store[receiver_name]
+          case capture.argument[:to]
+          when Module
+            to_module_name = Utils.module_name(capture.argument[:to]) or next
+            capture.argument[:methods].each do |arg|
+              if sig = resource.build_signature(to_module_name, arg, :singleton, false)
+                receiver_content << "# defined by `delegate` to: #{to_module_name}"
+                receiver_content << sig
+              else
+                Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{arg.inspect}")
+              end
+            end
+          else
+            to_name = capture.argument[:to].to_s.to_sym
+            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}")
+              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 << "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 << sig
+                else
+                  Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{method.inspect}")
+                end
+              end
+            end
+          end
+        end
+
+        store
+      end
+
+      private
+
+      class Resource
+        def initialize(store)
+          @store = store
+          env = Orthoses::Utils.rbs_environment(collection: true)
+          @definition_builder = RBS::DefinitionBuilder.new(env: env)
+        end
+
+        def find(mod_name, name, kind, argument)
+          typename = TypeName(mod_name).absolute!
+
+          if definition_method = build_definition(typename, kind)&.methods&.[](name)
+            return [:multi, definition_method.defs.map(&:type)]
+          end
+          resolve_type_by_name(@store[mod_name].to_decl.members, name, kind, argument)
+        end
+
+        def build_definition(typename, kind)
+          case kind
+          when :instance
+            @definition_builder.build_instance(typename)
+          when :singleton
+            @definition_builder.build_singleton(typename)
+          else
+            raise "big"
+          end
+        rescue RuntimeError => e
+          if e.message.match?(/\AUnknown name for/)
+            nil
+          else
+            raise
+          end
+        end
+
+        def build_signature(mod_name, name, kind, argument)
+          tag, type = find(mod_name, name, kind, argument)
+          case tag
+          when :single
+            "def #{name}: () -> #{type}"
+          when :multi
+            "def #{name}: #{type.join(' | ')}"
+          else
+            nil
+          end
+        end
+
+        private
+
+        def resolve_type_by_name(members, name, kind, argument)
+          members.each do |member|
+            case member
+            when RBS::AST::Members::MethodDefinition
+              next unless member.name == name && member.kind == kind
+              if argument
+                return [:multi, member.types]
+              else
+                type = member.types.find do |method_type|
+                  method_type.type.required_positionals.empty? && method_type.type.required_keywords.empty?
+                end
+                next unless type
+                return [:single, type.type.return_type]
+              end
+            when RBS::AST::Members::Var
+              next unless member.name == name
+              return [:single, member.type]
+            when RBS::AST::Declarations::Constant
+              next unless member.name.to_s.to_sym == name
+              return [:single, member.type]
+            when RBS::AST::Members::Attribute
+              next unless member.name == name && member.kind == kind
+              return [:single, member.type]
+            when RBS::AST::Members::Alias
+              next unless member.new_name == name && member.kind == kind
+              return resolve_type_by_name(members, member.old_name, kind, argument)
+            when RBS::AST::Members::Mixin, RBS::AST::Members::LocationOnly
+              next
+            else
+              binding.irb
+            end
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/active_support/known_sig/7.0/active_support/callbacks/callback_chain.rbs

@@ -0,0 +1,9 @@
+module ActiveSupport
+  module Callbacks
+    class CallbackChain
+      include Enumerable[::ActiveSupport::Callbacks::Callback]
+      def each: () -> Enumerator[::ActiveSupport::Callbacks::Callback, Array[::ActiveSupport::Callbacks::Callback]]
+              | () { (::ActiveSupport::Callbacks::Callback) -> void } -> Array[::ActiveSupport::Callbacks::Callback]
+    end
+  end
+end

data/lib/orthoses/active_support/known_sig/7.0/active_support/hash_with_indifferent_access.rbs

@@ -0,0 +1,6 @@
+module ActiveSupport
+  class HashWithIndifferentAccess[K, V] < ::Hash[K, V]
+    def []=: (K key, V value) -> untyped
+    def []: (K key) -> V
+  end
+end

data/lib/orthoses/active_support/known_sig/7.0/active_support/multibyte/chars.rbs

@@ -0,0 +1,7 @@
+module ActiveSupport
+  module Multibyte
+    class Chars
+      attr_reader wrapped_string: ::String
+    end
+  end
+end

data/lib/orthoses/active_support/known_sig/7.0/hash_with_indifferent_access.rbs

@@ -0,0 +1,2 @@
+class HashWithIndifferentAccess[K, V] < ActiveSupport::HashWithIndifferentAccess[K, V]
+end

data/lib/orthoses/active_support/known_sig/{time.rbs → 7.0/time.rbs}

@@ -1,6 +1,10 @@
 module DateAndTime
   module Calculations
   end
+  module Zones
+  end
+  module Compatibility
+  end
 end
 module ActiveSupport
   class TimeZone

data/lib/orthoses/active_support/known_sig.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module ActiveSupport
+    class KnownSig
+      include Orthoses::Rails::KnownSigHelper
+
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        @loader.call.tap do |store|
+          paths = best_version_paths(::ActiveSupport::VERSION::STRING, __dir__)
+          env = Content::Environment.load_from_paths(paths)
+          env.write_to(store: store)
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/active_support/mattr_accessor.rb

@@ -16,46 +16,53 @@ module Orthoses
         mattr_reader = Orthoses::CallTracer.new
         mattr_writer = Orthoses::CallTracer.new
 
-        require 'active_support/core_ext/module/attribute_accessors.rb'
-        result = mattr_reader.trace(::Module.instance_method(:mattr_reader)) do
-          mattr_writer.trace(::Module.instance_method(:mattr_writer)) do
+        store = mattr_reader.trace(target_method(:mattr_reader)) do
+          mattr_writer.trace(target_method(:mattr_writer)) do
             @loader.call
           end
         end
 
-        mattr_reader.result.each do |method, argument|
-          base = method.receiver.to_s
+        mattr_reader.captures.each do |capture|
+          base = Orthoses::Utils.module_name(capture.method.receiver) || next
           methods = []
-          argument[:syms].each do |sym|
+          capture.argument[:syms].each do |sym|
             next unless @if.nil? || @if.call(method, sym)
 
             methods << "def self.#{sym}: () -> untyped"
-            if argument[:instance_reader] && argument[:instance_accessor]
+            if capture.argument[:instance_reader] && capture.argument[:instance_accessor]
               methods << "def #{sym}: () -> untyped"
             end
           end
           next if methods.empty?
 
-          result[base].concat(methods)
+          store[base].concat(methods)
         end
 
-        mattr_writer.result.each do |method, argument|
-          base = method.receiver.to_s
+        mattr_writer.captures.each do |capture|
+          base = Orthoses::Utils.module_name(capture.method.receiver) || next
           methods = []
-          argument[:syms].each do |sym|
+          capture.argument[:syms].each do |sym|
             next unless @if.nil? || @if.call(method, sym)
 
             methods << "def self.#{sym}=: (untyped val) -> untyped"
-            if argument[:instance_writer] && argument[:instance_accessor]
+            if capture.argument[:instance_writer] && capture.argument[:instance_accessor]
               methods << "def #{sym}=: (untyped val) -> untyped"
             end
           end
           next if methods.empty?
 
-          result[base].concat(methods)
+          store[base].concat(methods)
         end
 
-        result
+        store
+      end
+
+      def target_method(name)
+        ::Module.instance_method(name)
+      rescue NameError => err
+        Orthoses.logger.warn("Run `require 'active_support/core_ext/module/attribute_accessors'` and retry because #{err}")
+        require 'active_support/core_ext/module/attribute_accessors'
+        retry
       end
     end
   end

data/lib/orthoses/active_support/time_with_zone.rb

@@ -7,18 +7,13 @@ module Orthoses
         @loader = loader
       end
 
-      LOAD_PATHS = [
-        File.expand_path("known_sig/time.rbs", __dir__),
-        File.expand_path("known_sig/active_support/time_with_zone.rbs", __dir__),
-      ]
-
       # Time <= (known Time)
       # TimeWithZone <= (known TimeWithZone, known Time, core Time)
       def call
-        store = Orthoses::LoadRBS.new(@loader, paths: LOAD_PATHS).call
+        store = @loader.call
 
         time_with_zone_store = store["ActiveSupport::TimeWithZone"]
-        each_line_from_core_time_definition do |line|
+        each_line_from_core_time_definition(store) do |line|
           time_with_zone_store << line
         end
 
@@ -35,15 +30,18 @@ module Orthoses
         localtime
       ]
 
-      def each_line_from_core_time_definition
+      def each_line_from_core_time_definition(store)
         type_name_time = TypeName("::Time")
-        loader = RBS::EnvironmentLoader.new
-        env = RBS::Environment.from_loader(loader)
-        LOAD_PATHS.each do |path|
-          RBS::Parser.parse_signature(File.read(path)).each do |decl|
-            env << decl
-          end
-        end
+        env = Utils.rbs_environment(collection: true, cache: false)
+        env << store["Time"].to_decl
+        env << store["DateAndTime"].to_decl
+        env << store["DateAndTime::Zones"].to_decl
+        env << store["DateAndTime::Calculations"].to_decl
+        env << store["DateAndTime::Compatibility"].to_decl
+        env << store["ActiveSupport"].to_decl
+        env << store["ActiveSupport::TimeZone"].to_decl
+        env << store["ActiveSupport::Duration"].to_decl
+        env << store["ActiveSupport::TimeWithZone"].to_decl
 
         builder = RBS::DefinitionBuilder.new(env: env.resolve_type_names)
         one_ancestors = builder.ancestor_builder.one_instance_ancestors(type_name_time)

data/lib/orthoses/active_support.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative 'active_support/class_attribute'
+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
+    # Interface for adding middleware in bulk.
+    #     Orthoses::ActiveSupport.each do |middleware, **args|
+    #       use middleware, **args
+    #     end
+    def self.each
+      yield ClassAttribute
+      yield Delegation
+      yield MattrAccessor
+      yield TimeWithZone
+      yield KnownSig
+    end
+  end
+end

data/lib/orthoses/rails/known_sig_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module Rails
+    module KnownSigHelper
+      def best_version_paths(current, base_dir)
+        best_version = find_best_version(current, base_dir)
+        Dir.glob("#{File.expand_path("known_sig", base_dir)}/#{best_version}/**/*.rbs")
+      end
+
+      def find_best_version(current, base_dir)
+        current_v = Gem::Version.new(current)
+        versions = version_dir(base_dir)
+        versions.reverse.bsearch { |v| v <= current_v } || versions.first
+      end
+
+      def version_dir(base_dir)
+        Dir.glob("#{File.expand_path("known_sig", base_dir)}/*").map(&File.method(:basename)).sort
+      end
+    end
+  end
+end

data/lib/orthoses/rails/version.rb

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

data/lib/orthoses/rails.rb

@@ -3,15 +3,8 @@
 require 'orthoses'
 
 require_relative "rails/version"
+require_relative "rails/known_sig_helper"
 
-require_relative 'active_model/has_secure_password'
-
-require_relative 'active_record/generated_attribute_methods'
-require_relative 'active_record/has_many'
-require_relative 'active_record/has_one'
-require_relative 'active_record/belongs_to'
-
-require_relative 'active_support/class_attribute'
-require_relative 'active_support/concern'
-require_relative 'active_support/mattr_accessor'
-require_relative 'active_support/time_with_zone'
+require_relative 'active_model'
+require_relative 'active_record'
+require_relative 'active_support'

data/orthoses-rails.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["ksss"]
   spec.email = ["co000ri@gmail.com"]
 
-  spec.summary = "Orthoses  middleware collection for Ruby on Rails"
+  spec.summary = "Orthoses middleware collection for Ruby on Rails"
   spec.description = "Orthoses middleware collection for Ruby on Rails"
   spec.homepage = "https://github.com/ksss/orthoses-rails"
   spec.license = "MIT"
@@ -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"
+  spec.add_dependency "orthoses", ">= 0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -34,19 +34,107 @@ files:
 - CODE_OF_CONDUCT.md
 - 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
 - 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/concern.rb
-- lib/orthoses/active_support/known_sig/active_support/time_with_zone.rbs
-- lib/orthoses/active_support/known_sig/time.rbs
+- 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
@@ -72,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Orthoses  middleware collection for Ruby on Rails
+summary: Orthoses middleware collection for Ruby on Rails
 test_files: []

data/lib/orthoses/active_support/concern.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Orthoses
-  module ActiveSupport
-    class Concern
-      def initialize(loader)
-        @loader = loader
-      end
-
-      def call
-        extended = CallTracer.new
-        result = extended.trace(::ActiveSupport::Concern.method(:extended)) do
-          @loader.call
-        end
-        extended.result.each do |method, argument|
-          result[argument[:base].to_s] << "extend ActiveSupport::Concern"
-        end
-        result
-      end
-    end
-  end
-end

data/lib/orthoses/active_support/known_sig/active_support/time_with_zone.rbs

@@ -1,4 +0,0 @@
-module ActiveSupport
-  class TimeWithZone
-  end
-end