rbs_config 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214aeb4d1563d548e95f738b906554c68ddd2a2bad39bfb9fc0906a23eeba005
-  data.tar.gz: 013072d9063caf8f220ed4dc7ed52470d755e8e80be9265dca1b37136e1299d6
+  metadata.gz: 7c379914fccfe5ef6d08534927a87f1df4cfab80f84da0ffe80fd638d2ba35bb
+  data.tar.gz: deda4664549517817ae600c005ebfb5af42f12b65ffb437a36879d4092a5a2fb
 SHA512:
-  metadata.gz: 177c407ec2c7f25d4081658816729faf91ccf66f69d38cf5ae5abbc3283625327d77565dc67a56b1e19f2d8ae03bfb3dba6d449f9aa0b7761279e95abbb8883a
-  data.tar.gz: 2a3ed93b17a077d1ad9d718e05608f2a6efb2f19bffce73703ba206cfa28d445d096dc2b4b653f0a6532d36797c828ea2fd96de8df5eda3c6d416b0eadbb3b36
+  metadata.gz: cb35f250bd004771189c8c6b540ac317d8a64ae5c6f8b3e80bbbc11dc19210380cacdd4f15b9184ef0dfe35f9b43648b3abd1de886a0db6dee426328fd57377d
+  data.tar.gz: e34cda204e7094262317525dae5c2885a6621dbd9760bb780304faad8df4d2c8806a7998cf5b8dffacf2f37ab438a8bb9fbc68f155323c6f086a294daf1a7730

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/Documentation:
   Enabled: false

data/lib/rbs_config/config.rb

@@ -41,17 +41,20 @@ module RbsConfig
 
       def generate_classes(config)
         config.filter_map do |key, value|
-          next unless value.is_a?(Hash)
+          case value
+          when Array
+            generate_classes({ key => value.first }).first if value.first.is_a?(Hash)
+          when Hash
+            classes = generate_classes(value)
+            methods = generate_methods(value)
 
-          classes = generate_classes(value)
-          methods = generate_methods(value)
-
-          <<~RBS
-            class #{key.camelize}
-              #{classes.join("\n")}
-              #{methods.join("\n")}
-            end
-          RBS
+            <<~RBS
+              class #{key.camelize}
+                #{classes.join("\n")}
+                #{methods.join("\n")}
+              end
+            RBS
+          end
         end
       end
 
@@ -78,7 +81,15 @@ module RbsConfig
       end
 
       def load_config(files)
-        files.map { |f| YAML.unsafe_load(f.read) }.inject { |a, b| a.deep_merge(b) }
+        configs = files.map do |f|
+          content = ERB.new(f.read).result
+          if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(content)
+          else
+            YAML.load(content) # rubocop:disable Security/YAMLLoad
+          end
+        end
+        configs.inject { |a, b| a.deep_merge(b) }
       end
     end
   end

data/lib/rbs_config/version.rb

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

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+  revision: c34ed02f870fb02571f664062eb13ef507702029
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
@@ -16,7 +16,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionview
@@ -24,7 +24,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activesupport
@@ -32,7 +32,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -40,7 +40,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
@@ -56,19 +56,31 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: date
   version: '0'
   source:
     type: stdlib
+- name: dbm
+  version: '0'
+  source:
+    type: stdlib
+- name: erb
+  version: '0'
+  source:
+    type: stdlib
+- name: fileutils
+  version: '0'
+  source:
+    type: stdlib
 - name: i18n
   version: '1.10'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: json
@@ -100,19 +112,31 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: parser
+  version: '3.2'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
   version: '0'
   source:
     type: stdlib
+- name: pstore
+  version: '0'
+  source:
+    type: stdlib
 - name: rack
   version: '2.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -120,7 +144,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rainbow
@@ -128,17 +152,49 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rake
+  version: '13.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.2.0
+  version: 3.1.3
   source:
     type: rubygems
 - name: rdoc
   version: '0'
   source:
     type: stdlib
+- name: regexp_parser
+  version: '2.8'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rubocop
+  version: '1.57'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rubocop-ast
+  version: '1.30'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: securerandom
   version: '0'
   source:
@@ -147,10 +203,22 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: strscan
+  version: '0'
+  source:
+    type: stdlib
 - name: tempfile
   version: '0'
   source:
     type: stdlib
+- name: thor
+  version: '1.2'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: time
   version: '0'
   source:
@@ -159,8 +227,20 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: tzinfo
+  version: '2.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c34ed02f870fb02571f664062eb13ef507702029
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: uri
   version: '0'
   source:
     type: stdlib
+- name: yaml
+  version: '0'
+  source:
+    type: stdlib
 gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -24,3 +24,5 @@ gems:
   - name: pathname
   - name: rack
   - name: railties
+  - name: thor
+  - name: yaml

data/rbs_config.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "A RBS files generator for Config gem"
   spec.homepage = "https://github.com/tk0miya/rbs_config"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/sig/rbs_config/rails_config.rbs

@@ -1,19 +1,19 @@
 module RbsConfig
   module RailsConfig
-    def self.generate: (mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions[untyped, untyped]]) -> String
+    def self.generate: (mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions]) -> String
 
     class Generator
-      attr_reader mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions[untyped, untyped]]
+      attr_reader mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions]
 
-      def initialize: (mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions[untyped, untyped]]) -> void
+      def initialize: (mapping: Hash[untyped, Hash[untyped, untyped] | ActiveSupport::OrderedOptions]) -> void
       def generate: () -> String
 
       private
 
       def format: (String rbs) -> String
-      def generate_classes: (Hash[untyped, untyped] | ActiveSupport::OrderedOptions[untyped, untyped] config) -> Array[String]
-      def generate_methods: (Hash[untyped, untyped] | ActiveSupport::OrderedOptions[untyped, untyped] config) -> Array[string]
-      def generate_ordered_options_methods: (ActiveSupport::OrderedOptions[untyped, untyped] config) -> Array[string]
+      def generate_classes: (Hash[untyped, untyped] | ActiveSupport::OrderedOptions config) -> Array[String]
+      def generate_methods: (Hash[untyped, untyped] | ActiveSupport::OrderedOptions config) -> Array[string]
+      def generate_ordered_options_methods: (ActiveSupport::OrderedOptions config) -> Array[string]
       def generate_hash_methods: (Hash[untyped, untyped]) -> Array[string]
       def stringify_type: (untyped name, untyped value) -> String
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_config
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2024-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,8 +66,6 @@ files:
 - sig/rbs_config/config.rbs
 - sig/rbs_config/rails_config.rbs
 - sig/rbs_config/rake_task.rbs
-- sig/shims/rake.rbs
-- sig/shims/thor.rbs
 homepage: https://github.com/tk0miya/rbs_config
 licenses:
 - MIT
@@ -83,14 +81,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: A RBS files generator for Config gem

data/sig/shims/rake.rbs

@@ -1,18 +0,0 @@
-module Rake
-  class TaskLib
-    include Rake::DSL
-  end
-
-  module DSL
-    private
-
-    def desc: (String description) -> void
-    def file: (*untyped args) ?{ () -> void } -> void
-    def import: (*String fns) -> void
-    def multitask: (*untyped args) ?{ () -> void } -> void
-    def namespace: (?String? name) ?{ () -> void } -> void
-    def rule: (*untyped args) ?{ () -> void } -> void
-    def task: (*untyped args) ?{ () -> void } -> void
-    def sh: (*String cmd) ?{ (bool, Process::Status) -> void } -> void
-  end
-end

data/sig/shims/thor.rbs

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