orthoses-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98262e6c8d3c7f75039f41d1a14b991de17171702663d111b7dc6e9d8cac2bb
-  data.tar.gz: 28db8b6a6bdee762946bb2c7287233804543a1e5f7f735e56ac1c2d8875dc457
+  metadata.gz: bf5adf50ae35b548291c69ba03b7eb6086e1214c863b83c85de0af3c81de3b17
+  data.tar.gz: a162e4dc8583a4a738ac38b41ee7fb65db67349e08b2ead5f8bfc41bc3b057c1
 SHA512:
-  metadata.gz: 13f1a9891b7a526aeed309854ed14bf6ee3e2b712ede4e7d0c63c33f8358f641061b6e81ad12773eff3e91043051f7ab16bb8aa349fb0c3ff38e4a7ce6b2654c
-  data.tar.gz: f3dd8dfea66c1b0477a9d17f736161e34b3a7a7c4fdaef3fc3948f84c60a6ac79fcfe1678392b8ca32746db4dc1b8f43a66e25b6d0dd4a6904440c1d0bc70cc0
+  metadata.gz: 8c5494faf887bb600e081967321ec6c25e24610206de9014323f13e6b43147711eb05fd1d670f815adca2739f8f80988823a5c7b06adcc193092144b7aafb0d3
+  data.tar.gz: 119911fd1cd01d7fc059fc3c23f989573771126a5ca4aa4a7091a7ca604a0a6d5d86726eda48312969695a30ec70498dd2af060231abca09aecb56212cfa2b68

data/examples/rails/Rakefile

@@ -1,49 +1,26 @@
-REPO_ROOT = "#{File.dirname(__FILE__)}/src"
-$:.unshift("#{REPO_ROOT}/actioncable/lib")
-$:.unshift("#{REPO_ROOT}/actionmailbox/lib")
-$:.unshift("#{REPO_ROOT}/actionmailer/lib")
-$:.unshift("#{REPO_ROOT}/actionpack/lib")
-$:.unshift("#{REPO_ROOT}/actiontext/lib")
-$:.unshift("#{REPO_ROOT}/actionview/lib")
-$:.unshift("#{REPO_ROOT}/activejob/lib")
-$:.unshift("#{REPO_ROOT}/activemodel/lib")
-$:.unshift("#{REPO_ROOT}/activerecord/lib")
-$:.unshift("#{REPO_ROOT}/activestorage/lib")
-$:.unshift("#{REPO_ROOT}/activesupport/lib")
-$:.unshift("#{REPO_ROOT}/railties/lib")
-
-require 'orthoses'
-require 'orthoses-rails'
-require 'openssl'
-require 'cgi'
-require 'uri'
-
-Orthoses.logger.level = :error
-
-Orthoses::Utils.unautoload!
-
-def run_child_process
-  pid = fork do
-    yield
-  end
-  Process.wait(pid)
-end
+## run `$ rake`
 
 def switch_branch(name)
-  cd "src" do
+  cd "_src" do
     sh "git switch #{name}"
   end
 end
 
 def generate(out_dir, version)
+  require 'orthoses'
+  require 'orthoses-rails'
+  require 'openssl'
+  require 'cgi'
+  require 'uri'
+
+  Orthoses.logger.level = :error
+
   loader = -> () {
-    # require "rails/all"
-    require "rails/app_updater"
     require "active_support/all"
     require "active_record"
     require "active_job"
     require "active_model"
-    require "active_storage"
+    require "active_storage/engine"
     require "action_dispatch"
     require "action_mailbox"
     require "action_mailer"
@@ -70,12 +47,21 @@ def generate(out_dir, version)
       v = rails_mod.respond_to?(:version) ? rails_mod.version : nil
       puts "loaded #{rails_mod}: v#{v}"
     end
-    Orthoses::Utils.unautoload!
+    eval(<<~RUBY)
+      module Dummy
+        class Application < Rails::Application
+          config.load_defaults #{version.to_s}
+          config.active_storage.service = :local
+        end
+      end
+    RUBY
+    ENV['RAILS_ENV'] = 'development'
+    Rails.application.initialize!
   }
   Orthoses::Builder.new do
     use Orthoses::CreateFileByName,
       base_dir: "#{out_dir}/#{version}",
-      header: "# !!! GENERATED CODE !!!"
+      header: "# !!! GENERATED CODE !!!\n# Please see generators/rails-generator"
     use Orthoses::AvoidRecursiveAncestorError
     use Orthoses::Filter,
       if: -> (name, content) {
@@ -105,14 +91,13 @@ def generate(out_dir, version)
       use middleware, **args
     end
     use Orthoses::ActiveRecord::QueryMethods
-    use Orthoses::ActiveRecord::KnownSig
-    use Orthoses::ActiveModel::KnownSig
-    use Orthoses::ObjectSpaceAll
     use Orthoses::LoadRBS,
-      paths: Dir.glob('patch/**/*.rbs')
+      paths: -> { Orthoses::PathHelper.best_version_paths(::ActiveRecord::VERSION::STRING, "known_sig/activerecord") }
+    use Orthoses::LoadRBS,
+      paths: -> { Orthoses::PathHelper.best_version_paths(::ActiveModel::VERSION::STRING, "known_sig/activemodel") }
     use Orthoses::LoadRBS,
-      paths: Dir.glob('known_sig/**/*.rbs')
-    # require in method
+      paths: -> { Orthoses::PathHelper.best_version_paths(::ActiveSupport::VERSION::STRING, "known_sig/activesupport") }
+    # # require in method
     use Orthoses::Tap do |store|
       store.delete("DummyERB")
       store.delete("DummyCompiler")
@@ -202,172 +187,129 @@ def generate(out_dir, version)
         mod != Enumerable # TODO
       }
     use Orthoses::RBSPrototypeRB,
-      paths: Dir.glob('src/{railties,action{cable,mailbox,mailer,pack,text,view},active{job,model,record,storage,support}}/lib/**/*.rb'),
+      paths: Dir.glob('_src/{railties,action{cable,mailbox,mailer,pack,text,view},active{job,model,record,storage,support}}/{app,lib}/**/*.rb'),
       constant_filter: -> (member) { false },
-      mixin_filter: -> (member) { false }
+      mixin_filter: -> (member) { false },
+      attribute_filter: -> (member) { false }
+    use Orthoses::Autoload
     run loader
   end.call
 
   # $ cat out/7.0/**/*.rbs | wc
-  # 68367  333370 2555378
+  # 69763  339342 2606899
+end
+
+def generate_test_script(gem:, version:, export:, stdlib_dependencies:, gem_dependencies:, rails_dependencies:)
+  Pathname(export).join('_scripts').tap(&:mkdir).join('test').write(<<~SHELL)
+    #!/usr/bin/env bash
+
+    # !!! GENERATED CODE !!!
+    # Please see generators/rails-generator
+
+    # 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 #{stdlib_dependencies.map{"-r #{_1}"}.join(" ")} \\
+      #{gem_dependencies.map{"-r #{_1}"}.join(" ")} \\
+      -r #{gem} validate --silent
+
+    cd ${RBS_DIR}/_test
+    # Run type checks
+    bundle exec steep check
+  SHELL
+
+  sh "chmod +x #{Pathname(export).join('_scripts').join('test')}"
+
+  Pathname(export).join('_test').tap(&:mkdir).join('Steepfile').write(<<~RUBY)
+    # !!! GENERATED CODE !!!
+    # Please see generators/rails-generator
+
+    D = Steep::Diagnostic
+
+    target :test do
+      signature "."
+      check "."
+
+      repo_path "../../../"
+
+    #{stdlib_dependencies.map{"  library \"#{_1}\""}.join("\n")}
+    #{gem_dependencies.map{"  library \"#{_1}\""}.join("\n")}
+
+      library "#{gem}:#{version}"
+
+      configure_code_diagnostics(D::Ruby.all_error)
+    end
+  RUBY
 end
 
-versions = %w[
+VERSIONS = %w[
   6.0
   6.1
   7.0
 ]
+Object.private_constant :VERSIONS
+
+GEMS = %w[
+  active_support
+  active_model
+  active_record
+  active_job
+  active_storage
+]
+Object.private_constant :GEMS
 
 task :clean do
   FileUtils.rm_rf("out")
-  FileUtils.rm_rf("export")
 end
 
-namespace :generate do
-  versions.each do |version|
-    task version do
-      switch_branch("#{version.tr('.', '-')}-stable")
-      run_child_process { generate("out", version) }
+namespace :bundle do
+  task :update do
+    VERSIONS.each do |version|
+      sh "BUNDLE_GEMFILE=gemfiles/Gemfile_#{version.tr('.', '_')} bundle update"
     end
   end
-
-  desc "generate all library"
-  task :all => versions
 end
 
-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
+VERSIONS.each do |version|
+  namespace version do
+    desc "run all version=#{version}"
+    task :all => [
+      "#{version}:generate",
+      *(GEMS.map{"#{version}:#{_1}:export"}),
+      # *(GEMS.map{"#{version}:#{_1}:validate"}),
+      # *(GEMS.map{"#{version}:#{_1}:install"})
+    ]
+
+    desc "generate version=#{version}"
+    task :generate do |t|
+      gemfile = File.expand_path("gemfiles/Gemfile_#{version.tr('.', '_')}")
+      sh "BUNDLE_GEMFILE=#{gemfile} bundle install"
+      sh "BUNDLE_GEMFILE=#{gemfile} bundle exec rake #{t.name}_exec"
+    end
 
-      sh "rbs --collection ../../rbs_collection.yaml -I #{export} validate --silent"
+    task :generate_exec do
+      switch_branch("#{version.tr('.', '-')}-stable")
+      generate("out", version)
     end
   end
-
-  desc "export all library"
-  task :all => versions
 end
 
+load 'tasks/active_job.rake'
+load 'tasks/active_model.rake'
+load 'tasks/active_record.rake'
+load 'tasks/active_storage.rake'
+load 'tasks/active_support.rake'
+
 task default: [
   :clean,
-  'generate:all',
-  'export:all',
+  *(VERSIONS.map {"#{_1}:all"})
 ]

data/examples/rails/config/database.yml

@@ -0,0 +1,8 @@
+development:
+  primary: &primary
+    adapter: sqlite3
+    pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+    timeout: 5000
+    database: ':memory:'
+  replica:
+    <<: *primary

data/examples/rails/config/storage.yml

@@ -0,0 +1,3 @@
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

data/examples/rails/gemfiles/Gemfile_6_0

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+ruby "~> 3.1.0"
+
+gemspec path: '../../../'
+
+gem "rails", ">= 6.0", "< 6.1"
+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
+  gem "psych", "~> 3"
+end

data/examples/rails/gemfiles/Gemfile_6_0.lock

@@ -0,0 +1,172 @@
+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

@@ -0,0 +1,15 @@
+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