drb 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d0eb4ca6f309e55b9edd0b87faee6027dc76949d8317df7203b62024c4b40f
-  data.tar.gz: 4e830e9ed25892a1c3b46c5926c6efd87080240835b6ede32723bce0ae704945
+  metadata.gz: 311c2093dbdf20afb0f21ded3968959afb5111e14c48b7db097a2bcde44ac583
+  data.tar.gz: 0cd370bd8dda8a2d78b1d1e64eba4a442f8fac7cec1a9a7f3a5f4fda43498e0b
 SHA512:
-  metadata.gz: c89c251f8fe35f13f6bb527f01283ff93f05608349af8b9222986d2985c79ffd27c41f47808fce8230041d97cc94e483d5aecd200913ab6f3af966d26a3f226a
-  data.tar.gz: 5ad205949893eb700ebb35a59d9f5500a4737fa21e9e990f14ee2eec608d59d59ab2d556a409d9c57a79f219a29736c77a76e701af786470484578f19f9bf330
+  metadata.gz: 720fdef98e8f0f3af1ec4adeb527abe11bdd75fde43c917cb36af1e0d2c68eec49b68e4ca57170acc31e355cb4f212b5f8e5bc486df1cefed500fd7adef2e0d5
+  data.tar.gz: 88f330b7d45fcfbbe84ae0ea895863d685813d8ef9878123c126fd6828952b281c6bffac89d98e124dd73757151ec6b6188e3ee31eb63c1781ee038b28b1600d

data/drb.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] =
+    "#{spec.homepage}/releases/tag/v#{spec.version}"
 
   spec.files         = %w[
     LICENSE.txt
@@ -29,7 +31,6 @@ Gem::Specification.new do |spec|
     lib/drb/extserv.rb
     lib/drb/extservm.rb
     lib/drb/gw.rb
-    lib/drb/invokemethod.rb
     lib/drb/observer.rb
     lib/drb/ssl.rb
     lib/drb/timeridconv.rb
@@ -38,6 +39,4 @@ Gem::Specification.new do |spec|
     lib/drb/weakidconv.rb
   ]
   spec.require_paths = ["lib"]
-
-  spec.add_dependency "ruby2_keywords"
 end

data/lib/drb/drb.rb

@@ -35,11 +35,11 @@
 # [http://www2a.biglobe.ne.jp/~seki/ruby/druby.en.html]
 #    The English version of the dRuby home page.
 #
-# [http://pragprog.com/book/sidruby/the-druby-book]
+# [https://web.archive.org/web/20160611151955/https://pragprog.com/book/sidruby/the-druby-book]
 #    The dRuby Book: Distributed and Parallel Computing with Ruby
 #    by Masatoshi Seki and Makoto Inoue
 #
-# [http://www.ruby-doc.org/docs/ProgrammingRuby/html/ospace.html]
+# [http://ruby-doc.com/docs/ProgrammingRuby/html/ospace.html]
 #   The chapter from *Programming* *Ruby* by Dave Thomas and Andy Hunt
 #   which discusses dRuby.
 #
@@ -348,6 +348,39 @@ module DRb
   # protocol.
   class DRbConnError < DRbError; end
 
+  class DRbObjectSpace # :nodoc:
+    # This is an internal class for DRbIdConv. This must not be used
+    # by users.
+
+    include MonitorMixin
+
+    def initialize
+      super()
+      @map = ObjectSpace::WeakMap.new
+    end
+
+    def to_id(obj)
+      synchronize do
+        @map[obj.__id__] = obj
+        obj.__id__
+      end
+    end
+
+    def to_obj(ref)
+      synchronize do
+        obj = @map[ref]
+        raise RangeError.new("invalid reference") unless obj.__id__ == ref
+        obj
+      end
+    end
+  end
+
+  # :nodoc:
+  #
+  # This is an internal singleton instance. This must not be used
+  # by users.
+  DRB_OBJECT_SPACE = DRbObjectSpace.new
+
   # Class responsible for converting between an object and its id.
   #
   # This, the default implementation, uses an object's local ObjectSpace
@@ -364,7 +397,7 @@ module DRb
     # This implementation looks up the reference id in the local object
     # space and returns the object it refers to.
     def to_obj(ref)
-      ObjectSpace._id2ref(ref)
+      DRB_OBJECT_SPACE.to_obj(ref)
     end
 
     # Convert an object into a reference id.
@@ -372,12 +405,7 @@ module DRb
     # This implementation returns the object's __id__ in the local
     # object space.
     def to_id(obj)
-      case obj
-      when Object
-        obj.nil? ? nil : obj.__id__
-      when BasicObject
-        obj.__id__
-      end
+      (nil == obj) ? nil : DRB_OBJECT_SPACE.to_id(obj)
     end
   end
 
@@ -1174,7 +1202,7 @@ module DRb
       prefix = "(#{uri}) "
       bt = []
       result.backtrace.each do |x|
-        break if /`__send__'$/ =~ x
+        break if /[`']__send__'$/ =~ x
         if /\A\(druby:\/\// =~ x
           bt.push(x)
         else
@@ -1594,26 +1622,26 @@ module DRb
     def check_insecure_method(obj, msg_id)
       return true if Proc === obj && msg_id == :__drb_yield
       raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
-      raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
+      raise(SecurityError, "insecure method '#{msg_id}'") if insecure_method?(msg_id)
 
       case obj
       when Object
         if obj.private_methods.include?(msg_id)
           desc = any_to_s(obj)
-          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+          raise NoMethodError, "private method '#{msg_id}' called for #{desc}"
         elsif obj.protected_methods.include?(msg_id)
           desc = any_to_s(obj)
-          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+          raise NoMethodError, "protected method '#{msg_id}' called for #{desc}"
         else
           true
         end
       else
         if Kernel.instance_method(:private_methods).bind(obj).call.include?(msg_id)
           desc = any_to_s(obj)
-          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+          raise NoMethodError, "private method '#{msg_id}' called for #{desc}"
         elsif Kernel.instance_method(:protected_methods).bind(obj).call.include?(msg_id)
           desc = any_to_s(obj)
-          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+          raise NoMethodError, "protected method '#{msg_id}' called for #{desc}"
         else
           true
         end
@@ -1673,6 +1701,33 @@ module DRb
         check_insecure_method
       end
 
+      def block_yield(x)
+        if x.size == 1 && x[0].class == Array
+          x[0] = DRbArray.new(x[0])
+        end
+        @block.call(*x)
+      end
+
+      def perform_with_block
+        @obj.__send__(@msg_id, *@argv) do |*x|
+          jump_error = nil
+          begin
+            block_value = block_yield(x)
+          rescue LocalJumpError
+            jump_error = $!
+          end
+          if jump_error
+            case jump_error.reason
+            when :break
+              break(jump_error.exit_value)
+            else
+              raise jump_error
+            end
+          end
+          block_value
+        end
+      end
+
       def perform_without_block
         if Proc === @obj && @msg_id == :__drb_yield
           if @argv.size == 1
@@ -1688,11 +1743,6 @@ module DRb
 
     end
 
-    require_relative 'invokemethod'
-    class InvokeMethod
-      include InvokeMethod18Mixin
-    end
-
     def error_print(exception)
       exception.backtrace.inject(true) do |first, x|
         if first

data/lib/drb/ssl.rb

@@ -185,7 +185,7 @@ module DRb
         }
 
         cert = OpenSSL::X509::Certificate.new
-        cert.version = 3
+        cert.version = 2 # This means v3
         cert.serial = 0
         name = OpenSSL::X509::Name.new(self[:SSLCertName])
         cert.subject = name

data/lib/drb/unix.rb

@@ -81,7 +81,7 @@ module DRb
             break
           end
         rescue
-          raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
+          raise "cannot generate tempfile '%s'" % tmpname if n >= Max_try
           #sleep(1)
         end
         n += 1

data/lib/drb/version.rb

@@ -1,3 +1,3 @@
 module DRb
-  VERSION = "2.2.0"
+  VERSION = "2.2.3"
 end

data/lib/drb/weakidconv.rb

@@ -1,57 +1,29 @@
 # frozen_string_literal: false
 require_relative 'drb'
-require 'monitor'
 
 module DRb
 
+  # DRb::WeakIdConv is deprecated since 2.2.1. You don't need to use
+  # DRb::WeakIdConv instead of DRb::DRbIdConv. It's the same class.
+  #
+  # This file still exists for backward compatibility.
+  #
   # To use WeakIdConv:
   #
   #  DRb.start_service(nil, nil, {:idconv => DRb::WeakIdConv.new})
 
-  class WeakIdConv < DRbIdConv
-    class WeakSet
-      include MonitorMixin
-      def initialize
-        super()
-        @immutable = {}
-        @map = ObjectSpace::WeakMap.new
-      end
-
-      def add(obj)
-        synchronize do
-          begin
-            @map[obj] = self
-          rescue ArgumentError
-            @immutable[obj.__id__] = obj
-          end
-          return obj.__id__
-        end
-      end
-
-      def fetch(ref)
-        synchronize do
-          @immutable.fetch(ref) {
-            @map.each { |key, _|
-              return key if key.__id__ == ref
-            }
-            raise RangeError.new("invalid reference")
-          }
-        end
-      end
-    end
-
-    def initialize()
-      super()
-      @weak_set = WeakSet.new
-    end
-
-    def to_obj(ref) # :nodoc:
-      return super if ref.nil?
-      @weak_set.fetch(ref)
-    end
-
-    def to_id(obj) # :nodoc:
-      return @weak_set.add(obj)
+  def self.const_missing(name) # :nodoc:
+    case name
+    when :WeakIdConv
+      warn("DRb::WeakIdConv is deprecated. " +
+           "You can use the DRb::DRbIdConv. " +
+           "You don't need to use this.",
+           uplevel: 1)
+      const_set(:WeakIdConv, DRbIdConv)
+      singleton_class.remove_method(:const_missing)
+      DRbIdConv
+    else
+      super
     end
   end
 end

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Masatoshi SEKI
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby2_keywords
-  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'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: Distributed object system for Ruby
 email:
 - seki@ruby-lang.org
@@ -40,7 +25,6 @@ files:
 - lib/drb/extserv.rb
 - lib/drb/extservm.rb
 - lib/drb/gw.rb
-- lib/drb/invokemethod.rb
 - lib/drb/observer.rb
 - lib/drb/ssl.rb
 - lib/drb/timeridconv.rb
@@ -54,7 +38,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/drb
   source_code_uri: https://github.com/ruby/drb
-post_install_message:
+  changelog_uri: https://github.com/ruby/drb/releases/tag/v2.2.3
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Distributed object system for Ruby
 test_files: []

data/lib/drb/invokemethod.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-# for ruby-1.8.0
-
-module DRb # :nodoc: all
-  class DRbServer
-    module InvokeMethod18Mixin
-      def block_yield(x)
-        if x.size == 1 && x[0].class == Array
-          x[0] = DRbArray.new(x[0])
-        end
-        @block.call(*x)
-      end
-
-      def perform_with_block
-        @obj.__send__(@msg_id, *@argv) do |*x|
-          jump_error = nil
-          begin
-            block_value = block_yield(x)
-          rescue LocalJumpError
-            jump_error = $!
-          end
-          if jump_error
-            case jump_error.reason
-            when :break
-              break(jump_error.exit_value)
-            else
-              raise jump_error
-            end
-          end
-          block_value
-        end
-      end
-    end
-  end
-end