orthoses-rails 0.4.0 → 0.7.0

data/lib/orthoses/active_support.rb

@@ -5,20 +5,3 @@ 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/version.rb

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

data/lib/orthoses/rails.rb

@@ -3,8 +3,8 @@
 require 'orthoses'
 
 require_relative "rails/version"
-require_relative "rails/known_sig_helper"
 
 require_relative 'active_model'
 require_relative 'active_record'
 require_relative 'active_support'
+require_relative 'railties'

data/lib/orthoses/railties/mixin.rb

@@ -0,0 +1,107 @@
+module Orthoses
+  module Railties
+    class Mixin
+      class MultiTracer
+        module Hook
+          def include(*mods)
+            super
+          end
+          def extend(*mods)
+            super
+          end
+          def prepend(*mods)
+            super
+          end
+        end
+
+        class MiniTracer
+          attr_reader :captures
+
+          def initialize
+            @depth = []
+            @captures = []
+            @tp = TracePoint.new(:call) do |tp|
+              if @depth.length > 0
+                @captures << [tp.self, tp.method_id, tp.binding.local_variable_get(:mods)]
+              end
+            end
+          end
+
+          def trace(target:, &block)
+            @tp.enable(target: target, &block)
+          end
+
+          def push
+            @depth << true
+          end
+
+          def pop
+            @depth.pop
+          end
+        end
+
+        def initialize
+          ::Module.prepend(Hook)
+          @run = LazyTracePoint.new(:call, :return) do |tp|
+            case tp.event
+            when :call
+              @include.push
+              @extend.push
+              @prepend.push
+            when :return
+              @include.pop
+              @extend.pop
+              @prepend.pop
+            end
+          end
+          @include = MiniTracer.new
+          @extend = MiniTracer.new
+          @prepend = MiniTracer.new
+        end
+
+        def trace
+          @run.enable(target: 'ActiveSupport::LazyLoadHooks#execute_hook') do
+            @include.trace(target: Hook.instance_method(:include)) do
+              @extend.trace(target: Hook.instance_method(:extend)) do
+                @prepend.trace(target: Hook.instance_method(:prepend)) do
+                  yield
+                end
+              end
+            end
+          end
+        end
+
+        def captures
+          @include.captures.concat(@extend.captures).concat(@prepend.captures)
+        end
+      end # MultiTracer
+
+      def initialize(loader, callback:)
+        @loader = loader
+        @callback = callback
+      end
+
+      def call
+        multi_tracer = MultiTracer.new
+        store = multi_tracer.trace do
+          @loader.call
+        end
+
+        railties_mixin = Utils.new_store
+
+        multi_tracer.captures.each do |base_mod, how, mods|
+          base_mod_name = Utils.module_name(base_mod) or next
+          mod_names = mods.map { |mod| Utils.module_name(mod) }.compact
+          mod_names.each do |mod_name|
+            store[base_mod_name].delete("#{how} #{mod_name}")
+            railties_mixin[base_mod_name] << "#{how} #{mod_name}"
+          end
+        end
+
+        @callback.call(railties_mixin)
+
+        store
+      end
+    end
+  end
+end

data/lib/orthoses/railties.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'railties/mixin'

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.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-08-28 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.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -34,108 +34,67 @@ files:
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
+- examples/rails/Gemfile
+- examples/rails/Gemfile.lock
 - 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/known_sig/actionpack/7.0/action_controller/metal.rbs
+- examples/rails/known_sig/activemodel/7.0/active_model/serialization.rbs
+- examples/rails/known_sig/activemodel/7.0/active_model/validations.rbs
+- examples/rails/known_sig/activerecord/6.0/_active_record_relation.rbs
+- examples/rails/known_sig/activerecord/6.0/_active_record_relation_class_methods.rbs
+- examples/rails/known_sig/activerecord/6.0/active_record/result.rbs
+- examples/rails/known_sig/activerecord/6.1/_active_record_relation.rbs
+- examples/rails/known_sig/activerecord/6.1/_active_record_relation_class_methods.rbs
+- examples/rails/known_sig/activerecord/6.1/active_record/result.rbs
+- examples/rails/known_sig/activerecord/7.0/_active_record_relation.rbs
+- examples/rails/known_sig/activerecord/7.0/_active_record_relation_class_methods.rbs
+- examples/rails/known_sig/activerecord/7.0/active_record/encryption/context.rbs
+- examples/rails/known_sig/activerecord/7.0/active_record/result.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/callbacks/callback_chain.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/duration.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/hash_with_indifferent_access.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/multibyte/chars.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/time_with_zone.rbs
+- examples/rails/known_sig/activesupport/7.0/active_support/time_zone.rbs
+- examples/rails/known_sig/activesupport/7.0/date.rbs
+- examples/rails/known_sig/activesupport/7.0/date_and_time/zones.rbs
+- examples/rails/known_sig/activesupport/7.0/hash_with_indifferent_access.rbs
+- examples/rails/known_sig/activesupport/7.0/integer.rbs
+- examples/rails/known_sig/activesupport/7.0/numeric.rbs
+- examples/rails/known_sig/activesupport/7.0/string.rbs
+- examples/rails/known_sig/activesupport/7.0/time.rbs
+- examples/rails/tasks/action_pack.rake
+- examples/rails/tasks/action_view.rake
+- 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
+- examples/rails/tasks/railties.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/delegated_type.rb
+- lib/orthoses/active_record/enum.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_record/scope.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
+- lib/orthoses/railties.rb
+- lib/orthoses/railties/mixin.rb
 - orthoses-rails.gemspec
 - sig/orthoses/rails.rbs
 homepage: https://github.com/ksss/orthoses-rails
@@ -160,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 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