rbs_rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82919f7e04d613a702ad6cadbff8df905f23b54bf7dbdae04122a5af5df09608
-  data.tar.gz: 7070d476fe7f15776eed7fa406c423f18ba54077b4293ccb6064c151c7a89754
+  metadata.gz: 34709bd1892db293d9371b2574c97f5144d97f8b2de661072d7f65fb0616f971
+  data.tar.gz: 68f8207b59c550a6f5e6485ee322c38141154b47026c4d50c6bfe3cee9270494
 SHA512:
-  metadata.gz: 92c046d0f404ff63fe86b3fab5bd92dd24731919827c5ee04330cecf26ae158608e4b0babc1097977ef5cddcbd9474983621d188b996cf264cb96a65142adf95
-  data.tar.gz: 947c7022e0e49010cdc0fbce0bd453993f3ba0bc3df1fb5d406bce94361c49f8d61044b95ba9fed901e6635a9476b4c699812f2334e5e36552552138baada338
+  metadata.gz: 01d91fa0f2aaeed8dd4614ec59f5604b125684ed63325f6edbb30c29db62e2ae60cffd450a28b0ef5ec44f32570bb1a25fdbb70230060def0a4ee73fb714ab0f
+  data.tar.gz: 535c957a38bc5644be6e83ccf1bf439a1830110a3355b4dfd4b84453f42d5975a506d85166ac53230d62af207765e1c4cab2f3de0b7564c97c084188e7726304

data/.gitattributes

@@ -0,0 +1 @@
+gem_rbs/gems/* linguist-generated=true

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master (unreleased)
 
+## 0.8.0 (2020-12-31)
+
+* **[BREAKING]** Move RBS files that are copied by `rbs_rails:copy_signature_files` task to [ruby/gem_rbs](https://github.com/ruby/gem_rbs) repository [#90](https://github.com/pocke/rbs_rails/pull/90)
+* Allow all kinds of argument for scope [#89](https://github.com/pocke/rbs_rails/pull/89)
+
 ## 0.7.0 (2020-12-28)
 
 * **[BREAKING]** Re-structure signature directory. [#86](https://github.com/pocke/rbs_rails/pull/86)

data/README.md

@@ -28,9 +28,8 @@ require 'rbs_rails/rake_task'
 RbsRails::RakeTask.new
 ```
 
-Then, the following four tasks are available.
+Then, the following three tasks are available.
 
-* `rbs_rails:copy_signature_files`: Copy RBS files for rbs_rails
 * `rbs_rails:generate_rbs_for_models`: Generate RBS files for Active Record models
 * `rbs_rails:generate_rbs_for_path_helpers`: Generate RBS files for path helpers
 * `rbs_rails:all`: Execute all tasks of RBS Rails
@@ -56,6 +55,9 @@ target :app do
   library 'logger'
   library 'mutex_m'
   library 'date'
+  library 'monitor'
+  library 'singleton'
+  library 'tsort'
 
   library 'activesupport'
   library 'actionpack'

data/Steepfile

@@ -9,6 +9,9 @@ target :lib do
   library "logger"
   library "mutex_m"
   library "date"
+  library 'monitor'
+  library 'singleton'
+  library 'tsort'
 
   library 'activesupport'
   library 'actionpack'

data/bin/add-type-params.rb

@@ -16,6 +16,7 @@ end
 def env
   @env ||= begin
     loader = RBS::EnvironmentLoader.new()
+    loader.add(library: 'tsort')
     RBS::Environment.from_loader(loader).resolve_type_names
   end
 end

data/bin/gem_rbs

@@ -45,7 +45,7 @@ class QueryBuilder
   end
 
   def query
-    # TODO: variable type
+    # TODO: Allow non-String type for variables
     "query(#{variables.keys.map { |v| "$#{v}: String!" }.join(',')}) { #{@queries.join("\n")} }"
   end
 end

data/bin/rbs

@@ -18,7 +18,7 @@ end
 exec(
   'rbs',
   # Require stdlibs
-  '-rlogger', '-rpathname', '-rmutex_m', '-rdate',
+  '-rlogger', '-rpathname', '-rmutex_m', '-rdate', '-rmonitor', '-rsingleton', '-rtsort',
   "--repo=#{repo}",
   # Require Rails libraries
   v('-ractivesupport'), v('-ractionpack'), v('-ractivejob'), v('-ractivemodel'), v('-ractionview'), v('-ractiverecord'), v('-rrailties'),

data/lib/rbs_rails/active_record.rb

@@ -233,28 +233,36 @@ module RbsRails
           next unless body_node.type == :block
 
           args = args_to_type(body_node.children[1])
-          "def #{singleton ? 'self.' : ''}#{name}: (#{args}) -> #{relation_class_name}"
+          "def #{singleton ? 'self.' : ''}#{name}: #{args} -> #{relation_class_name}"
         end.compact.join("\n")
       end
 
       private def args_to_type(args_node)
         # @type var res: Array[String]
         res = []
+        # @type var block: String?
+        block = nil
         args_node.children.each do |node|
           case node.type
           when :arg
-            res << "untyped"
+            res << "untyped #{node.children[0]}"
           when :optarg
-            res << "?untyped"
+            res << "?untyped #{node.children[0]}"
           when :kwarg
             res << "#{node.children[0]}: untyped"
           when :kwoptarg
             res << "?#{node.children[0]}: untyped"
+          when :restarg
+            res << "*untyped #{node.children[0]}"
+          when :kwrestarg
+            res << "**untyped #{node.children[0]}"
+          when :blockarg
+            block = " { (*untyped) -> untyped }"
           else
             raise "unexpected: #{node}"
           end
         end
-        res.join(", ")
+        "(#{res.join(", ")})#{block}"
       end
 
       private def parse_model_file

data/lib/rbs_rails/rake_task.rb

@@ -14,7 +14,6 @@ module RbsRails
 
       setup_signature_root_dir!
 
-      def_copy_signature_files
       def_generate_rbs_for_models
       def_generate_rbs_for_path_helpers
       def_all
@@ -23,19 +22,10 @@ module RbsRails
     def def_all
       desc 'Run all tasks of rbs_rails'
 
-      deps = [:"#{name}:copy_signature_files", :"#{name}:generate_rbs_for_models", :"#{name}:generate_rbs_for_path_helpers"]
+      deps = [:"#{name}:generate_rbs_for_models", :"#{name}:generate_rbs_for_path_helpers"]
       task("#{name}:all": deps)
     end
 
-    def def_copy_signature_files
-      desc 'Copy RBS files for rbs_rails'
-      task("#{name}:copy_signature_files": :environment) do
-        require 'rbs_rails'
-
-        RbsRails.copy_signatures(to: signature_root_dir)
-      end
-    end
-
     def def_generate_rbs_for_models
       desc 'Generate RBS files for Active Record models'
       task("#{name}:generate_rbs_for_models": :environment) do

data/lib/rbs_rails/version.rb

@@ -2,5 +2,5 @@ module RbsRails
   # Because of copy_signatures is defined by lib/rbs_rails.rb
   # @dynamic self.copy_signatures
 
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/rbs_rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata["changelog_uri"] = "https://github.com/pocke/rbs_rails/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
@@ -54,30 +55,6 @@ files:
 - README.md
 - Rakefile
 - Steepfile
-- assets/sig/action_mailer.rbs
-- assets/sig/builtin.rbs
-- assets/sig/capybara.rbs
-- assets/sig/concurrent.rbs
-- assets/sig/erb.rbs
-- assets/sig/erubi.rbs
-- assets/sig/i18n.rbs
-- assets/sig/libxml.rbs
-- assets/sig/minitest.rbs
-- assets/sig/nokogiri.rbs
-- assets/sig/pg.rbs
-- assets/sig/que.rbs
-- assets/sig/queue_classic.rbs
-- assets/sig/racc.rbs
-- assets/sig/rack-test.rbs
-- assets/sig/rack.rbs
-- assets/sig/rails.rbs
-- assets/sig/rdoc.rbs
-- assets/sig/sidekiq.rbs
-- assets/sig/sneakers.rbs
-- assets/sig/stdlib.rbs
-- assets/sig/sucker_punch.rbs
-- assets/sig/thor.rbs
-- assets/sig/tzinfo.rbs
 - bin/add-type-params.rb
 - bin/console
 - bin/gem_rbs
@@ -110,6 +87,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/pocke/rbs_rails
   source_code_uri: https://github.com/pocke/rbs_rails
+  changelog_uri: https://github.com/pocke/rbs_rails/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/assets/sig/action_mailer.rbs

@@ -1,8 +0,0 @@
-module ActionMailer
-  class Base
-    # TODO
-    # extend ActionView::Layouts::ClassMethods
-
-    def self.default: (?Hash[Symbol, untyped] value) -> Hash[Symbol, untyped]
-  end
-end

data/assets/sig/builtin.rbs

@@ -1,7 +0,0 @@
-class Monitor
-end
-class MonitorMixin
-end
-
-module Singleton
-end

data/assets/sig/capybara.rbs

@@ -1,14 +0,0 @@
-module Capybara
-  module DSL
-  end
-
-  module Minitest
-    module Assertions
-    end
-  end
-
-  module Poltergeist
-    class Driver
-    end
-  end
-end

data/assets/sig/concurrent.rbs

@@ -1,4 +0,0 @@
-module Concurrent
-  class Map
-  end
-end

data/assets/sig/erb.rbs

@@ -1,4 +0,0 @@
-class ERB
-  class Compiler
-  end
-end

data/assets/sig/erubi.rbs

@@ -1,4 +0,0 @@
-module Erubi
-  class Engine
-  end
-end

data/assets/sig/i18n.rbs

@@ -1,4 +0,0 @@
-module I18n
-  class Config
-  end
-end

data/assets/sig/libxml.rbs

@@ -1,10 +0,0 @@
-# is it correct?
-
-module LibXML
-end
-module LibXML::XML
-end
-module LibXML::XML::SaxParser
-end
-module LibXML::XML::SaxParser::Callbacks
-end

data/assets/sig/minitest.rbs

@@ -1,13 +0,0 @@
-module Minitest
-  class Test
-  end
-
-  class SummaryReporter
-  end
-
-  class StatisticsReporter
-  end
-
-  module Assertions
-  end
-end

data/assets/sig/nokogiri.rbs

@@ -1,8 +0,0 @@
-module Nokogiri
-end
-module Nokogiri::XML
-end
-module Nokogiri::XML::SAX
-end
-class Nokogiri::XML::SAX::Document
-end

data/assets/sig/pg.rbs

@@ -1,5 +0,0 @@
-module PG
-  class Connection
-    def async_exec: (*untyped) -> untyped
-  end
-end

data/assets/sig/que.rbs

@@ -1,4 +0,0 @@
-module Que
-  class Job
-  end
-end

data/assets/sig/queue_classic.rbs

@@ -1,4 +0,0 @@
-class QC
-  class Queue
-  end
-end

data/assets/sig/racc.rbs

@@ -1,4 +0,0 @@
-module Racc
-  class Parser
-  end
-end

data/assets/sig/rack-test.rbs

@@ -1,6 +0,0 @@
-module Rack
-  module Test
-    class UploadedFile
-    end
-  end
-end

data/assets/sig/rack.rbs

@@ -1,47 +0,0 @@
-module Rack
-  class Server
-  end
-
-  class Response
-    module Helpers
-      def location: () -> untyped
-    end
-  end
-
-  class Request
-    module Helpers
-    end
-
-    module Env
-    end
-  end
-
-  module Session
-    module Abstract
-      class SessionHash
-      end
-
-      class PersistedSecure
-        class SecureSessionHash
-        end
-      end
-
-      class Persisted
-      end
-    end
-
-    class SessionId
-    end
-
-    class Dalli
-    end
-  end
-
-  module Cache
-    class MetaStore
-    end
-
-    class EntityStore
-    end
-  end
-end

data/assets/sig/rails.rbs

@@ -1,10 +0,0 @@
-module Rails
-  def self.env: () -> ActiveSupport::StringInquirer | ...
-
-  module Dom
-    module Testing
-      module Assertions
-      end
-    end
-  end
-end

data/assets/sig/rdoc.rbs

@@ -1,9 +0,0 @@
-module RDoc
-  module Generator
-    class SDoc
-    end
-  end
-
-  class Task
-  end
-end

data/assets/sig/sidekiq.rbs

@@ -1,4 +0,0 @@
-module Sidekiq
-  module Worker
-  end
-end

data/assets/sig/sneakers.rbs

@@ -1,4 +0,0 @@
-module Sneakers
-  module Worker
-  end
-end

data/assets/sig/stdlib.rbs

@@ -1,24 +0,0 @@
-module DRb
-end
-
-module DRb::DRbUndumped
-end
-
-module TSort
-end
-
-class SimpleDelegator
-end
-
-module Gem
-  class Version
-  end
-end
-
-module OpenSSL
-  class Cipher
-  end
-end
-
-module FileUtils
-end

data/assets/sig/sucker_punch.rbs

@@ -1,4 +0,0 @@
-module SuckerPunch
-  module Job
-  end
-end

data/assets/sig/thor.rbs

@@ -1,12 +0,0 @@
-class Thor
-  class Group
-  end
-
-  module Actions
-    class CreateFile
-    end
-  end
-
-  class Error
-  end
-end

data/assets/sig/tzinfo.rbs

@@ -1,4 +0,0 @@
-module TZInfo
-  class Timezone
-  end
-end