rbs_draper 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6df474118e1aa1523fc02aa5fd55e15d4c329ce9503147e2f252b69dc3656e
-  data.tar.gz: 78da07e88141b84609208766a4b270548da02964b313d2d462529c5afae9441a
+  metadata.gz: 7d2bfcf84e0f5af5a65871e40710100241df8232a871e7794f3f52be4637f41a
+  data.tar.gz: 3402cdab07e8e6b782c8230108232dfc60f3ab3b719ba3f160b9158c32237f49
 SHA512:
-  metadata.gz: e1774f4eebbc89a4092d0c3b1e38e53886a1740d5bb6ac275f31ed48db0c28e1847746ce22080844d18c96b6173d2355dc87a60267abef9020d25d29c1346d0f
-  data.tar.gz: 68837472313ad5112d16741a02048dd8484d38b7a10c0aaabcdf437289f521a9834bbe4b207d67021b6a7884b9d9fd1e841d449565e51a7390c4912a49c391b4
+  metadata.gz: 236ba1a705da99b87bbeb5bf3eab2df035cf1701a390fb3b70db428529e052613b75123ccde23f06b1c40056443cc7043defa06c58ff32621aba59d7e54b3aab
+  data.tar.gz: 5ed785300e261837ab808217eeca0a0a438cbd3d07b2bd8c3dc70632b56ff53e7f0db552745e76d5f93e88e907e4e3fddbc20fc22f393d56ad00403118f6751b

data/.rubocop.yml

@@ -18,3 +18,6 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
+
+Metrics/MethodLength:
+  Max: 20

data/.vscode/extensions.json

@@ -2,6 +2,7 @@
     "recommendations": [
         "shopify.ruby-lsp",
         "soutaro.steep-vscode",
-        "tk0miya.rspec-daemon"
+        "tk0miya.rspec-daemon",
+        "tk0miya.rbs-helper"
     ]
 }

data/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "[ruby]": {
         "editor.defaultFormatter": "Shopify.ruby-lsp"
-    }
+    },
+    "rbs-helper.signature-directory": "sig"
 }

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "rubocop", "~> 1.21"
+gem "rubocop", "~> 1.52"
 
 group :development do
   gem "rspec", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_draper (0.1.0)
+    rbs_draper (0.1.2)
       draper
       rbs_rails
 
@@ -76,7 +76,7 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.0)
+    racc (1.7.1)
     rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -122,10 +122,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.52.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -172,7 +172,7 @@ DEPENDENCIES
   rbs_draper!
   rspec
   rspec-daemon
-  rubocop (~> 1.21)
+  rubocop (~> 1.52)
   steep
 
 BUNDLED WITH

data/lib/rbs_draper/decoratable.rb

@@ -18,10 +18,11 @@ module RbsDraper
     end
 
     class Generator
-      attr_reader :klass
+      attr_reader :klass, :klass_name
 
       def initialize(klass)
         @klass = klass
+        @klass_name = RbsRails::Util.module_name(klass)
       end
 
       def generate
@@ -39,16 +40,23 @@ module RbsDraper
       end
 
       def header
-        module_defs = module_names.map { |module_name| "module #{module_name}" }
+        namespace = +""
+        klass_name.split("::").map do |mod_name|
+          namespace += "::#{mod_name}"
+          mod_object = Object.const_get(namespace)
+          case mod_object
+          when Class
+            # @type var superclass: Class
+            superclass = _ = mod_object.superclass
+            superclass_name = RbsRails::Util.module_name(superclass)
 
-        class_name = klass.name.split("::").last
-        class_def = if klass.superclass
-                      "class #{class_name} < #{klass.superclass}"
-                    else
-                      "class #{class_name}"
-                    end
-
-        (module_defs + [class_def]).join("\n")
+            "class #{mod_name} < ::#{superclass_name}"
+          when Module
+            "module #{mod_name}"
+          else
+            raise "unreachable"
+          end
+        end.join("\n")
       end
 
       def method_decls

data/lib/rbs_draper/decorator.rb

@@ -11,10 +11,11 @@ module RbsDraper
     end
 
     class Generator
-      attr_reader :klass, :rbs_builder
+      attr_reader :klass, :klass_name, :rbs_builder
 
       def initialize(klass, rbs_builder)
         @klass = klass
+        @klass_name = RbsRails::Util.module_name(klass)
         @rbs_builder = rbs_builder
       end
 
@@ -37,16 +38,23 @@ module RbsDraper
       end
 
       def header
-        module_defs = module_names.map { |module_name| "module #{module_name}" }
-
-        class_name = klass.name.split("::").last
-        class_def = if klass.superclass
-                      "class #{class_name} < #{klass.superclass.name}"
-                    else
-                      "class #{class_name}"
-                    end
-
-        (module_defs + [class_def]).join("\n")
+        namespace = +""
+        klass_name.split("::").map do |mod_name|
+          namespace += "::#{mod_name}"
+          mod_object = Object.const_get(namespace)
+          case mod_object
+          when Class
+            # @type var superclass: Class
+            superclass = _ = mod_object.superclass
+            superclass_name = RbsRails::Util.module_name(superclass)
+
+            "class #{mod_name} < ::#{superclass_name}"
+          when Module
+            "module #{mod_name}"
+          else
+            raise "unreachable"
+          end
+        end.join("\n")
       end
 
       def method_decls

data/lib/rbs_draper/version.rb

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

data/sig/rbs_draper/decoratable.rbs

@@ -5,6 +5,7 @@ module RbsDraper
 
     class Generator
       attr_reader klass: Class
+      attr_reader klass_name: String
 
       def initialize: (Class klass) -> void
       def generate: () -> String

data/sig/rbs_draper/decorator.rbs

@@ -4,6 +4,7 @@ module RbsDraper
 
     class Generator
       attr_reader klass: Class
+      attr_reader klass_name: String
       attr_reader rbs_builder: RBS::DefinitionBuilder
 
       @decorated_class: RBS::Definition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_draper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-11 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: draper