orthoses-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d6291b36d7d10e10f2d5b0898fa06a8a886375f9f91e91b2db718847c42eb2
-  data.tar.gz: 9d33694af285fdc0a214af35c26e143990689bca720429ca7029ccb48f0e531b
+  metadata.gz: fdff122ed7b5425e10cdf2fa105b8ffb7a583554589f93f8703bb014abbbafd0
+  data.tar.gz: 6d991ce9480237d0f605bbb3935c50f072c6794594b037e459ef3c0dfdcb92c3
 SHA512:
-  metadata.gz: a00f874e057a7515e2427bef047c25fc4a5bfe5f698e177b4e3919b4acc2df4cd4093b8fd407c7c493a1b548bbed0340f916af6f43bb37b0bd01e128f3ca3f8f
-  data.tar.gz: 77d8183eafa99f69864d37eae0dea091f0a2d0cf57530d10d524c61cb2ababdd8478ba6a2aad19e3be76119af7a6ee7be8e7fcd3bb8d1a7c06487c54aef3ebf3
+  metadata.gz: 2f1c3be987e9a8096a89918e4c16ef4ad8170c9e77d3e7a074541c98f4255944dde188b74f3d4693764e1f77d7fc600f6e67f9be6309aa2c433cecc746439af3
+  data.tar.gz: 49eaa832bc2a488b0b390df8fa962990898c6e9873f1476e9eae17d94073f9bc2e538be6fba54ebeaca7e33cc4245f0a68fff705f069e009c8284973d14906b8

data/README.md

@@ -3,6 +3,45 @@
 [Orthoses](https://github.com/ksss/orthoses) extension for Ruby on Rails.
 Orthoses::Rails automatically generates RBS for methods added by Rails.
 
+## Features
+
+### Orthoses::ActiveModel::HasSecurePassword
+
+Add signatures that generated form `ActiveModel::SecurePassword::ClassMethods#has_secure_password`.
+
+### Orthoses::ActiveRecord::BelongsTo
+
+Add signatures that generated form `ActiveRecord::Associations::ClassMethods#belongs_to`.
+
+### Orthoses::ActiveRecord::GeneratedAttributeMethods
+
+Add signatures that generated from DB schema columns.
+
+### Orthoses::ActiveRecord::HasMany
+
+Add signatures that generated form `ActiveRecord::Associations::ClassMethods#has_many`.
+
+### Orthoses::ActiveRecord::HasOne
+
+Add signatures that generated form `ActiveRecord::Associations::ClassMethods#has_one`.
+
+### Orthoses::ActiveSupport::ClassAttribute
+
+Add signatures that generated form `Class#class_attribute`.
+
+### Orthoses::ActiveSupport::Concern
+
+Add signature `extend ActiveSupport::Concern` only.
+
+### Orthoses::ActiveSupport::MattrAccessor
+
+Add signatures that generated form `Module#mattr_accessor`, `Module#mattr_reader` and `Module#mattr_writer`.
+
+### Orthoses::ActiveSupport::TimeWithZone
+
+Add signatures `Time` and `ActiveSupport::TimeWithZone`.
+Methods and mixin delegated from `Time` are added to `ActiveSupport::TimeWithZone`.
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/lib/orthoses/active_model/has_secure_password.rb

@@ -13,35 +13,39 @@ module Orthoses
       end
 
       def call
-        target_method = ::ActiveRecord::Base.method(:has_secure_password)
+        target_method = ::ActiveModel::SecurePassword::ClassMethods.instance_method(:has_secure_password)
         call_tracer = Orthoses::CallTracer.new
 
-        result = call_tracer.trace(target_method) do
+        store = call_tracer.trace(target_method) do
           @loader.call
         end
 
         call_tracer.result.each do |method, argument|
-          base = method.receiver.to_s
-          if argument[:attribute].nil? # < 6.0
-            result[base].delete_if { |line| line == "include ActiveModel::SecurePassword::InstanceMethodsOnActivation" }
+          next unless method.receiver.kind_of?(Class)
+          base_name = Utils.module_name(method.receiver)
+          next unless base_name
+
+          attribute = argument[:attribute] || :password
+          full_name = if ::ActiveModel::VERSION::MAJOR < 6
+            "ActiveModel::SecurePassword::InstanceMethodsOnActivation"
           else
-            result[base].delete_if { |line| line.start_with?("include #<InstanceMethodsOnActivation:") }
+            "#{base_name}::ActiveModel_SecurePassword_InstanceMethodsOnActivation_#{attribute}"
           end
-          attribute = argument[:attribute] || :password
-          mod_name = "ActiveModel_SecurePassword_InstanceMethodsOnActivation_#{attribute}"
+
           lines = []
           lines << "attr_reader #{attribute}: String?"
           lines << "def #{attribute}=: (String) -> String"
           lines << "def #{attribute}_confirmation=: (String) -> String"
-          lines << "def authenticate_#{attribute}: (String) -> (#{base} | false)"
+          lines << "def authenticate_#{attribute}: (String) -> (#{base_name} | false)"
           if attribute == :password
             lines << "alias authenticate authenticate_password"
           end
-          result["module #{base}::#{mod_name}"].concat(lines)
-          result[base] << "include #{mod_name}"
+          store[full_name].header = "module #{full_name}"
+          store[full_name].concat(lines)
+          store[base_name] << "include #{full_name}"
         end
 
-        result
+        store
       end
     end
   end

data/lib/orthoses/active_record/belongs_to.rb

@@ -11,6 +11,7 @@ module Orthoses
         @loader.call.tap do |store|
           ::ActiveRecord::Base.descendants.each do |base|
             next if base.abstract_class?
+            base_name = Orthoses::Utils.module_name(base) || next
 
             lines = base.reflect_on_all_associations(:belongs_to).flat_map do |ref|
               # FIXME: Can I get list of class for polymorphic?
@@ -30,11 +31,16 @@ module Orthoses
               end
             end
 
-            generated_association_methods = "#{base}::GeneratedAssociationMethods"
-            store["module #{generated_association_methods}"].concat(lines)
+            generated_association_methods = "#{base_name}::GeneratedAssociationMethods"
 
-            code = "include #{generated_association_methods}"
-            store[base.to_s] << code
+            store[generated_association_methods].tap do |content|
+              content.header = "module #{generated_association_methods}"
+              content.concat(lines)
+            end
+
+            store[base_name].tap do |content|
+              store[base_name] << "include #{generated_association_methods}"
+            end
           end
         end
       end

data/lib/orthoses/active_record/generated_attribute_methods.rb

@@ -12,9 +12,7 @@ module Orthoses
           ::ActiveRecord::Base.descendants.each do |klass|
             next if klass.abstract_class?
 
-            name = klass.to_s
-            generated_attribute_methods = "#{name}::AttributeMethods::GeneratedAttributeMethods"
-            store[name] << "include #{generated_attribute_methods}"
+            name = Utils.module_name(klass) || next
             lines = klass.columns.flat_map do |col|
               req = sql_type_to_rbs(col.type)
               opt = "#{req}?"
@@ -41,7 +39,11 @@ module Orthoses
                 "def clear_#{col.name}_change: () -> void",
               ]
             end
-            store["module #{generated_attribute_methods}"].concat(lines)
+            generated_attribute_methods = "#{name}::AttributeMethods::GeneratedAttributeMethods"
+            store[name] << "include #{generated_attribute_methods}"
+
+            store[generated_attribute_methods].header = "module #{generated_attribute_methods}"
+            store[generated_attribute_methods].concat(lines)
           end
         end
       end

data/lib/orthoses/active_record/has_many.rb

@@ -11,9 +11,9 @@ module Orthoses
         @loader.call.tap do |store|
           ::ActiveRecord::Base.descendants.each do |base|
             next if base.abstract_class?
+            base_name = Utils.module_name(base) || next
 
-            generated_association_methods = "#{base}::GeneratedAssociationMethods"
-            collection_proxy = "#{base}::ActiveRecord_Associations_CollectionProxy"
+            collection_proxy = "#{base_name}::ActiveRecord_Associations_CollectionProxy"
 
             lines = base.reflect_on_all_associations(:has_many).flat_map do |ref|
               singular_name = ref.name.to_s.singularize
@@ -26,10 +26,10 @@ module Orthoses
               ]
             end
 
-            store["module #{generated_association_methods}"].concat(lines)
-
-            code = "include #{generated_association_methods}"
-            store[base.to_s] << code
+            generated_association_methods = "#{base_name}::GeneratedAssociationMethods"
+            store[generated_association_methods].header = "module #{generated_association_methods}"
+            store[generated_association_methods].concat(lines)
+            store[base_name] << "include #{generated_association_methods}"
           end
         end
       end

data/lib/orthoses/active_record/has_one.rb

@@ -11,6 +11,7 @@ module Orthoses
         @loader.call.tap do |store|
           ::ActiveRecord::Base.descendants.each do |base|
             next if base.abstract_class?
+            base_name = Utils.module_name(base) || next
 
             lines = base.reflect_on_all_associations(:has_one).flat_map do |ref|
               type = ref.klass.to_s
@@ -26,11 +27,11 @@ module Orthoses
               ]
             end
 
-            generated_association_methods = "#{base}::GeneratedAssociationMethods"
-            store["module #{generated_association_methods}"].concat(lines)
+            generated_association_methods = "#{base_name}::GeneratedAssociationMethods"
+            store[generated_association_methods].header = "module #{generated_association_methods}"
+            store[generated_association_methods].concat(lines)
 
-            code = "include #{generated_association_methods}"
-            store[base.to_s] << code
+            store[base_name] << "include #{generated_association_methods}"
           end
         end
       end

data/lib/orthoses/active_support/class_attribute.rb

@@ -15,17 +15,19 @@ module Orthoses
       end
 
       def call
-        require 'active_support/core_ext/class/attribute'
         target_method = ::Class.instance_method(:class_attribute)
         call_tracer = Orthoses::CallTracer.new
 
-        result = call_tracer.trace(target_method) do
+        store = call_tracer.trace(target_method) do
           @loader.call
         end
 
         call_tracer.result.each do |method, argument|
+          receiver_name = Orthoses::Utils.module_name(method.receiver)
+          next unless receiver_name
+
           methods = []
-          if ::ActiveSupport.version < Gem::Version.new("6.0")
+          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)
@@ -49,10 +51,10 @@ module Orthoses
           end
           next if methods.empty?
 
-          result[method.receiver.to_s].concat(methods)
+          store[receiver_name].concat(methods)
         end
 
-        result
+        store
       end
     end
   end

data/lib/orthoses/active_support/concern.rb

@@ -9,13 +9,15 @@ module Orthoses
 
       def call
         extended = CallTracer.new
-        result = extended.trace(::ActiveSupport::Concern.method(:extended)) do
+        store = extended.trace(::ActiveSupport::Concern.method(:extended)) do
           @loader.call
         end
         extended.result.each do |method, argument|
-          result[argument[:base].to_s] << "extend ActiveSupport::Concern"
+          base_name = Orthoses::Utils.module_name(argument[:base])
+          next unless base_name
+          store[argument[:base].to_s] << "extend ActiveSupport::Concern"
         end
-        result
+        store
       end
     end
   end

data/lib/orthoses/active_support/mattr_accessor.rb

@@ -16,15 +16,14 @@ module Orthoses
         mattr_reader = Orthoses::CallTracer.new
         mattr_writer = Orthoses::CallTracer.new
 
-        require 'active_support/core_ext/module/attribute_accessors.rb'
-        result = mattr_reader.trace(::Module.instance_method(:mattr_reader)) do
+        store = mattr_reader.trace(::Module.instance_method(:mattr_reader)) do
           mattr_writer.trace(::Module.instance_method(:mattr_writer)) do
             @loader.call
           end
         end
 
         mattr_reader.result.each do |method, argument|
-          base = method.receiver.to_s
+          base = Orthoses::Utils.module_name(method.receiver) || next
           methods = []
           argument[:syms].each do |sym|
             next unless @if.nil? || @if.call(method, sym)
@@ -36,11 +35,11 @@ module Orthoses
           end
           next if methods.empty?
 
-          result[base].concat(methods)
+          store[base].concat(methods)
         end
 
         mattr_writer.result.each do |method, argument|
-          base = method.receiver.to_s
+          base = Orthoses::Utils.module_name(method.receiver) || next
           methods = []
           argument[:syms].each do |sym|
             next unless @if.nil? || @if.call(method, sym)
@@ -52,10 +51,10 @@ module Orthoses
           end
           next if methods.empty?
 
-          result[base].concat(methods)
+          store[base].concat(methods)
         end
 
-        result
+        store
       end
     end
   end

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/orthoses-rails.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["ksss"]
   spec.email = ["co000ri@gmail.com"]
 
-  spec.summary = "Orthoses  middleware collection for Ruby on Rails"
+  spec.summary = "Orthoses middleware collection for Ruby on Rails"
   spec.description = "Orthoses middleware collection for Ruby on Rails"
   spec.homepage = "https://github.com/ksss/orthoses-rails"
   spec.license = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Orthoses  middleware collection for Ruby on Rails
+summary: Orthoses middleware collection for Ruby on Rails
 test_files: []