rbs_devise 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08dd691a8f038f811f0fa85d1e99a38a4be3729d60df0dc78cd7455aec78ece2'
-  data.tar.gz: fa226445dcf0f97cde9598499b17bef02509bb77c0bb3780aa71a834d069bee6
+  metadata.gz: 3879b95db460f238ea805b89aec709db6433e67587be58572294612fdfe56337
+  data.tar.gz: 529bc991ab6349cb235919e68fb5ae0fbace74776a359c238ac352e4a938fe16
 SHA512:
-  metadata.gz: 40198fea0e5ec6605ef1e4d95aab2a55cda76988dea498a6f589791ac061da9f14790730beba28727be82655223bc50c7f195f5234a1094ee038bfe10fa8bb30
-  data.tar.gz: 7b9e361dd480bd18d0c29c6540d67822279448fcd3510a040bb159384c25d9641a43164fecfbbeba1145d235c1153e4fde659e95d4fcfb45c35f93689f670647
+  metadata.gz: 0c44228c2bb3e41967b9f5fda159ebf6d8ddcaa90f0f480d75ed809ac329e48e923ef5674cbd6c152c0b3980ab21728f20eddf12140066ca8e37cb4c30073ed7
+  data.tar.gz: fd5f7aba1e09a1c3c673d9182e85ee17782fdbfa891c764096d9b4e12418d8d603e4fb3122327a6cad00a23babe46b9571e268ea9a7ad9d82f80a05e4f982ea2

data/lib/generators/rbs_devise/install_generator.rb

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

data/lib/rbs_devise/devise.rb

@@ -2,7 +2,6 @@
 
 require "devise"
 require "rbs"
-require "rbs_rails"
 
 module  RbsDevise
   module Devise
@@ -18,24 +17,29 @@ module  RbsDevise
 
     class Generator
       def generate
-        RbsRails::Util.format_rbs klass_decl
-      end
-
-      private
-
-      def klass_decl
-        <<~RBS
+        format <<~RBS
           module Devise
             #{devise_controllers_signinout_decl}
             #{device_helpers_decl}
+            #{device_models_decl}
             #{devise_sessions_controller_decl}
           end
 
           #{devise_controller_decl}
           #{actioncontroller_base_decl}
+          #{activerecord_base_decl}
         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 devise_controllers_signinout_decl
         resource_type = resource_classes.join(" | ")
         <<~RBS
@@ -75,6 +79,14 @@ module  RbsDevise
         end.join("\n")
       end
 
+      def device_models_decl
+        <<~RBS
+          module Models
+            def devise: (*Symbol) -> void
+          end
+        RBS
+      end
+
       def devise_sessions_controller_decl
         <<~RBS
           class SessionsController < DeviseController
@@ -104,6 +116,14 @@ module  RbsDevise
         RBS
       end
 
+      def activerecord_base_decl
+        <<~RBS
+          class ActiveRecord::Base
+            include Devise::Models
+          end
+        RBS
+      end
+
       def parent_controller
         ::Devise.parent_controller
       end

data/lib/rbs_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsDevise
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 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,6 +171,10 @@ gems:
     revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: pathname
+  version: '0'
+  source:
+    type: stdlib
 - name: rack
   version: '2.2'
   source:

data/rbs_collection.yaml

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

data/rbs_devise.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "devise"
   spec.add_dependency "rails"
-  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_devise/devise.rbs

@@ -8,13 +8,15 @@ module  RbsDevise
 
       private
 
-      def klass_decl: () -> String
-      def sessions_controller_decl: () -> String
+      def format: (String rbs) -> String
       def devise_controllers_signinout_decl: () -> String
       def device_helpers_decl: () -> String
       def device_helpers_methods: () -> String
+      def device_models_decl: () -> String
       def devise_controller_decl: () -> String
+      def devise_sessions_controller_decl: () -> String
       def actioncontroller_base_decl: () -> String
+      def activerecord_base_decl: () -> String
       def parent_controller: () -> String
       def resource_classes: () -> Array[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_devise
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -38,20 +38,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 discard gem
 email:
 - i.tkomiya@gmail.com
@@ -81,6 +67,7 @@ files:
 - sig/rbs_devise/devise.rbs
 - sig/rbs_devise/rake_task.rbs
 - sig/shims/rake.rbs
+- sig/shims/thor.rbs
 homepage: https://github.com/tk0miya/rbs_devise
 licenses:
 - MIT