nuggets 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad45b4d4a9ccf28b262ca7b38cb728d04fcbc03cd9ba1d761ac40bded7ce1db
-  data.tar.gz: a35c07426a38a092e2a6159f961574d9fd25a55d9b36e639807397b0c2baa877
+  metadata.gz: 1918bdc23725b5833549da651c379edda6a6e070753571e0037e7a7147be67ca
+  data.tar.gz: e48e2395d1366f14bfba167be73e36a4f2050ea64419918eca3b1f095d0fb37c
 SHA512:
-  metadata.gz: a603785020efbd4ac9e8fb45c95207527f8e02857b76bf0cd201559169c1ea49a41a8e5ae7e5bfe1d48419eff6e72b95a8699c1ffcf49bb28b797881ebbc32f8
-  data.tar.gz: 3c16dbd738a21dc8ace62e6916e603fec2853b947c54753033e18d47f8379dcbafaa9f838e69dd48153136907815232a46a7281610bd5f239da47e826b730869
+  metadata.gz: 6719bf7667073a9bb9eb8c6f667a1715ebce7dff48b4cc4d514dbfbb6a245fafbfe3101a4f6426cb96e9820b072c8431d5b88c8f51a8201c143166eb65be4daf
+  data.tar.gz: de3a4dad5dcd6e5d238c92ea95ee4d4964c79c10df4b634c0b533e2e7f93e7107516c3d147c856dccb40f556911791b11b515c4ce427c6dd8f256036b5bd7c91

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for nuggets
 
+== 1.6.1 [2022-05-18]
+
+* Ruby 3.1 compatibility.
+
 == 1.6.0 [2018-07-12]
 
 * Added <tt>JSON.*_{multi,canonical}</tt>.

data/README

@@ -2,13 +2,13 @@
 
 == VERSION
 
-This documentation refers to nuggets version 1.6.0.
+This documentation refers to nuggets version 1.6.1.
 
 
 == DESCRIPTION
 
 Nuggets provides a collection of extensions to Ruby classes.
-It's similar to projects like Facets[http://rubyworks.github.com/facets]
+It's similar to projects like Facets[https://rubyworks.github.io/facets]
 and Extensions[http://extensions.rubyforge.org] (or even
 Labrador[http://labrador.rubyforge.org]).
 
@@ -45,7 +45,7 @@ expected or cause other libraries to misbehave. Use at your own risk!
 
 == LINKS
 
-Documentation:: https://blackwinter.github.com/nuggets
+Documentation:: https://blackwinter.github.io/nuggets
 Source code::   https://github.com/blackwinter/nuggets
 RubyGem::       https://rubygems.org/gems/nuggets
 Travis CI::     https://travis-ci.org/blackwinter/nuggets
@@ -58,7 +58,7 @@ Travis CI::     https://travis-ci.org/blackwinter/nuggets
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2018 Jens Wille
+Copyright (C) 2007-2022 Jens Wille
 
 nuggets is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/lib/nuggets/file/sub_mixin.rb

@@ -39,9 +39,9 @@ module Nuggets
   #
   # Calls String#sub! on file +name+'s contents with +args+ and (optional)
   # +block+ and returns the new content.
-  def sub(name, *args)
+  def sub(name, *args, &block)
     content = read(name)
-    content.sub!(*args, &block_given? ? ::Proc.new : nil)
+    content.sub!(*args, &block)
     content
   end
 
@@ -51,11 +51,11 @@ module Nuggets
   # Calls String#sub! on file +name+'s contents with +args+ and (optional)
   # +block+ and replaces the file with the new content. Returns the result
   # of the String#sub! call.
-  def sub!(name, *args)
+  def sub!(name, *args, &block)
     res = nil
 
     replace(name) { |content|
-      res = content.sub!(*args, &block_given? ? ::Proc.new : nil)
+      res = content.sub!(*args, &block)
       content
     }
 
@@ -67,9 +67,9 @@ module Nuggets
   #
   # Calls String#gsub! on file +name+'s contents with +args+ and (optional)
   # +block+ and returns the new content.
-  def gsub(name, *args)
+  def gsub(name, *args, &block)
     content = read(name)
-    content.gsub!(*args, &block_given? ? ::Proc.new : nil)
+    content.gsub!(*args, &block)
     content
   end
 
@@ -79,11 +79,11 @@ module Nuggets
   # Calls String#gsub! on file +name+'s contents with +args+ and (optional)
   # +block+ and replaces the file with the new content. Returns the result
   # of the String#gsub! call.
-  def gsub!(name, *args)
+  def gsub!(name, *args, &block)
     res = nil
 
     replace(name) { |content|
-      res = content.gsub!(*args, &block_given? ? ::Proc.new : nil)
+      res = content.gsub!(*args, &block)
       content
     }
 

data/lib/nuggets/hash/nest_mixin.rb

@@ -49,11 +49,11 @@ module Nuggets
   #   hash[:foo][:bar][:b] = { x: 0, y: 3 }
   #   hash
   #   #=> {:foo=>{:bar=>{:b=>{:y=>3, :x=>0}, :a=>{:y=>2, :x=>1}}}}
-  def nest(depth = 0, value = default = true)
+  def nest(depth = 0, value = default = true, &block)
     if depth.zero?
       if default
         if block_given?
-          new { |hash, key| hash[key] = yield(key) }
+          new { |hash, key| hash[key] = block[key] }
         else
           new { |hash, key| hash[key] = hash.default }
         end
@@ -62,11 +62,7 @@ module Nuggets
       end
     else
       if default
-        if block_given?
-          new { |hash, key| hash[key] = nest(depth - 1, &::Proc.new) }
-        else
-          new { |hash, key| hash[key] = nest(depth - 1) }
-        end
+        new { |hash, key| hash[key] = nest(depth - 1, &block) }
       else
         new { |hash, key| hash[key] = nest(depth - 1, value) }
       end

data/lib/nuggets/io/modes.rb

@@ -38,8 +38,8 @@ class IO
     #
     # Opens +name+ with mode +r+. NOTE: With no associated block,
     # acts like the original IO::read, not like IO::new.
-    def read(name, *args)
-      return _nuggets_original_read(name, *args) unless block_given?
+    def read(name, *args, **opts, &block)
+      return _nuggets_original_read(name, *args, **opts) unless block_given?
 
       case args.size
         when 0
@@ -55,7 +55,7 @@ class IO
           raise ::ArgumentError, "wrong number of arguments (#{args.size + 1} for 1-2)"
       end
 
-      open_with_mode(name, 'r', binary, &::Proc.new)
+      open_with_mode(name, 'r', binary, &block)
     end
 
     # call-seq:
@@ -63,8 +63,8 @@ class IO
     #   IO.write(name[, binary]) { |io| ... } => anObject
     #
     # Opens +name+ with mode +w+.
-    def write(name, binary = false)
-      open_with_mode(name, 'w', binary, &block_given? ? ::Proc.new : nil)
+    def write(name, binary = false, &block)
+      open_with_mode(name, 'w', binary, &block)
     end
 
     # call-seq:
@@ -72,8 +72,8 @@ class IO
     #   IO.append(name[, binary]) { |io| ... } => anObject
     #
     # Opens +name+ with mode +a+.
-    def append(name, binary = false)
-      open_with_mode(name, 'a', binary, &block_given? ? ::Proc.new : nil)
+    def append(name, binary = false, &block)
+      open_with_mode(name, 'a', binary, &block)
     end
 
     # call-seq:
@@ -81,8 +81,8 @@ class IO
     #   IO.read_write(name[, binary]) { |io| ... } => anObject
     #
     # Opens +name+ with mode <tt>r+</tt>.
-    def read_write(name, binary = false)
-      open_with_mode(name, 'r+', binary, &block_given? ? ::Proc.new : nil)
+    def read_write(name, binary = false, &block)
+      open_with_mode(name, 'r+', binary, &block)
     end
 
     # call-seq:
@@ -90,8 +90,8 @@ class IO
     #   IO.write_read(name[, binary]) { |io| ... } => anObject
     #
     # Opens +name+ with mode <tt>w+</tt>.
-    def write_read(name, binary = false)
-      open_with_mode(name, 'w+', binary, &block_given? ? ::Proc.new : nil)
+    def write_read(name, binary = false, &block)
+      open_with_mode(name, 'w+', binary, &block)
     end
 
     # call-seq:
@@ -99,15 +99,15 @@ class IO
     #   IO.append_read(name[, binary]) { |io| ... } => anObject
     #
     # Opens +name+ with mode <tt>a+</tt>.
-    def append_read(name, binary = false)
-      open_with_mode(name, 'a+', binary, &block_given? ? ::Proc.new : nil)
+    def append_read(name, binary = false, &block)
+      open_with_mode(name, 'a+', binary, &block)
     end
 
     private
 
     # Just a helper to DRY things up.
-    def open_with_mode(name, mode, binary = false)
-      open(name, "#{mode}#{'b' if binary}", &block_given? ? ::Proc.new : nil)
+    def open_with_mode(name, mode, binary = false, &block)
+      open(name, "#{mode}#{'b' if binary}", &block)
     end
 
   end

data/lib/nuggets/version.rb

@@ -4,7 +4,7 @@ module Nuggets
 
     MAJOR = 1
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

data/spec/nuggets/enumerable/minmax_spec.rb

@@ -7,7 +7,7 @@ describe Enumerable, 'minmax' do
 
     e.max.should == 'quux'
     e.max_by(:length).should == 'quuux'
-    e.max(:length).should == 5 if RUBY_VERSION < '2.4'
+    e.max(:length).should == 5 if RUBY_VERSION < '2.4' && RUBY_ENGINE != 'jruby'
   }
 
   example {
@@ -15,7 +15,7 @@ describe Enumerable, 'minmax' do
 
     e.max.should == 222
     e.max_by(b).should == 45
-    e.max(b).should == 5 if RUBY_VERSION < '2.4'
+    e.max(b).should == 5 if RUBY_VERSION < '2.4' && RUBY_ENGINE != 'jruby'
   }
 
 end

data/spec/nuggets/json/multi_spec.rb

@@ -52,7 +52,7 @@ describe_extended JSON, Nuggets::JSON::MultiMixin, true do
     example { expect(subject.size).to eq(3) }
     example { expect(subject.keys).to eq(%w[a b a]) }
 
-    example { expect(subject['a']).to eq(1) }
+    example { expect(subject['a']).to eq(1) } unless RUBY_ENGINE == 'jruby'
     example { expect(subject['b']).to eq([42, 23]) }
 
     example { expect(multi[0]).to eq(1) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuggets
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jens Wille
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -47,7 +47,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -364,13 +364,13 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  nuggets-1.6.0 [2018-07-12]:
+  nuggets-1.6.1 [2022-05-18]:
 
-  * Added <tt>JSON.*_{multi,canonical}</tt>.
+  * Ruby 3.1 compatibility.
 
 rdoc_options:
 - "--title"
-- nuggets Application documentation (v1.6.0)
+- nuggets Application documentation (v1.6.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -390,9 +390,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: Extending Ruby.
 test_files: []
+...