rbs_draper 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e80ca97ef57836af3ef885d059d9e1d1a2a9d6ba4dab80adf6d30f01556f9c
-  data.tar.gz: 5926448a80b1f772f38044e562779ffda88c1336f262456df6d6d63b0be32453
+  metadata.gz: 1a1efc1d2112225133b3b99db9a211b5c81263b405a82d3b8a5220ccc27d576d
+  data.tar.gz: bcbce1a9c58ded2d80a2249b011cfe4156d195095290beeb9126f7696a8df6e1
 SHA512:
-  metadata.gz: b3375123ce9db9a5fa0815f390b4212cdfbdc60496223fa3797a5f0d2bd087230a44e4cbe980e963f7d3741c49351bf0a69c20847d0d049c26f6087cbdd87f4f
-  data.tar.gz: 2a8d79b1e174b7dec3e818c65acf2e9005fbdf5e3a6096a22b4b5fffdb00fa5626c306d7ed40526ff900cdb27b790e2eedbee2eb6753fc913f76393faaa73c0b
+  metadata.gz: ec2ab3d52271357bc59ef8e20830828335a9432f89537d77174448e3b4bc2d59ae542b33dd30d727dfb9015a438342f1089dcfc33bdbe2861566cca406e520a8
+  data.tar.gz: 90d77c75e649270d7fcf5e0f4c4ab553e961dcc98b51381be4729267c2d933a8ce694b16b74258d99628cbf871fe87e47e03bdcc3e4f803ba352713c87f78b46

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_draper (1.2.0)
+    rbs_draper (1.3.0)
       activesupport
       draper
       fileutils
@@ -123,7 +123,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.56.2)
+    rubocop (1.56.3)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

data/lib/rbs_draper/decorator.rb

@@ -24,6 +24,8 @@ module RbsDraper
 
         format <<~RBS
           #{header}
+          #{mixin_decls}
+          #{class_method_decls}
           #{object_method_decls}
 
           #{method_decls}
@@ -60,14 +62,25 @@ module RbsDraper
         end.join("\n")
       end
 
+      def mixin_decls
+        "extend Draper::Finders[#{decorated_class_name}]" if klass.singleton_class < Draper::Finders
+      end
+
+      def class_method_decls
+        "def self.decorate: (#{decorated_class_name} object, **untyped options) -> self"
+      end
+
       def object_method_decls
-        object_name = decorated_class&.name || klass.name.to_s.sub(/Decorator$/, "")
-        if object_name.include?("::")
-          "def object: () -> #{object_name}"
+        if decorated_class_name.include?("::")
+          <<~RBS
+            def initialize: (#{decorated_class_name} object, **untyped options) -> void
+            def object: () -> #{decorated_class_name}
+          RBS
         else
           <<~RBS
-            def object: () -> #{object_name}
-            def #{object_name.underscore}: () -> #{object_name}
+            def initialize: (#{decorated_class_name} object, **untyped options) -> void
+            def object: () -> #{decorated_class_name}
+            def #{decorated_class_name.underscore}: () -> #{decorated_class_name}
           RBS
         end
       end
@@ -91,13 +104,16 @@ module RbsDraper
       end
 
       def decorated_class_def
-        class_name = decorated_class&.name || klass.name.to_s.sub(/Decorator$/, "")
-        type_name = RBS::TypeName(class_name).absolute!
+        type_name = RBS::TypeName(decorated_class_name).absolute!
         @decorated_class_def ||= rbs_builder.build_instance(type_name)
       rescue StandardError
         nil
       end
 
+      def decorated_class_name
+        @decorated_class_name = decorated_class&.name || klass.object_class.name.to_s
+      end
+
       def delegated_methods
         return [] unless klass.ancestors.include? ::Draper::AutomaticDelegation
 

data/lib/rbs_draper/sig/decorator.rbs

@@ -5,10 +5,20 @@ module Draper
 
     def self.delegate_all: () -> void
     def self.decorates_association: (Symbol association, **untyped options) -> void
+    def self.decorates_finders: () -> void
+    def self.object_class: () -> singleton(Class)
+    def self.object_class?: () -> bool
     def decorated?: () -> bool
     def decorated_with?: (untyped decorator_class) -> bool
   end
 
+  module Finders[T]
+    def find: (untyped id, **untyped options) -> T
+    def all: (**untyped options) -> untyped
+    def first: (**untyped options) -> T
+    def last: (**untyped options) -> T
+  end
+
   class HelperProxy
     # Note: HelperProxy behaves like ActiveView::Base via method_missing.
     #       To support it, this type includes the sub-modules of ActiveView instead of method_missing.

data/lib/rbs_draper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsDraper
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/sig/rbs_draper/decorator.rbs

@@ -9,6 +9,7 @@ module RbsDraper
       attr_reader decorated_class: singleton(Class)?
 
       @decorated_class_def: RBS::Definition
+      @decorated_class_name: String
       @user_defined_class: RBS::Definition
 
       def initialize: (singleton(Draper::Decorator) klass, RBS::DefinitionBuilder rbs_builder, ?decorated_class: singleton(Class)?) -> void
@@ -18,10 +19,13 @@ module RbsDraper
 
       def format: (String rbs) -> String
       def header: () -> String
+      def mixin_decls: () -> String?
+      def class_method_decls: () -> String?
       def object_method_decls: () -> String
       def method_decls: () -> String?
       def footer: () -> String
       def module_names: () -> Array[String]
+      def decorated_class_name: () -> String
       def decorated_class_def: () -> RBS::Definition?
       def delegated_methods: () -> Array[[Symbol, RBS::Definition::Method]]
       def user_defined_class: () -> RBS::Definition?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_draper
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport