orthoses-rails 0.9.0 → 1.1.0

data/lib/orthoses/active_support/delegation.rb

@@ -20,14 +20,16 @@ module Orthoses
         delegate.captures.each do |capture|
           receiver_name = Utils.module_name(capture.method.receiver) or next
           receiver_content = store[receiver_name]
+          prefix = capture.argument[:private] ? "private " : ""
 
           case capture.argument[:to]
+          # delegate :foo, to: Foo
           when Module
             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
+                receiver_content << "#{prefix}#{sig}"
               else
                 Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore since missing type for #{to_module_name}.#{arg.inspect} in #{capture.argument.inspect}")
               end
@@ -35,20 +37,28 @@ module Orthoses
           else
             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 tag == :multi
+              to_return_type = if to_return_type.length == 1
+                to_return_type.first.type.return_type
+              else
+                nil
+              end
+            end
 
             case to_return_type
             when nil, RBS::Types::Bases::Any
+              # no type found
               capture.argument[:methods].each do |method|
                 receiver_content << "# defined by `delegate` to: #{to_return_type}##{to_name}"
-                receiver_content << "def #{method}: (*untyped, **untyped) -> untyped"
+                receiver_content << "#{prefix}def #{method}: (*untyped, **untyped) -> untyped"
               end
             else
+              # found return type in store or env
               to_typename = to_return_type.name.relative!.to_s
               capture.argument[:methods].each do |method|
                 if sig = resource.build_signature(to_typename, method, :instance, true)
                   receiver_content << "# defined by `delegate` to #{to_return_type}##{to_name}"
-                  receiver_content << sig
+                  receiver_content << "#{prefix}#{sig}"
                 else
                   Orthoses.logger.warn("[ActiveSupport::Delegation] Ignore since missing type for #{to_typename}##{method.inspect} in #{capture.argument.inspect}")
                 end
@@ -73,6 +83,7 @@ module Orthoses
           typename = TypeName(mod_name).absolute!
 
           if definition_method = build_definition(typename, kind)&.methods&.[](name)
+            # found in env
             return [:multi, definition_method.defs.map(&:type)]
           end
           resolve_type_by_name(@store[mod_name].to_decl.members, name, kind, argument)
@@ -85,7 +96,7 @@ module Orthoses
           when :singleton
             @definition_builder.build_singleton(typename)
           else
-            raise "big"
+            raise "bug"
           end
         rescue RuntimeError => e
           if e.message.match?(/\AUnknown name for/)
@@ -115,7 +126,7 @@ module Orthoses
             when RBS::AST::Members::MethodDefinition
               next unless member.name == name && member.kind == kind
               if argument
-                return [:multi, member.types]
+                return [:multi, member.overloads.map { |o| o.method_type }]
               else
                 method_type = member.overloads.map(&:method_type).find do |method_type|
                   method_type.type.required_positionals.empty? && method_type.type.required_keywords.empty?

data/lib/orthoses/active_support/time_with_zone.rb

@@ -13,6 +13,7 @@ module Orthoses
         store = @loader.call
 
         time_with_zone_store = store["ActiveSupport::TimeWithZone"]
+        time_with_zone_store.body.replace(filter_decl(time_with_zone_store))
         each_line_from_core_time_definition(store) do |line|
           time_with_zone_store << line
         end
@@ -22,19 +23,28 @@ module Orthoses
 
       private
 
-      NOT_DELEGATE_METHODS = Set.new(%i[
-        utc
-        getgm
-        getutc
-        gmtime
-        localtime
-      ])
-
       TYPE_MERGE_METHODS = Set.new(%i[
         +
         -
       ])
 
+      TIME_MODULES = [
+        TypeName("::Time"),
+        TypeName("::DateAndTime::Zones"),
+        TypeName("::DateAndTime::Calculations"),
+        TypeName("::DateAndTime::Compatibility")
+      ]
+
+      def filter_decl(time_with_zone_store)
+        writer = RBS::Writer.new(out: StringIO.new)
+        time_with_zone_store.to_decl.members.each do |member|
+          # ActiveSupport::TimeWithZone.name has been deprecated
+          next if member.instance_of?(RBS::AST::Members::MethodDefinition) && member.kind == :singleton && member.name == :name
+          writer.write_member(member)
+        end
+        writer.out.string.each_line.to_a
+      end
+
       def add_signature(env, content)
         buffer, directives, decls = RBS::Parser.parse_signature(content.to_rbs)
         env.add_signature(buffer: buffer, directives: directives, decls: decls)
@@ -56,35 +66,34 @@ module Orthoses
         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)
-        one_ancestors.included_modules.each do |included_module|
-          yield "include #{included_module.source.name}"
-        end
         twz_methods = builder.build_instance(type_name_time_with_zone).methods
         builder.build_instance(type_name_time).methods.each do |sym, definition_method|
+          next if twz_methods.has_key?(sym) && !TYPE_MERGE_METHODS.include?(sym)
           next if !definition_method.public?
-          definition_method.defs.reject! do |type_def|
-            type_def.implemented_in != type_name_time
+
+          # delegate to ::Time method
+          definition_method.defs.select! do |type_def|
+            TIME_MODULES.include?(type_def.implemented_in)
           end
           next if definition_method.defs.empty?
 
-          if !NOT_DELEGATE_METHODS.include?(sym)
-            definition_method.method_types.each do |method_type|
-              rt = method_type.type.return_type
-              if rt.instance_of?(RBS::Types::ClassInstance) && rt.name.to_s == "::Time"
-                rt.instance_variable_set(:@name, RBS::Types::Bases::Self.new(location: nil))
-              end
+          definition_method.method_types.each do |method_type|
+            rt = method_type.type.return_type
+            if rt.instance_of?(RBS::Types::ClassInstance) && rt.name.to_s == "::Time"
+              rt.instance_variable_set(:@name, RBS::Types::Bases::Self.new(location: nil))
             end
           end
 
           if definition_method.alias_of.nil?
             method_types = definition_method.method_types
 
+            # merge method types (e.g. :+, :-
+            # TimeWithZone -delegate-> Time(core_ext) -delegate-> Time(core)
             if TYPE_MERGE_METHODS.include?(sym)
               if twz_definition_method = twz_methods[sym]
                 twz_definition_method.defs.each do |type_def|
                   if type_def.implemented_in == type_name_time_with_zone
-                    method_types << type_def.type
+                    method_types.unshift(type_def.type)
                   end
                 end
               end

data/lib/orthoses/active_support.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'active_support/aliasing'
 require_relative 'active_support/class_attribute'
 require_relative 'active_support/concern'
 require_relative 'active_support/configurable'

data/lib/orthoses/rails/application.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module Rails
+    class Application
+      class Loader
+        def call
+          ::Rails.application.initialize!
+          ::Rails.application.eager_load!
+        end
+      end
+
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        loader = @loader
+        Orthoses::Builder.new do
+          use Orthoses::ActiveModel::HasSecurePassword
+
+          use Orthoses::ActiveRecord::BelongsTo
+          use Orthoses::ActiveRecord::DelegatedType
+          use Orthoses::ActiveRecord::Enum
+          use Orthoses::ActiveRecord::GeneratedAttributeMethods
+          use Orthoses::ActiveRecord::HasMany
+          use Orthoses::ActiveRecord::HasOne
+          use Orthoses::ActiveRecord::Relation
+          use Orthoses::ActiveRecord::Scope
+          use Orthoses::ActiveRecord::SecureToken
+
+          if defined?(::ActiveStorage)
+            use Orthoses::ActiveStorage::Attached::Model
+          end
+
+          use Orthoses::ActiveSupport::Aliasing
+          use Orthoses::ActiveSupport::ClassAttribute
+          use Orthoses::ActiveSupport::Concern
+          use Orthoses::ActiveSupport::Delegation
+          use Orthoses::ActiveSupport::Configurable
+          use Orthoses::ActiveSupport::MattrAccessor
+          reset_runner loader
+        end.call
+      end
+    end
+  end
+end

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "0.9.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/orthoses/rails.rb

@@ -2,9 +2,11 @@
 
 require 'orthoses'
 
-require_relative "rails/version"
-
 require_relative 'active_model'
 require_relative 'active_record'
+require_relative 'active_storage'
 require_relative 'active_support'
 require_relative 'railties'
+
+require_relative "rails/application"
+require_relative "rails/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -34,45 +34,8 @@ 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/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/generators/orthoses/rails/install_generator.rb
+- lib/generators/orthoses/rails/templates/rails.rake
 - lib/orthoses-rails.rb
 - lib/orthoses/active_model.rb
 - lib/orthoses/active_model/has_secure_password.rb
@@ -84,8 +47,13 @@ files:
 - lib/orthoses/active_record/has_many.rb
 - lib/orthoses/active_record/has_one.rb
 - lib/orthoses/active_record/query_methods.rb
+- lib/orthoses/active_record/relation.rb
 - lib/orthoses/active_record/scope.rb
+- lib/orthoses/active_record/secure_token.rb
+- lib/orthoses/active_storage.rb
+- lib/orthoses/active_storage/attached/model.rb
 - lib/orthoses/active_support.rb
+- lib/orthoses/active_support/aliasing.rb
 - lib/orthoses/active_support/class_attribute.rb
 - lib/orthoses/active_support/concern.rb
 - lib/orthoses/active_support/configurable.rb
@@ -93,10 +61,10 @@ files:
 - lib/orthoses/active_support/mattr_accessor.rb
 - lib/orthoses/active_support/time_with_zone.rb
 - lib/orthoses/rails.rb
+- lib/orthoses/rails/application.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
 licenses:
@@ -120,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails

data/examples/rails/Gemfile

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-ruby ">= 3.1.0"
-
-gemspec path: '../../'
-
-gem "rails", path: "_src"
-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/Gemfile.lock

@@ -1,179 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    orthoses-rails (0.7.0)
-      orthoses (~> 1.0)
-
-PATH
-  remote: _src
-  specs:
-    actioncable (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      actionview (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.3.1)
-      actionview (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.3.1)
-      activesupport (= 7.0.3.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.3.1)
-      activesupport (= 7.0.3.1)
-      globalid (>= 0.3.6)
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activerecord (7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activestorage (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    rails (7.0.3.1)
-      actioncable (= 7.0.3.1)
-      actionmailbox (= 7.0.3.1)
-      actionmailer (= 7.0.3.1)
-      actionpack (= 7.0.3.1)
-      actiontext (= 7.0.3.1)
-      actionview (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      bundler (>= 1.15.0)
-      railties (= 7.0.3.1)
-    railties (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
-    digest (3.1.0)
-    erubi (1.11.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.12.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.3)
-    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.8)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    orthoses (1.0.0)
-      rbs (~> 2.0)
-    psych (3.3.3)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    rake (13.0.6)
-    rbs (2.6.0)
-    sqlite3 (1.5.0)
-      mini_portile2 (~> 2.8.0)
-    strscan (3.0.4)
-    thor (1.2.1)
-    timeout (0.3.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  net-imap
-  net-pop
-  net-smtp
-  orthoses-rails!
-  psych (~> 3)
-  rails!
-  sqlite3
-
-RUBY VERSION
-   ruby 3.1.1p18
-
-BUNDLED WITH
-   2.3.16