orthoses-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c109c955af37e4574528af34d8a3695450abf39f5359729625307c368b961259
-  data.tar.gz: 29d4ad1bf3e9d4a8d18e3108899c83cd133221d3f2dc1b3f3a6cb2165684c830
+  metadata.gz: f98262e6c8d3c7f75039f41d1a14b991de17171702663d111b7dc6e9d8cac2bb
+  data.tar.gz: 28db8b6a6bdee762946bb2c7287233804543a1e5f7f735e56ac1c2d8875dc457
 SHA512:
-  metadata.gz: f491dab5ce7ce402058fec79a42c1c776434bbb88adedd8928b70031f614ef57051d9501c279c628903269413e55db24e3c9493101e79c758cfb5a202ba41f37
-  data.tar.gz: 701d609fb62bfa2d9ac0e226090844bc93d526328121516cc07cb3c8424c3f2992b4f365c3cb0680379c972238b68a3fdaa87d36a0c4849803732a5603b09f3f
+  metadata.gz: 13f1a9891b7a526aeed309854ed14bf6ee3e2b712ede4e7d0c63c33f8358f641061b6e81ad12773eff3e91043051f7ab16bb8aa349fb0c3ff38e4a7ce6b2654c
+  data.tar.gz: f3dd8dfea66c1b0477a9d17f736161e34b3a7a7c4fdaef3fc3948f84c60a6ac79fcfe1678392b8ca32746db4dc1b8f43a66e25b6d0dd4a6904440c1d0bc70cc0

data/examples/rails/Rakefile

@@ -39,7 +39,7 @@ def generate(out_dir, version)
   loader = -> () {
     # require "rails/all"
     require "rails/app_updater"
-    require "active_support"
+    require "active_support/all"
     require "active_record"
     require "active_job"
     require "active_model"
@@ -88,6 +88,9 @@ def generate(out_dir, version)
         # FIXME: too hard
         return false if name.include?("::Generators")
 
+        # Ignore known sig
+        return false if Orthoses::Utils.rbs_defined_class?(name, collection: true) && content.body.empty?
+
         true
       }
     use Orthoses::Constant,
@@ -192,12 +195,12 @@ def generate(out_dir, version)
       # MigrationProxy cannot resolve name since class alias.
       store["ActiveRecord::NullMigration"].header = nil
     end
+    use Orthoses::DelegateClass
+    use Orthoses::Attribute
     use Orthoses::Mixin,
       if: -> (base_mod, how, mod) {
         mod != Enumerable # TODO
       }
-    use Orthoses::DelegateClass
-    use Orthoses::Attribute
     use Orthoses::RBSPrototypeRB,
       paths: Dir.glob('src/{railties,action{cable,mailbox,mailer,pack,text,view},active{job,model,record,storage,support}}/lib/**/*.rb'),
       constant_filter: -> (member) { false },
@@ -205,40 +208,166 @@ def generate(out_dir, version)
     run loader
   end.call
 
-  sh "rbs --collection ../../rbs_collection.yaml -I #{out_dir}/#{version}/ validate --silent"
   # $ cat out/7.0/**/*.rbs | wc
-  # 72210  332252 2551928
+  # 68367  333370 2555378
 end
 
-namespace :generate do
-  task :v60 do
-    switch_branch("6-0-stable")
-    run_child_process { generate("out", "6.0") }
-  end
+versions = %w[
+  6.0
+  6.1
+  7.0
+]
 
-  task :v61 do
-    switch_branch("6-1-stable")
-    run_child_process { generate("out", "6.1") }
-  end
+task :clean do
+  FileUtils.rm_rf("out")
+  FileUtils.rm_rf("export")
+end
 
-  task :v70 do
-    switch_branch("7-0-stable")
-    run_child_process { generate("out", "7.0") }
+namespace :generate do
+  versions.each do |version|
+    task version do
+      switch_branch("#{version.tr('.', '-')}-stable")
+      run_child_process { generate("out", version) }
+    end
   end
-end
 
-task :clean do
-  FileUtils.rm_rf("out")
+  desc "generate all library"
+  task :all => versions
 end
 
-task :test do
-  sh "steep check"
+namespace :export do
+  versions.each do |version|
+    task version do |t|
+      export = "export/activesupport/#{version}"
+
+      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)
+        module Minitest
+          class Test
+            def name: () -> untyped
+            def assert_raises: () -> untyped
+            def refute_empty: () -> untyped
+            def refute_equal: () -> untyped
+            def refute_in_delta: () -> untyped
+            def refute_in_epsilon: () -> untyped
+            def refute_includes: () -> untyped
+            def refute_instance_of: () -> untyped
+            def refute_kind_of: () -> untyped
+            def refute_match: () -> untyped
+            def refute_nil: () -> untyped
+            def refute_operator: () -> untyped
+            def refute_predicate: () -> untyped
+            def refute_respond_to: () -> untyped
+            def refute_same: () -> untyped
+          end
+        end
+        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
+
+      Pathname(export).join('_scripts').tap(&:mkdir).join('test').write(<<~'RUBY')
+        #!/usr/bin/env bash
+
+        # set -eou => Exit command with non-zero status code, Output logs of every command executed, Treat unset variables as an error when substituting.
+        set -eou pipefail
+        # Internal Field Separator - Linux shell variable
+        IFS=$'\n\t'
+        # Print shell input lines
+        set -v
+
+        # Set RBS_DIR variable to change directory to execute type checks using `steep check`
+        RBS_DIR=$(cd $(dirname $0)/..; pwd)
+        # Set REPO_DIR variable to validate RBS files added to the corresponding folder
+        REPO_DIR=$(cd $(dirname $0)/../../..; pwd)
+        # Validate RBS files, using the bundler environment present
+        bundle exec rbs --repo=$REPO_DIR \
+          -r digest -r benchmark -r time -r monitor -r date -r singleton \
+          -r logger -r mutex_m -r pathname -r json \
+          -r nokogiri \
+          -r activesupport validate --silent
+
+        cd ${RBS_DIR}/_test
+        # Run type checks
+        bundle exec steep check
+      RUBY
+      sh "chmod +x #{Pathname(export).join('_scripts').join('test')}"
+      Pathname(export).join('_test').tap(&:mkdir).join('Steepfile').write(<<~RUBY)
+        D = Steep::Diagnostic
+
+        target :test do
+          signature "."
+          check "."
+
+          repo_path "../../../"
+
+          library "benchmark"
+          library "date"
+          library "digest"
+          library "json"
+          library "logger"
+          library "monitor"
+          library "mutex_m"
+          library "pathname"
+          library "singleton"
+          library "time"
+
+          library "nokogiri"
+
+          library "activesupport:#{version}"
+
+          configure_code_diagnostics(D::Ruby.all_error)
+        end
+      RUBY
+      Pathname(export).join('_test').join('test.rb').write(<<~'RUBY')
+        require 'active_support/all'
+
+        # Test ActiveSupport::NumericWithFormat
+        42.to_s
+        42.to_s(:phone)
+      RUBY
+
+      sh "rbs --collection ../../rbs_collection.yaml -I #{export} validate --silent"
+    end
+  end
+
+  desc "export all library"
+  task :all => versions
 end
 
 task default: [
   :clean,
-
-  'generate:v60',
-  'generate:v61',
-  'generate:v70',
+  'generate:all',
+  'export:all',
 ]

data/lib/orthoses/active_model/has_secure_password.rb

@@ -27,12 +27,12 @@ module Orthoses
           @loader.call
         end
 
-        call_tracer.result.each do |method, argument|
-          next unless method.receiver.kind_of?(Class)
-          base_name = Utils.module_name(method.receiver)
+        call_tracer.captures.each do |capture|
+          next unless capture.method.receiver.kind_of?(Class)
+          base_name = Utils.module_name(capture.method.receiver)
           next unless base_name
 
-          attribute = argument[:attribute] || :password
+          attribute = capture.argument[:attribute] || :password
           full_name = if ::ActiveModel::VERSION::MAJOR < 6
             "ActiveModel::SecurePassword::InstanceMethodsOnActivation"
           else

data/lib/orthoses/active_support/class_attribute.rb

@@ -28,22 +28,22 @@ module Orthoses
           @loader.call
         end
 
-        call_tracer.result.each do |method, argument|
-          receiver_name = Orthoses::Utils.module_name(method.receiver)
+        call_tracer.captures.each do |capture|
+          receiver_name = Orthoses::Utils.module_name(capture.method.receiver)
           next unless receiver_name
 
           methods = []
           if ::ActiveSupport::VERSION::MAJOR < 6
-            options = argument[:attrs].extract_options!
-            argument[:instance_reader]    = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
-            argument[:instance_writer]    = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
-            argument[:instance_predicate] = options.fetch(:instance_predicate, true)
-            argument[:default_value]      = options.fetch(:default, nil)
+            options = capture.argument[:attrs].extract_options!
+            capture.argument[:instance_reader]    = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
+            capture.argument[:instance_writer]    = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
+            capture.argument[:instance_predicate] = options.fetch(:instance_predicate, true)
+            capture.argument[:default_value]      = options.fetch(:default, nil)
           end
 
           content = store[receiver_name]
 
-          argument[:attrs].each do |name|
+          capture.argument[:attrs].each do |name|
             next unless @if.nil? || @if.call(method, name)
 
             # skip internal attribute
@@ -52,11 +52,11 @@ module Orthoses
             next if name == :attributes_to_define_after_schema_loads
 
             methods << "def self.#{name}: () -> untyped"
-            methods << "def self.#{name}?: () -> bool" if argument[:instance_predicate]
+            methods << "def self.#{name}?: () -> bool" if capture.argument[:instance_predicate]
             methods << "def self.#{name}=: (untyped value) -> untyped"
-            methods << "def #{name}: () -> untyped" if argument[:instance_reader]
-            methods << "def #{name}?: () -> bool" if argument[:instance_predicate] && argument[:instance_reader]
-            methods << "def #{name}=: (untyped value) -> untyped" if argument[:instance_writer]
+            methods << "def #{name}: () -> untyped" if capture.argument[:instance_reader]
+            methods << "def #{name}?: () -> bool" if capture.argument[:instance_predicate] && capture.argument[:instance_reader]
+            methods << "def #{name}=: (untyped value) -> untyped" if capture.argument[:instance_writer]
             # In RBS, `foo=` and attr_writer :foo cannot live together.
             content.body.delete_if { |line| line.start_with?("attr_writer #{name}:") }
           end

data/lib/orthoses/active_support/configurable.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module ActiveSupport
+    # <= 6.1
+    #   def config_accessor(*names, instance_reader: true, instance_writer: true, instance_accessor: true)
+    # >= 7
+    #   def config_accessor(*names, instance_reader: true, instance_writer: true, instance_accessor: true, default: nil)
+    class Configurable
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        config_accessor = CallTracer.new
+        store = config_accessor.trace(::ActiveSupport::Configurable::ClassMethods.instance_method(:config_accessor)) do
+          @loader.call
+        end
+        config_accessor.captures.each do |capture|
+          mod_name = Utils.module_name(capture.method.receiver) or next
+          content = store[mod_name]
+          capture.argument[:names].each do |name|
+            content << "def self.#{name}: () -> untyped"
+            content << "def self.#{name}=: (untyped value) -> untyped"
+            if capture.argument[:instance_accessor]
+              content << "def #{name}: () -> untyped" if capture.argument[:instance_reader]
+              content << "def #{name}=: (untyped value) -> untyped" if capture.argument[:instance_writer]
+            end
+          end
+        end
+
+        store
+      end
+    end
+  end
+end

data/lib/orthoses/active_support/delegation.rb

@@ -24,13 +24,13 @@ module Orthoses
 
         resource = Resource.new(store)
 
-        delegate.result.each do |method, argument|
-          receiver_name = Utils.module_name(method.receiver) or next
+        delegate.captures.each do |capture|
+          receiver_name = Utils.module_name(capture.method.receiver) or next
           receiver_content = store[receiver_name]
-          case argument[:to]
+          case capture.argument[:to]
           when Module
-            to_module_name = Utils.module_name(argument[:to]) or next
-            argument[:methods].each do |arg|
+            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
@@ -39,21 +39,21 @@ module Orthoses
               end
             end
           else
-            to_name = argument[:to].to_s.to_sym
+            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 #{argument.inspect}")
+              Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore #{capture.argument.inspect}")
               next
             end
             if to_return_type.instance_of?(RBS::Types::Bases::Any)
-              argument[:methods].each do |method|
+              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
-              argument[:methods].each do |method|
+              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

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/mattr_accessor.rb

@@ -22,14 +22,14 @@ module Orthoses
           end
         end
 
-        mattr_reader.result.each do |method, argument|
-          base = Orthoses::Utils.module_name(method.receiver) || next
+        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
@@ -38,14 +38,14 @@ module Orthoses
           store[base].concat(methods)
         end
 
-        mattr_writer.result.each do |method, argument|
-          base = Orthoses::Utils.module_name(method.receiver) || next
+        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

data/lib/orthoses/active_support/time_with_zone.rb

@@ -7,11 +7,6 @@ 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
@@ -37,7 +32,7 @@ module Orthoses
 
       def each_line_from_core_time_definition(store)
         type_name_time = TypeName("::Time")
-        env = Utils.rbs_environment(collection: true).dup
+        env = Utils.rbs_environment(collection: true, cache: false)
         env << store["Time"].to_decl
         env << store["DateAndTime"].to_decl
         env << store["DateAndTime::Zones"].to_decl

data/lib/orthoses/active_support.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'active_support/class_attribute'
-require_relative 'active_support/concern'
+require_relative 'active_support/configurable'
 require_relative 'active_support/delegation'
 require_relative 'active_support/mattr_accessor'
 require_relative 'active_support/time_with_zone'
@@ -15,7 +15,6 @@ module Orthoses
     #     end
     def self.each
       yield ClassAttribute
-      yield Concern
       yield Delegation
       yield MattrAccessor
       yield TimeWithZone

data/lib/orthoses/rails/version.rb

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

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"
+  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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-04 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
@@ -123,11 +123,12 @@ files:
 - 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/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

data/lib/orthoses/active_support/concern.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Orthoses
-  module ActiveSupport
-    class Concern
-      def initialize(loader)
-        @loader = loader
-      end
-
-      def call
-        target_method = begin
-          ::ActiveSupport::Concern.method(:extended)
-        rescue NameError => err
-          Orthoses.logger.warn("Run `require 'active_support/concern'` and retry because #{err}")
-          require 'active_support/concern'
-          retry
-        end
-
-        extended = CallTracer.new
-        store = extended.trace(target_method) do
-          @loader.call
-        end
-        extended.result.each do |method, argument|
-          base_name = Orthoses::Utils.module_name(argument[:base])
-          next unless base_name
-          store[argument[:base].to_s] << "extend ActiveSupport::Concern"
-        end
-        store
-      end
-    end
-  end
-end