orthoses 0.11.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bbebf8271fbe9859e0e322e0e2d12fbf7a03dc30663309771edeba678674679
-  data.tar.gz: bfdfabbb3110a7c159a7763463077768d76b9cfd14ae77537a87d0abbd8fda74
+  metadata.gz: 8718c01d3ca0c5ea18285c9082218c526e280626d15da555b17773ec8d582ac3
+  data.tar.gz: 2541364526894cb9f2870a4a69169418ca57ad042911507bd96557e54df1abfd
 SHA512:
-  metadata.gz: e1093d5bbc23bf0577d915afd70fa34907316bcdd2062e34cdc7506f455636e47e02bb046048e4682c16feeba2bc045985fbae2636bd2e220fc90a66f30e957b
-  data.tar.gz: 84fe1da94bfe208b46ddc1b3607ba7962e1133150fe454ffc8d4e40ca0dd6bc99c4b7e24f41a18f0217913eedd6e5b08e45329d07455e1e5fb913d102c13b67e
+  metadata.gz: b8dbc5aaeda5a1943a61bfc8b0190994373284e5c4712d2ffe710fe31fe95949406b8d2a3929dfad09b573b14c19d81c7f558cbc7ac197055d128596e2625272
+  data.tar.gz: 465cff7f5fa29e7b599549a790b85ba1d597e820e6437811ead5e8de031fee797ef07746bba448451b2b73715511e8bd59a65cb8b32bf86ab1d09832a06ac3a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthoses (0.11.0)
+    orthoses (1.1.0)
       rbs (~> 2.0)
 
 GEM

data/README.md

@@ -3,6 +3,10 @@
 Orthoses is a framework for RBS generation.
 The Rack architecture keeps your code organized and extensible.
 
+- You can choose which middleware to use.
+- You can write your own middleware to use.
+- You can publish your middleware and share it with the world.
+
 ## PoC
 
 https://gist.github.com/ksss/00592da24f28774bf8fc5db08331666e
@@ -19,28 +23,38 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
+For example, You can write script in Rakefile.
+
 ```rb
-Orthoses::Builder.new do
-  use Orthoses::CreateFileByName
-    base_dir: Rails.root.join("sig/out"),
-    header: "# !!! GENERATED CODE !!!"
-  use Orthoses::Filter,
-    if: -> (name, _content) {
-      path, _lineno = Object.const_source_location(name)
-      return false unless path
-      %r{app/models}.match?(path)
-    }
-  use YourCustom::Middleware
-  use Orthoses::Mixin
-  use Orthoses::Constant
-  use Orthoses::Walk,
-    root: "Foo"
-  run -> () {
-    # load library or application
-  }
-end.call
+require 'orthoses'
+
+namespace :rbs do
+  desc "build RBS to sig/out"
+  task :build do
+    Orthoses::Builder.new do
+      use Orthoses::CreateFileByName
+        base_dir: Rails.root.join("sig/out"),
+        header: "# !!! GENERATED CODE !!!"
+      use Orthoses::Filter do |name, _content|
+        path, _lineno = Object.const_source_location(name)
+        return false unless path
+        %r{app/models}.match?(path)
+      end
+      use YourCustom::Middleware
+      use Orthoses::Mixin
+      use Orthoses::Constant
+      use Orthoses::Walk,
+        root: "Foo"
+      run -> {
+        # load library or application
+      }
+    end.call
+  end
+end
 ```
 
+Then, you can see the result files under `sig/out`.
+
 ## Utils
 
 `Orthoses::Utils` is a collection of useful methods.
@@ -177,3 +191,9 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the Orthoses project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ksss/orthoses/blob/main/CODE_OF_CONDUCT.md).
+
+# TODO
+
+- Share middleware sets for commonly used use cases.
+  - For library.
+  - For application.

data/examples/minitest/Rakefile

@@ -13,9 +13,9 @@ task :minitest => :src do
   Orthoses::Builder.new do
     use Orthoses::CreateFileByName,
       base_dir: out.to_s
-    use Orthoses::Filter, if: ->(name, content) {
+    use Orthoses::Filter do |name, content|
       name.start_with?("Minitest") || name == "Kernel"
-    }
+    end
     use Orthoses::Constant,
       strict: false,
       if: ->(current, const, val, rbs){

data/lib/orthoses/constant.rb

@@ -2,7 +2,7 @@
 
 module Orthoses
   class Constant
-    def initialize(loader, strict:, if: nil, on_error: nil)
+    def initialize(loader, strict: false, if: nil, on_error: nil)
       @loader = loader
       @strict = strict
       @if = binding.local_variable_get(:if)

data/lib/orthoses/content/duplication_checker.rb

@@ -11,11 +11,16 @@ module Orthoses
         return unless @decl.respond_to?(:members)
         uniq_map = {}
         @decl.members.each do |member|
-          key = member_key(member)
-          drop_member = uniq_map[key]
-          uniq_map[key] = member
-          if drop_member
-            Orthoses.logger.info("#{@decl.name} \"#{member.location.source}\" was droped since duplication")
+          if member.instance_of?(RBS::AST::Members::MethodDefinition) && member.overload
+            # avoid to duplicate and keep order
+            uniq_map[Object.new] = member
+          else
+            key = member_key(member)
+            drop_member = uniq_map[key]
+            uniq_map[key] = member
+            if drop_member
+              Orthoses.logger.info("#{@decl.name} \"#{member.location.source}\" was droped since duplication")
+            end
           end
         end
         drop_known_method_definition(uniq_map)

data/lib/orthoses/filter.rb

@@ -2,19 +2,21 @@
 
 module Orthoses
   # Filter current store.
-  #   use Orthoses::Filter,
-  #     # filter stored key and value if proc return true
-  #     if: -> (name, content) { Orthoses.rbs_defined_class?(name) }
+  # filter stored key and value if proc return true
+  #   use Orthoses::Filter do |name, content|
+  #     Orthoses.rbs_defined_class?(name)
+  #   end
   class Filter
-    def initialize(loader, if:)
+    def initialize(loader, if: nil, &block)
       @loader = loader
       @if = binding.local_variable_get(:if)
+      @block = block || @if || raise(ArgumentError, "should give a block")
     end
 
     def call
       @loader.call.tap do |store|
         store.filter! do |name, content|
-          @if.call(name, content).tap do
+          @block.call(name, content).tap do
             Orthoses.logger.debug("Filter pass [#{name}]")
           end
         end

data/lib/orthoses/version.rb

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

data/sig/orthoses/constant.rbs

@@ -1,7 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Constant
-  def initialize: (Orthoses::_Call loader, strict: bool, ?if: ^(Module, Symbol, untyped) -> boolish, ?on_error: ^(Orthoses::ConstLoadError) -> void) -> void
+  def initialize: (Orthoses::_Call loader, ?strict: bool, ?if: ^(Module, Symbol, untyped) -> boolish | nil, ?on_error: ^(Orthoses::ConstLoadError) -> void | nil) -> void
   def call: () -> Orthoses::store
   @loader: Orthoses::_Call
   @strict: bool

data/sig/orthoses/filter.rbs

@@ -1,7 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Filter
-  def initialize: (Orthoses::_Call loader, if: ^(String, Orthoses::Content) -> boolish) -> void
+  def initialize: (Orthoses::_Call loader) { (String, Orthoses::Content) -> boolish } -> void
   def call: () -> Orthoses::store
   @loader: Orthoses::_Call
+  @block: ^(String, Orthoses::Content) -> boolish
 end

data/sig/orthoses.rbs

@@ -1,7 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses
-  VERSION: "0.11.0"
+  VERSION: "1.1.0"
   attr_accessor self.logger: ::Logger
   type store = Hash[String, Orthoses::Content]
   INSTANCE_METHOD_METHOD: UnboundMethod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs