rbs_draper 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4264323a47d34195f99e7e52dfed772f191d1c1b6ff2b67aea3ae8bebcc2c207
-  data.tar.gz: 884b7eb9869e61ab465d63ac2f5878226491bbd40b7612a6bf9dae071d1a16c2
+  metadata.gz: 78fc355f126b6fad89da00fd5a6f33a67fb0de4b7242f57a49826d3bad1f6246
+  data.tar.gz: c4d636fc57de09959c81ad783bd567f5ca5e4b56f46fd0ab5442d7d65c9f3154
 SHA512:
-  metadata.gz: b4489ad1ad8ae877970dfae0d89ae95466aa5796cedb4fa0b9af95be5fed7fc0096b6ca0266c0d1e0ef660ed80394865c19f44f7f74f338919d52a99af60e4ac
-  data.tar.gz: 9130a8eaa678d68be89334e8927c06f9d18a6356fb85cbf3fcd237eace146a3a4326a3b07792978f833988fd555542af307b486d1caf99c022c91a709ed7491e
+  metadata.gz: 9cf067be8404f7a8842738994ae3971875a9542d0c2784cf3e0ecf9c33bf113298d457a67372d1131f899466c1a566838fe92063071db8808cbed99d755d4000
+  data.tar.gz: d684fb48ed0a3be6bc23ceb4ff4760c01ebfe3e2a6e16f8bc78cbeb65c01f4e7f10926e8bf8abd12ba3c253fe505fa52a2d06e87be0445b4f221fd3ef9150949

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    rbs_draper (1.1.0)
+    rbs_draper (1.1.2)
       activesupport
       draper
       fileutils
       rbs
-      rbs_rails
 
 GEM
   remote: https://rubygems.org/
@@ -104,9 +103,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (3.1.3)
-    rbs_rails (0.12.0)
-      parser
-      rbs (>= 1)
     regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -127,7 +123,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.56.1)
+    rubocop (1.56.2)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

data/README.md

@@ -18,7 +18,7 @@ If you have decorators having different names from models, you can specify the m
 decorator names to model names in `lib/tasks/rbs_draper.rake`. For example:
 
     RbsDraper::RakeTask.new do |task|
-      task.mapping = -> { { AdminUserDecorator: User } }
+      task.mapping = -> { { AdminUserDecorator => User } }
     end
 
 ## Usage

data/lib/generators/rbs_draper/install_generator.rb

@@ -7,13 +7,15 @@ module RbsDraper
     def create_raketask
       create_file "lib/tasks/rbs_draper.rake", <<~RUBY
         begin
-          require 'rbs_draper/rake_task'
+          # frozen_string_literal: true
+
+          require "rbs_draper/rake_task"
 
           RbsDraper::RakeTask.new do |task|
             # If you have decorators having different names from models, you can specify the mapping from decorator names to model names.
             # The value should be a lambda that returns a hash to load decorators and models easily.
             #
-            # task.mapping = -> { { AdminUserDecorator: User } }
+            # task.mapping = -> { { AdminUserDecorator => User } }
           end
         rescue LoadError
           # failed to load rbs_draper. Skip to load rbs_draper tasks.

data/lib/rbs_draper/decoratable.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "draper"
-require "rbs_rails"
 
 module RbsDraper
   module Decoratable
@@ -22,23 +21,26 @@ module RbsDraper
 
       def initialize(klass)
         @klass = klass
-        @klass_name = RbsRails::Util.module_name(klass)
+        @klass_name = klass.name || ""
       end
 
       def generate
-        RbsRails::Util.format_rbs klass_decl
-      end
-
-      private
-
-      def klass_decl
-        <<~RBS
+        format <<~RBS
           #{header}
           #{method_decls}
           #{footer}
         RBS
       end
 
+      private
+
+      def format(rbs)
+        parsed = RBS::Parser.parse_signature(rbs)
+        StringIO.new.tap do |out|
+          RBS::Writer.new(out: out).write(parsed[1] + parsed[2])
+        end.string
+      end
+
       def header
         namespace = +""
         klass_name.split("::").map do |mod_name|
@@ -48,7 +50,7 @@ module RbsDraper
           when Class
             # @type var superclass: Class
             superclass = _ = mod_object.superclass
-            superclass_name = RbsRails::Util.module_name(superclass)
+            superclass_name = superclass.name || "Object"
 
             "class #{mod_name} < ::#{superclass_name}"
           when Module

data/lib/rbs_draper/decorator.rb

@@ -2,7 +2,6 @@
 
 require "draper"
 require "rbs"
-require "rbs_rails"
 
 module RbsDraper
   module Decorator
@@ -15,7 +14,7 @@ module RbsDraper
 
       def initialize(klass, rbs_builder, decorated_class: nil)
         @klass = klass
-        @klass_name = RbsRails::Util.module_name(klass)
+        @klass_name = klass.name || ""
         @rbs_builder = rbs_builder
         @decorated_class = decorated_class
       end
@@ -23,13 +22,7 @@ module RbsDraper
       def generate
         return if decorated_class_def.blank?
 
-        RbsRails::Util.format_rbs klass_decl
-      end
-
-      private
-
-      def klass_decl
-        <<~RBS
+        format <<~RBS
           #{header}
           #{object_method_decls}
 
@@ -38,6 +31,15 @@ module RbsDraper
         RBS
       end
 
+      private
+
+      def format(rbs)
+        parsed = RBS::Parser.parse_signature(rbs)
+        StringIO.new.tap do |out|
+          RBS::Writer.new(out: out).write(parsed[1] + parsed[2])
+        end.string
+      end
+
       def header
         namespace = +""
         klass_name.split("::").map do |mod_name|
@@ -47,7 +49,7 @@ module RbsDraper
           when Class
             # @type var superclass: Class
             superclass = _ = mod_object.superclass
-            superclass_name = RbsRails::Util.module_name(superclass)
+            superclass_name = superclass.name || "Object"
 
             "class #{mod_name} < ::#{superclass_name}"
           when Module

data/lib/rbs_draper/version.rb

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

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+  revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
@@ -171,10 +171,6 @@ gems:
   version: 3.1.3
   source:
     type: rubygems
-- name: rbs_rails
-  version: 0.12.0
-  source:
-    type: rubygems
 - name: rdoc
   version: '0'
   source:

data/rbs_draper.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "draper"
   spec.add_dependency "fileutils"
   spec.add_dependency "rbs"
-  spec.add_dependency "rbs_rails"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/sig/rbs_draper/decoratable.rbs

@@ -12,7 +12,7 @@ module RbsDraper
 
       private
 
-      def klass_decl: () -> String
+      def format: (String rbs) -> String
       def header: () -> String
       def method_decls: () -> String
       def footer: () -> String

data/sig/rbs_draper/decorator.rbs

@@ -16,7 +16,7 @@ module RbsDraper
 
       private
 
-      def klass_decl: () -> String
+      def format: (String rbs) -> String
       def header: () -> String
       def object_method_decls: () -> String
       def method_decls: () -> String?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs_draper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Takeshi KOMIYA
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbs_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A RBS files generator for Draper decorators
 email:
 - i.tkomiya@gmail.com