rbs_discard 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc5d14581a5b5fb41056a46d728cf48eab3e00f9676dac56a30babd780390c2
-  data.tar.gz: 90474ed72c5f2a5f35329f7b8109f947e5365a9a4370c790ec3b5e349f9d0ab4
+  metadata.gz: 7487ba958cc9bb1f8dbe5cdc7c574858497f86e413a1581fc757663dd0139958
+  data.tar.gz: 9709aec5f69db36c2f1029e36cfa1b2fbeb12dea5fbe2caa877ccf5c43682543
 SHA512:
-  metadata.gz: a28c5d18e7b896db467807782fce14e83b19a81f0f49b7f224765fa99eaea96af5b446e41ca98c3dd8bfd638706e6a7222cf29ec0fbaa4281c8b0d93632cffd5
-  data.tar.gz: c8c8767266fa7be7da5d53cb78554dbe339d4db9d19da69e598586dba76c9a56311f4bce55e677c39d96932761cb2a6de5ad84102651225756061f61fe78c8b6
+  metadata.gz: ae83684d280146625a7f62d61e235221780bc873d253580f5cdffced0bb57b29a6d950ed5c208abbd2867775d0ed45a3b7248a0d8ce4659bffee9f964a7c94f3
+  data.tar.gz: ff2467e246fd48a46ec033cec33c38d1daaa9deb5b7f1d4978a4df87b9b398b76ebf92fcdd3dd02e5ce4a84ec05a5e914a406a7d09dd2bba9bfdc9008f5ed93a

data/.rubocop.yml

@@ -21,3 +21,6 @@ Layout/LineLength:
 
 Layout/MethodLength:
   Max: 20
+
+Metrics/AbcSize:
+  Max: 20

data/lib/generators/rbs_discard/install_generator.rb

@@ -6,8 +6,11 @@ module RbsDiscard
   class InstallGenerator < ::Rails::Generators::Base
     def create_raketask
       create_file "lib/tasks/rbs_discard.rake", <<~RUBY
+        # frozen_string_literal: true
+
         begin
           require "rbs_discard/rake_task"
+
           RbsDiscard::RakeTask.new
         rescue LoadError
           # failed to load rbs_discard. Skip to load rbs_discard tasks.

data/lib/rbs_discard/discard.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rbs"
-require "rbs_rails"
 
 module RbsDiscard
   module Discard
@@ -22,17 +21,11 @@ module RbsDiscard
 
       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}
             class ActiveRecord_Relation
               include Discard::Model::Relation
@@ -51,6 +44,15 @@ module RbsDiscard
         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|
@@ -60,7 +62,7 @@ module RbsDiscard
           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_discard/rake_task.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "activesupport"
 require "pathname"
 require "rake/tasklib"
 
@@ -46,7 +47,7 @@ module RbsDiscard
 
         RbsDiscard::Discard.all.each do |klass|
           rbs = RbsDiscard::Discard.class_to_rbs(klass)
-          path = signature_root_dir / "app/models/#{klass.name.underscore}.rbs"
+          path = signature_root_dir / "app/models/#{klass.name.to_s.underscore}.rbs"
           path.dirname.mkpath
           path.write(rbs)
         end

data/lib/rbs_discard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsDiscard
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/rbs_collection.lock.yaml

@@ -2,15 +2,43 @@
 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"
 gems:
-- name: abbrev
-  version: '0'
+- name: actionmailer
+  version: '7.0'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: actionpack
+  version: '6.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: actionview
+  version: '6.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: activejob
+  version: '6.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: activemodel
   version: '7.0'
   source:
@@ -27,6 +55,14 @@ gems:
     revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: activestorage
+  version: '6.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: activesupport
   version: '7.0'
   source:
@@ -47,6 +83,10 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: cgi
+  version: '0'
+  source:
+    type: stdlib
 - name: concurrent-ruby
   version: '1.1'
   source:
@@ -59,6 +99,18 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: fileutils
+  version: '0'
+  source:
+    type: stdlib
+- name: globalid
+  version: '1.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: i18n
   version: '1.10'
   source:
@@ -75,6 +127,14 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: mail
+  version: '2.8'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: minitest
   version: '0'
   source:
@@ -87,10 +147,14 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: optparse
-  version: '0'
+- name: nokogiri
+  version: '1.11'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: parallel
   version: '1.20'
   source:
@@ -103,6 +167,30 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: rack
+  version: '2.2'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rails-dom-testing
+  version: '2.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: railties
+  version: '6.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: rainbow
   version: '3.0'
   source:
@@ -111,23 +199,15 @@ gems:
     revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: rbs
-  version: 3.2.0
-  source:
-    type: rubygems
-- name: rbs_rails
-  version: 0.12.0
-  source:
-    type: rubygems
-- name: rdoc
+- name: securerandom
   version: '0'
   source:
     type: stdlib
-- name: securerandom
+- name: singleton
   version: '0'
   source:
     type: stdlib
-- name: singleton
+- name: tempfile
   version: '0'
   source:
     type: stdlib
@@ -135,8 +215,16 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: timeout
+  version: '0'
+  source:
+    type: stdlib
 - name: tsort
   version: '0'
   source:
     type: stdlib
+- name: uri
+  version: '0'
+  source:
+    type: stdlib
 gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -16,3 +16,6 @@ path: .gem_rbs_collection
 gems:
   # Skip loading rbs gem's RBS.
   # It's unnecessary if you don't use rbs as a library.
+
+  - name: fileutils
+  - name: pathname

data/rbs_discard.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "discard"
-  spec.add_dependency "rbs_rails"
+  spec.add_dependency "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_discard/discard.rbs

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

data/sig/shims/thor.rbs

@@ -0,0 +1,5 @@
+class Thor
+  module Actions
+    def create_file: (String destination, *String? args, ?config: bool) ?{ () -> void } -> untyped
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_discard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discard
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbs_rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,6 +68,7 @@ files:
 - sig/rbs_discard/rake_task.rbs
 - sig/shims/discard.rbs
 - sig/shims/rake.rbs
+- sig/shims/thor.rbs
 homepage: https://github.com/tk0miya/rbs_discard
 licenses:
 - MIT