orthoses-rails 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721183c8c3c14666265aa24ecfe51ba9703afe1ed99bf5e320b6c57c2e995722
-  data.tar.gz: deabd621c4483c341b687dc5562c72aa52a49c4b983544244dc9e2b736cd056d
+  metadata.gz: a43ce53af9e7aec6ef02751c5649146d817e76770a9b15bb2fb5a24fa1b0447b
+  data.tar.gz: 83c78756ff7794059a1001902f887509d8be7b42f116a2ce30b1cdb27d75ff6a
 SHA512:
-  metadata.gz: ed8956fbfd018c4dbd650c1c20c9d46172c1cabafd286de074dbcda62d5f898125d66b12a4b461097eb6134dd3dd9dac9546157a794152064201d12261bc3365
-  data.tar.gz: c4154bd4a83864ebf2f8a13fa7cffd4bb721374f9d05674a234565efc3676ac0a837aef866233ef9f256351b70022cc60bd07f199f588d57e6bba50f0edca819
+  metadata.gz: bce1abdf1faf93222005ba51aa4c74675fc98edef98a546faecd52280bf03ce11dc896379ab7269c3c7bda3be43eddae81cf01ab6fc701e8a2e96d4f841dd7b8
+  data.tar.gz: be065396c52d757e110c2668e5eb90ada5f58275376bc93f0e9e4d25be4968735bccae5ace6d2ad7e08c8642b75b1ff5f5bd63b93c4019faba66101f1de34757

data/README.md

@@ -48,34 +48,35 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
+Build your Rake task for RBS generation.
+
 ```rb
-Orthoses::Builder.new do
-  use Orthoses::CreateFileByName
-    base_dir: Rails.root.join("sig/out"),
-    header: "# !!! GENERATED CODE !!!"
-  use Orthoses::Filter,
-    if: -> (name, _content) {
+task :rbs_generate => :environment do
+  Orthoses::Builder.new do
+    use Orthoses::CreateFileByName
+      base_dir: Rails.root.join("sig/out"),
+      header: "# !!! GENERATED CODE !!!"
+    use Orthoses::Filter do |name, _content|
       path, _lineno = Object.const_source_location(name)
       return false unless path
       %r{app/models}.match?(path)
+    end
+    use YourCustom::Middleware
+    use Orthoses::ActiveModel::HasSecurePassword
+    use Orthoses::ActiveRecord::BelongsTo
+    use Orthoses::ActiveRecord::HasMany
+    use Orthoses::ActiveRecord::HasOne
+    use Orthoses::ActiveSupport::ClassAttribute
+    use Orthoses::ActiveSupport::MattrAccessor
+    use Orthoses::Mixin
+    use Orthoses::Constant, strict: false
+    use Orthoses::ObjectSpaceAll
+    use Orthoses::Autoload
+    run -> {
+      Rails.application.eager_load!
     }
-  use YourCustom::Middleware
-  use Orthoses::ActiveModel::HasSecurePassword
-  use Orthoses::ActiveRecord::BelongsTo
-  use Orthoses::ActiveRecord::HasMany
-  use Orthoses::ActiveRecord::HasOne
-  use Orthoses::ActiveSupport::ClassAttribute
-  use Orthoses::ActiveSupport::MattrAccessor
-  use Orthoses::Mixin
-  use Orthoses::Constant, strict: false
-  use Orthoses::ObjectSpaceAll
-  use Orthoses::Autoload
-  run -> () {
-    Rake::Task[:environment].invoke
-    Rails.application.eager_load!
-    Orthoses::Utils.unautoload!
-  }
-end.call
+  end.call
+end
 ```
 
 ## Development

data/examples/rails/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    orthoses-rails (0.6.0)
-      orthoses (>= 0.10)
+    orthoses-rails (0.7.0)
+      orthoses (~> 1.0)
 
 PATH
   remote: _src
@@ -134,9 +134,9 @@ GEM
     nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    orthoses (0.11.0)
+    orthoses (1.0.0)
       rbs (~> 2.0)
-    psych (3.3.2)
+    psych (3.3.3)
     racc (1.6.0)
     rack (2.2.4)
     rack-test (2.0.2)
@@ -148,7 +148,8 @@ GEM
       loofah (~> 2.3)
     rake (13.0.6)
     rbs (2.6.0)
-    sqlite3 (1.4.4)
+    sqlite3 (1.5.0)
+      mini_portile2 (~> 2.8.0)
     strscan (3.0.4)
     thor (1.2.1)
     timeout (0.3.0)

data/examples/rails/Rakefile

@@ -67,22 +67,21 @@ def generate(out_dir, version)
     use Orthoses::CreateFileByName,
       base_dir: "#{out_dir}/#{version}",
       header: "# !!! GENERATED CODE !!!\n# Please see generators/rails-generator"
-    use Orthoses::Filter,
-      if: -> (name, content) {
-        # OMG, both ERB and Erb are exist...
-        return false if name.start_with?("Erb")
+    use Orthoses::Filter do |name, content|
+      # OMG, both ERB and Erb are exist...
+      return false if name.start_with?("Erb")
 
-        # ArgumentError
-        return false if name.start_with?("I18n::Tests")
+      # ArgumentError
+      return false if name.start_with?("I18n::Tests")
 
-        # FIXME: too hard
-        return false if name.include?("::Generators")
+      # 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?
+      # Ignore known sig
+      return false if Orthoses::Utils.rbs_defined_class?(name, collection: true) && content.body.empty?
 
-        true
-      }
+      true
+    end
     use Orthoses::Constant,
       strict: false,
       if: -> (current, const, _val, _rbs) {

data/examples/rails/known_sig/activesupport/7.0/time.rbs

@@ -1,21 +1,4 @@
-module DateAndTime
-  module Calculations
-  end
-  module Zones
-  end
-  module Compatibility
-  end
-end
-module ActiveSupport
-  class TimeZone
-  end
-  class Duration
-  end
-end
-
 class Time
-  include DateAndTime::Calculations
-
   # Returns <tt>Time.zone.now</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise just returns <tt>Time.now</tt>.
   def self.current: () -> ActiveSupport::TimeWithZone # strictly `(ActiveSupport::TimeWithZone | Time)` but it's inconvenient
   def self.zone: () -> ActiveSupport::TimeZone # strictly `ActiveSupport::TimeWithZone?` but it's inconvenient
@@ -29,16 +12,6 @@ class Time
        | ...
   def -: (ActiveSupport::Duration other) -> self
        | ...
-  alias at_beginning_of_day beginning_of_day
-  alias at_beginning_of_hour beginning_of_hour
-  alias at_beginning_of_minute beginning_of_minute
-  alias at_end_of_day end_of_day
-  alias at_end_of_hour end_of_hour
-  alias at_end_of_minute end_of_minute
-  alias at_midday middle_of_day
-  alias at_middle_of_day middle_of_day
-  alias at_midnight beginning_of_day
-  alias at_noon middle_of_day
   def beginning_of_day: () -> self
   def beginning_of_hour: () -> self
   def beginning_of_minute: () -> self
@@ -49,9 +22,7 @@ class Time
   def end_of_minute: () -> self
   def eql_with_coercion: (untyped other) -> bool
   def eql_without_coercion: (untyped other) -> bool
-  alias midday middle_of_day
   def middle_of_day: () -> self
-  alias midnight beginning_of_day
   def minus_with_coercion: (Time | self arg0) -> Float
                         | (Numeric arg0) -> self
   def minus_with_duration: (Time | self arg0) -> Float
@@ -63,7 +34,6 @@ class Time
   def next_day: () -> self
   def next_month: () -> self
   def next_year: () -> self
-  alias noon middle_of_day
   def plus_without_duration: (Time | self arg0) -> Float
                           | (Numeric arg0) -> self
   def prev_day: () -> self

data/examples/rails/tasks/railties.rake

@@ -12,10 +12,7 @@ VERSIONS.each do |version|
         sh "rm -fr #{export}"
         sh "mkdir -p #{export}"
 
-        if File.exist?("out/#{version}/active_record/destroy_association_async_job.rbs")
-          sh "mkdir -p #{export}/active_record"
-          sh "cp out/#{version}/active_record/destroy_association_async_job.rbs #{export}/active_record/destroy_association_async_job.rbs"
-        end
+        sh "cp -a out/#{version}/railties_mixin #{export}"
       end
 
       desc "validate version=#{version} gem=railties"

data/lib/orthoses/active_support/concern.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module ActiveSupport
+    class Concern
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        lazy_tracer = Orthoses::CallTracer::Lazy.new
+
+        store = lazy_tracer.trace('ActiveSupport::Concern#class_methods') do
+          @loader.call
+        end
+
+        lazy_tracer.captures.each do |capture|
+          receiver_name = Orthoses::Utils.module_name(capture.method.receiver)
+          next unless receiver_name
+
+          class_methods_name = "#{receiver_name}::ClassMethods"
+          members = members_prototype_of(class_methods_name)
+
+          writer = ::RBS::Writer.new(out: StringIO.new)
+          members.each do |member|
+            writer.write_member(member)
+          end
+          out = writer.out
+          # NOTE: Should I remove the method that is accidentally added in prototype rb?
+          store[class_methods_name].concat(out.string.each_line.to_a)
+        end
+
+        store
+      end
+
+      def members_prototype_of(mod_name)
+        mod = Object.const_get(mod_name)
+        runtime = ::RBS::Prototype::Runtime.new(patterns: nil, env: nil, merge: false)
+        type_name = runtime.to_type_name(mod_name)
+        [].tap do |members|
+          runtime.generate_methods(mod, type_name, members)
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/active_support/delegation.rb

@@ -117,11 +117,11 @@ module Orthoses
               if argument
                 return [:multi, member.types]
               else
-                type = member.types.find do |method_type|
+                method_type = member.overloads.map(&:method_type).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]
+                next unless method_type
+                return [:single, method_type.type.return_type]
               end
             when RBS::AST::Members::Var
               next unless member.name == name

data/lib/orthoses/active_support/time_with_zone.rb

@@ -35,19 +35,25 @@ module Orthoses
         -
       ])
 
+      def add_signature(env, content)
+        buffer, directives, decls = RBS::Parser.parse_signature(content.to_rbs)
+        env.add_signature(buffer: buffer, directives: directives, decls: decls)
+      end
+
       def each_line_from_core_time_definition(store)
         type_name_time = TypeName("::Time")
         type_name_time_with_zone = TypeName("::ActiveSupport::TimeWithZone")
         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
+
+        add_signature(env, store["Time"])
+        add_signature(env, store["DateAndTime"])
+        add_signature(env, store["DateAndTime::Zones"])
+        add_signature(env, store["DateAndTime::Calculations"])
+        add_signature(env, store["DateAndTime::Compatibility"])
+        add_signature(env, store["ActiveSupport"])
+        add_signature(env, store["ActiveSupport::TimeZone"])
+        add_signature(env, store["ActiveSupport::Duration"])
+        add_signature(env, store["ActiveSupport::TimeWithZone"])
 
         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

@@ -1,6 +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'

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "0.7.0"
+    VERSION = "0.9.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", ">= 0.11"
+  spec.add_dependency "orthoses", ">= 1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.6'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -87,6 +87,7 @@ files:
 - lib/orthoses/active_record/scope.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/mattr_accessor.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails