orthoses-rails 0.6.0 → 0.7.0

data/lib/orthoses/active_record/enum.rb

@@ -12,8 +12,8 @@ module Orthoses
       end
 
       def call
-        enum = CallTracer.new
-        store = enum.trace(::ActiveRecord::Enum.instance_method(:enum)) do
+        enum = CallTracer::Lazy.new
+        store = enum.trace('ActiveRecord::Enum#enum') do
           @loader.call
         end
 

data/lib/orthoses/active_record/generated_attribute_methods.rb

@@ -42,6 +42,7 @@ module Orthoses
             generated_attribute_methods = "#{name}::AttributeMethods::GeneratedAttributeMethods"
             store[name] << "include #{generated_attribute_methods}"
 
+            store["#{name}::AttributeMethods"].header = "module #{name}::AttributeMethods"
             store[generated_attribute_methods].header = "module #{generated_attribute_methods}"
             store[generated_attribute_methods].concat(lines)
           end

data/lib/orthoses/active_record/scope.rb

@@ -9,8 +9,8 @@ module Orthoses
       end
 
       def call
-        scope = CallTracer.new
-        store = scope.trace(::ActiveRecord::Scoping::Named::ClassMethods.instance_method(:scope)) do
+        scope = CallTracer::Lazy.new
+        store = scope.trace('ActiveRecord::Scoping::Named::ClassMethods#scope') do
           @loader.call
         end
 

data/lib/orthoses/active_support/class_attribute.rb

@@ -15,20 +15,13 @@ module Orthoses
       end
 
       def call
-        target_method = begin
-          ::Class.instance_method(:class_attribute)
-        rescue NameError => err
-          Orthoses.logger.warn("Run `require 'active_support/core_ext/class/attribute'` and retry because #{err}")
-          require 'active_support/core_ext/class/attribute'
-          retry
-        end
-        call_tracer = Orthoses::CallTracer.new
+        lazy_tracer = Orthoses::CallTracer::Lazy.new
 
-        store = call_tracer.trace(target_method) do
+        store = lazy_tracer.trace('Class#class_attribute') do
           @loader.call
         end
 
-        call_tracer.captures.each do |capture|
+        lazy_tracer.captures.each do |capture|
           receiver_name = Orthoses::Utils.module_name(capture.method.receiver)
           next unless receiver_name
 

data/lib/orthoses/active_support/configurable.rb

@@ -12,8 +12,9 @@ module Orthoses
       end
 
       def call
-        config_accessor = CallTracer.new
-        store = config_accessor.trace(::ActiveSupport::Configurable::ClassMethods.instance_method(:config_accessor)) do
+        config_accessor = CallTracer::Lazy.new
+
+        store = config_accessor.trace('ActiveSupport::Configurable::ClassMethods#config_accessor') do
           @loader.call
         end
         config_accessor.captures.each do |capture|

data/lib/orthoses/active_support/delegation.rb

@@ -10,15 +10,8 @@ module Orthoses
       # 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
+        delegate = CallTracer::Lazy.new
+        store = delegate.trace('Module#delegate') do
           @loader.call
         end
 
@@ -27,6 +20,7 @@ module Orthoses
         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
@@ -42,11 +36,9 @@ module Orthoses
             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 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)
+
+            case to_return_type
+            when nil, RBS::Types::Bases::Any
               capture.argument[:methods].each do |method|
                 receiver_content << "# defined by `delegate` to: #{to_return_type}##{to_name}"
                 receiver_content << "def #{method}: (*untyped, **untyped) -> untyped"

data/lib/orthoses/active_support/mattr_accessor.rb

@@ -13,11 +13,11 @@ module Orthoses
       end
 
       def call
-        mattr_reader = Orthoses::CallTracer.new
-        mattr_writer = Orthoses::CallTracer.new
+        mattr_reader = CallTracer::Lazy.new
+        mattr_writer = CallTracer::Lazy.new
 
-        store = mattr_reader.trace(target_method(:mattr_reader)) do
-          mattr_writer.trace(target_method(:mattr_writer)) do
+        store = mattr_reader.trace('Module#mattr_reader') do
+          mattr_writer.trace('Module#mattr_writer') do
             @loader.call
           end
         end
@@ -56,14 +56,6 @@ module Orthoses
 
         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
 end

data/lib/orthoses/active_support.rb

@@ -5,18 +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'
-
-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
-    end
-  end
-end

data/lib/orthoses/rails/version.rb

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

data/lib/orthoses/rails.rb

@@ -7,3 +7,4 @@ require_relative "rails/version"
 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.10"
+  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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-01 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.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -34,20 +34,45 @@ files:
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
+- examples/rails/Gemfile
+- examples/rails/Gemfile.lock
 - examples/rails/Rakefile
 - 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/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
@@ -68,6 +93,8 @@ files:
 - lib/orthoses/active_support/time_with_zone.rb
 - lib/orthoses/rails.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
@@ -92,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails

data/examples/rails/gemfiles/Gemfile_6_0.lock

@@ -1,172 +0,0 @@
-PATH
-  remote: ../../..
-  specs:
-    orthoses-rails (0.4.0)
-      orthoses (>= 0.10)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.5)
-      actionpack (= 6.0.5)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.5)
-      actionpack (= 6.0.5)
-      activejob (= 6.0.5)
-      activerecord (= 6.0.5)
-      activestorage (= 6.0.5)
-      activesupport (= 6.0.5)
-      mail (>= 2.7.1)
-    actionmailer (6.0.5)
-      actionpack (= 6.0.5)
-      actionview (= 6.0.5)
-      activejob (= 6.0.5)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.5)
-      actionview (= 6.0.5)
-      activesupport (= 6.0.5)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.5)
-      actionpack (= 6.0.5)
-      activerecord (= 6.0.5)
-      activestorage (= 6.0.5)
-      activesupport (= 6.0.5)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.5)
-      activesupport (= 6.0.5)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.5)
-      activesupport (= 6.0.5)
-      globalid (>= 0.3.6)
-    activemodel (6.0.5)
-      activesupport (= 6.0.5)
-    activerecord (6.0.5)
-      activemodel (= 6.0.5)
-      activesupport (= 6.0.5)
-    activestorage (6.0.5)
-      actionpack (= 6.0.5)
-      activejob (= 6.0.5)
-      activerecord (= 6.0.5)
-      marcel (~> 1.0)
-    activesupport (6.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
-    digest (3.1.0)
-    erubi (1.10.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.1)
-    net-imap (0.2.3)
-      digest
-      net-protocol
-      strscan
-    net-pop (0.1.1)
-      digest
-      net-protocol
-      timeout
-    net-protocol (0.1.3)
-      timeout
-    net-smtp (0.3.1)
-      digest
-      net-protocol
-      timeout
-    nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    orthoses (0.10.0)
-      rbs (~> 2.0)
-    psych (3.3.2)
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (2.0.0)
-      rack (>= 1.3)
-    rails (6.0.5)
-      actioncable (= 6.0.5)
-      actionmailbox (= 6.0.5)
-      actionmailer (= 6.0.5)
-      actionpack (= 6.0.5)
-      actiontext (= 6.0.5)
-      actionview (= 6.0.5)
-      activejob (= 6.0.5)
-      activemodel (= 6.0.5)
-      activerecord (= 6.0.5)
-      activestorage (= 6.0.5)
-      activesupport (= 6.0.5)
-      bundler (>= 1.3.0)
-      railties (= 6.0.5)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (6.0.5)
-      actionpack (= 6.0.5)
-      activesupport (= 6.0.5)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.6)
-    rbs (2.6.0)
-    sprockets (4.1.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.4)
-    strscan (3.0.3)
-    thor (1.2.1)
-    thread_safe (0.3.6)
-    timeout (0.3.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  net-imap
-  net-pop
-  net-smtp
-  orthoses-rails!
-  psych (~> 3)
-  rails (>= 6.0, < 6.1)
-  sqlite3
-
-RUBY VERSION
-   ruby 3.1.1p18
-
-BUNDLED WITH
-   2.3.9

data/examples/rails/gemfiles/Gemfile_6_1

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-ruby "~> 3.1.0"
-
-gemspec path: '../../../'
-
-gem "rails", ">= 6.1", "< 7"
-gem "sqlite3"
-# gem "orthoses", path: "../../../../orthoses"
-
-if RUBY_VERSION >= "3.1"
-  gem "net-smtp", require: false
-  gem "net-imap", require: false
-  gem "net-pop", require: false
-end