nuggets 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8bc4223cf7e497022aa29613c8fddce9a757b69
-  data.tar.gz: 3f1f0159203157d4fbcded7cf3dc5aeb25972df2
+  metadata.gz: 5af6231048355058097a53aac9443148a84e7bbc
+  data.tar.gz: c6976ef57d142740afed95d49bfdd366992d5bbb
 SHA512:
-  metadata.gz: aedaaac17d00e186d8219ba67495fc1b5f73033251cff451b8f38e5e454cee49a4eac56922c2ae2b34c2ff3d87ba1bf922285a512f879e197552ea7219084733
-  data.tar.gz: 99ed4373f5c96cd6a0f42a0ee55e4ee5a8d99f166245fb2ff6f54330dfbeac503f021868bda9569bf8149b05aea31cb3ec7c6855c30a5509fbbabeff9a03678d
+  metadata.gz: ea703b2f4bd23a05391a67d6ce8694fa63ab59d02d8e7f7766de2516838a1a7bd8ce31c6a42e09ea78cfb4ddc4009956852e3845ec61f4eccbe6d6f793ef1259
+  data.tar.gz: 702b6c308c17b5fd8e54f7538bf6057f573cadf60326ace6a55b40cbe805e45b67e581a13a9618e5900f8ec461512d85ff287fa2e39a6ee83f532cf922844510

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for nuggets
 
+== 1.5.0 [2016-04-19]
+
+* Added String#format.
+* Added String#highlight.
+* Dropped IO::NULL, available as File::NULL since Ruby 1.9.3.
+
 == 1.4.0 [2015-10-02]
 
 * Added File.open_file.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to nuggets version 1.4.0.
+This documentation refers to nuggets version 1.5.0.
 
 
 == DESCRIPTION
@@ -58,7 +58,7 @@ Travis CI::     https://travis-ci.org/blackwinter/nuggets
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2015 Jens Wille
+Copyright (C) 2007-2016 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/array/format.rb

@@ -40,7 +40,7 @@ class Array
   # Applies to string argument accordingly: First string in _array_ applied to
   # _str_; empty string if _str_ is empty.
   def %(args)
-    opts = { :sep => ', ' }
+    opts = { sep: ', ' }
     opts.update(pop) if last.is_a?(::Hash)
 
     default = lambda { |n| ['%s'] * n * opts[:sep] }

data/lib/nuggets/array/histogram_mixin.rb

@@ -39,10 +39,10 @@ module Nuggets
   #
   # The "numeric" variants format the item as a (decimal) number.
   FORMATS = {
-    :default         => '%-*s [%s]%*s %*d',
-    :percent         => '%-*s [%s]%*s %*d (%.2f%%)',
-    :numeric         =>  '%*d [%s]%*s %*d',
-    :numeric_percent =>  '%*d [%s]%*s %*d (%.2f%%)'
+    default:         '%-*s [%s]%*s %*d',
+    percent:         '%-*s [%s]%*s %*d (%.2f%%)',
+    numeric:          '%*d [%s]%*s %*d',
+    numeric_percent:  '%*d [%s]%*s %*d (%.2f%%)'
   }
 
   # Encapsulates a #histogram item and provides the following attributes (see

data/lib/nuggets/hash/in_order.rb

@@ -34,8 +34,8 @@ class Hash
   # Returns <tt>hash#to_a</tt>, in forced order (cf. Array#in_order).
   #
   # Examples:
-  #   { :a => 1, :b => 2, :c => 3 }.in_order(:b, :c)  #=> [[:b, 2], [:c, 3], [:a, 1]]
-  #   { :a => 1, :b => 2, :c => 3 }.in_order(:b, :d)  #=> [[:b, 2], [:a, 1], [:c, 3]]
+  #   { a: 1, b: 2, c: 3 }.in_order(:b, :c)  #=> [[:b, 2], [:c, 3], [:a, 1]]
+  #   { a: 1, b: 2, c: 3 }.in_order(:b, :d)  #=> [[:b, 2], [:a, 1], [:c, 3]]
   def in_order(*ordered)
     keys.in_order(*ordered).map { |key| [key, self[key]] }
   end

data/lib/nuggets/hash/nest_mixin.rb

@@ -45,8 +45,8 @@ module Nuggets
   # Example:
   #
   #   hash = Hash.nest(2)
-  #   hash[:foo][:bar][:a] = { :x => 1, :y => 2 }
-  #   hash[:foo][:bar][:b] = { :x => 0, :y => 3 }
+  #   hash[:foo][:bar][:a] = { x: 1, y: 2 }
+  #   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)

data/lib/nuggets/hash/unroll_mixin.rb

@@ -30,7 +30,7 @@ module Nuggets
 
   # call-seq:
   #   hash.unroll(*value_keys) => anArray
-  #   hash.unroll(*value_keys, :sort_by => ...) => anArray
+  #   hash.unroll(*value_keys, sort_by: ...) => anArray
   #   hash.unroll(*value_keys) { |value_hash| ... } => anArray
   #
   # "Unrolls" a nested hash, so that each path through _hash_ results in a
@@ -46,13 +46,13 @@ module Nuggets
   #
   # Examples:
   #
-  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll
+  #   { foo: { bar: { a: { x: 1, y: 2 }, b: { x: 0, y: 3 } } } }.unroll
   #   #=> [[:foo, :bar, :b, 3, 0], [:foo, :bar, :a, 2, 1]]
   #
-  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll(:sort_by => :to_s)
+  #   { foo: { bar: { a: { x: 1, y: 2 }, b: { x: 0, y: 3 } } } }.unroll(sort_by: :to_s)
   #   #=> [[:foo, :bar, :a, 1, 2], [:foo, :bar, :b, 0, 3]]
   #
-  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll { |data| data[:x] = nil; data[:y] *= 2 }
+  #   { foo: { bar: { a: { x: 1, y: 2 }, b: { x: 0, y: 3 } } } }.unroll { |data| data[:x] = nil; data[:y] *= 2 }
   #   #=> [[:foo, :bar, :b, 6, nil], [:foo, :bar, :a, 4, nil]]
   def unroll(*value_keys, &block)
     args = value_keys.dup

data/lib/nuggets/io/redirect_mixin.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # nuggets -- Extending Ruby                                                   #
 #                                                                             #
-# Copyright (C) 2007-2012 Jens Wille                                          #
+# Copyright (C) 2007-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -24,13 +24,11 @@
 ###############################################################################
 #++
 
-require 'nuggets/io/null_mixin'
-
 module Nuggets
   class IO
     module RedirectMixin
 
-  def redirect(target = NullMixin::NULL, mode = 'w')
+  def redirect(target = ::File::NULL, mode = 'w')
     unless target.is_a?(self.class)
       target = ::File.open(target, mode)
       close_target = true

data/lib/nuggets/log_parser/rails.rb

@@ -54,7 +54,7 @@ module Nuggets
       # Log line patterns
       ITEMS = [
         [:processing, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Processing\s+
             (\w+)                #  controller
@@ -72,23 +72,23 @@ module Nuggets
               (\w+)              #  request_method
             \]
           }xo,
-          :keys => [:controller, :action, :ip, :datetime, :request_method]
+          keys: [:controller, :action, :ip, :datetime, :request_method]
         }],
         [:session_id, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Session\sID:\s+
             (\S+)                #  sid
           }xo,
-          :keys => [:sid]
+          keys: [:sid]
         }],
         [:parameters, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Parameters:\s+
             (\{.*\})             #  params
           }xo,  #}
-          :proc => lambda { |entry, md|
+          proc: lambda { |entry, md|
             entry[:params_hash] = md[3].hash
             entry[:params] = begin
               eval("$SAFE = 3\n#{md[3].gsub(/#<.*?>/, '%q{\&}')}", nil, __FILE__, __LINE__)  # !!!
@@ -98,7 +98,7 @@ module Nuggets
           }
         }],
         [:client_info, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Client\sinfo:\s+
             UA\s+=\s+
@@ -107,18 +107,18 @@ module Nuggets
             LANG\s+=\s+
             (.*)                 #  accept_language
           }xo,
-          :keys => [:user_agent, :accept_language]
+          keys: [:user_agent, :accept_language]
         }],
         [:referer, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Referer:\s+
             (.*)                 #  referer
           }xo,
-          :keys => [:referer]
+          keys: [:referer]
         }],
         [:meta, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Meta:\s+
             User\s+=\s+
@@ -127,20 +127,20 @@ module Nuggets
             Institution\s+=\s+
             (.*)                 #  institution_id
           }xo,
-          :keys => [:user_id, :institution_id]
+          keys: [:user_id, :institution_id]
         }],
         [:stats, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Stats:\s+
             (.*)                 # flags
           }xo,
-          :proc => lambda { |entry, md|
+          proc: lambda { |entry, md|
             entry[:flags] = md[3].split(SEPARATOR_RE)
           }
         }],
         [:oauth, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             OAuth:\s+
             Token\s+=\s+
@@ -152,10 +152,10 @@ module Nuggets
             Client\s+=\s+
             (.*)                 #  client_id
           }xo,
-          :keys => [:token_type, :token, :user_id, :client_id]
+          keys: [:token_type, :token, :user_id, :client_id]
         }],
         [:benchmark, {
-          :re => %r{
+          re: %r{
             #{PREFIX_RE}         #  pid, host
             Completed\sin\s+
             (\S+)                #  runtime
@@ -185,7 +185,7 @@ module Nuggets
               (.*)               #  request_uri
             \]
           }xo,
-          :keys => [:runtime, :rendering_runtime, :db_runtime, :status, :request_uri]
+          keys: [:runtime, :rendering_runtime, :db_runtime, :status, :request_uri]
         }]
       ]
 

data/lib/nuggets/string/format.rb

@@ -0,0 +1,5 @@
+require 'nuggets/string/format_mixin'
+
+class String
+  include Nuggets::String::FormatMixin
+end

data/lib/nuggets/string/format_mixin.rb

@@ -0,0 +1,59 @@
+#--
+###############################################################################
+#                                                                             #
+# nuggets -- Extending Ruby                                                   #
+#                                                                             #
+# Copyright (C) 2007-2016 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# 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 the Free #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# nuggets is distributed in the hope that it will be useful, but WITHOUT ANY  #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with nuggets. If not, see <http://www.gnu.org/licenses/>.             #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  class String
+    module FormatMixin
+
+  PREFIX = '%'
+
+  FORMAT_RE = %r{#{PREFIX}(?:\{(.*?)\}|(.))}o
+
+  # call-seq:
+  #   str.format(hash) => aString
+  #   str.format { |directive| ... } => aString
+  #
+  # Replace format directives in _str_.
+  #
+  # If +hash+ given, uses value of directive key (String or Symbol)
+  # as replacement value. Raises KeyError if directive key not found.
+  #
+  # If block given, uses result of +directive+ yielded to block as
+  # replacement value. Raises ArgumentError if block returns no value.
+  def format(hash = nil)
+    replace = lambda { |&b| gsub(FORMAT_RE) {
+      (k = $1 || $2) == PREFIX ? k : b[k] } }
+
+    hash ? replace.() { |k| hash.fetch(k) {
+      hash.fetch(k.to_sym) { raise(KeyError, "key not found: #{k}") } } } :
+    block_given? ? replace.() { |k| yield k or
+      raise(ArgumentError, "malformed format string - #{$&}") } :
+      raise(ArgumentError, 'wrong number of arguments (given 0, expected 1)')
+  end
+
+    end
+  end
+end

data/lib/nuggets/string/highlight.rb

@@ -0,0 +1,5 @@
+require 'nuggets/string/highlight_mixin'
+
+class String
+  include Nuggets::String::HighlightMixin
+end

data/lib/nuggets/{io/null_mixin.rb → string/highlight_mixin.rb}

@@ -3,7 +3,7 @@
 #                                                                             #
 # nuggets -- Extending Ruby                                                   #
 #                                                                             #
-# Copyright (C) 2007-2014 Jens Wille                                          #
+# Copyright (C) 2007-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -24,18 +24,38 @@
 ###############################################################################
 #++
 
-require 'nuggets/ruby_mixin'
-
 module Nuggets
-  class IO
-    module NullMixin
-
-      NULL = case RubyMixin::RUBY_PLATFORM
-        when /mswin|mingw/i then 'NUL'
-        when /openvms/i     then 'NL:'
-        when /amiga/i       then 'NIL:'
-        else                     '/dev/null'
-      end.freeze
+  class String
+    module HighlightMixin
+
+  # call-seq:
+  #   str.highlight(needle[, prefix[, postfix]]) => new_string
+  #
+  # Highlight occurrences of +needle+ (String(s) and/or Regexp(s))
+  # in _str_ by surrounding them with +prefix+ and +postfix+.
+  def highlight(needle, prefix = '|', postfix = prefix)
+    offsets = []
+
+    Array(needle).each { |arg|
+      while index = index(arg, index || 0)
+        offsets << [index, index += ($& || arg).length]
+      end
+    }
+
+    flattened = [current = offsets.sort!.shift]
+
+    offsets.each { |offset|
+      i1, j1 = current
+      i2, j2 = offset
+
+      i2 > j1 ? flattened << current = offset :
+      j2 > j1 ? current[-1] = j2 : nil
+    }
+
+    dup.tap { |result| flattened.reverse_each { |i, j|
+      result.insert(j, postfix).insert(i, prefix)
+    } }
+  end
 
     end
   end

data/lib/nuggets/version.rb

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

data/spec/nuggets/array/format_spec.rb

@@ -30,7 +30,7 @@ describe Array, 'format' do
     ['',       '',      ''    ] => ''
   )
 
-  test_format({ :sep => ':' },
+  test_format({ sep: ':' },
     ['1', '2', '3', '4'] => '1:2:3:4',
     ['1', '2', '3', '' ] => '1:2:3',
     ['1', '2', '',  '4'] => '1:2:4',

data/spec/nuggets/env/set_spec.rb

@@ -12,12 +12,12 @@ describe_extended ENV, Nuggets::Env::SetMixin, true do
   end
 
   example do
-    ENV.with(:lang => 'C') { ENV['LANG'].should == 'C' }
+    ENV.with(lang: 'C') { ENV['LANG'].should == 'C' }
     ENV['LANG'].should == @original['LANG']
   end
 
   example do
-    ENV.set(:lang => 'C').to_hash.should == @original
+    ENV.set(lang: 'C').to_hash.should == @original
     ENV.to_hash.should == { 'LANG' => 'C' }
   end
 

data/spec/nuggets/hash/at_spec.rb

@@ -2,7 +2,7 @@ require 'nuggets/hash/at'
 
 describe Hash, 'at' do
 
-  let(:h) { { :a => 1, 2 => 3, nil => nil, 'foo' => %w[b a r] } }
+  let(:h) { { a: 1, 2 => 3, nil => nil, 'foo' => %w[b a r] } }
 
   example { h.first.should == { a: 1 } }
 

data/spec/nuggets/hash/deep_fetch_spec.rb

@@ -54,7 +54,7 @@ describe_extended Hash, Nuggets::Hash::DeepFetchMixin do
 
   context do
 
-    let(:hash) { { :foo => { :bar => { :baz => 42 } } } }
+    let(:hash) { { foo: { bar: { baz: 42 } } } }
 
     example do
       lambda { hash.deep_fetch('foo/bar/baz') }.should raise_error(KeyError)

data/spec/nuggets/hash/deep_merge_spec.rb

@@ -3,58 +3,58 @@ require 'nuggets/hash/deep_merge'
 describe_extended Hash, Nuggets::Hash::DeepMergeMixin do
 
   example do
-    { :a => 1 }.deep_merge(:a => 2).should == { :a => 2 }
+    { a: 1 }.deep_merge(a: 2).should == { a: 2 }
   end
 
   example do
-    { :a => 1 }.deep_merge(:b => 2).should == { :a => 1, :b => 2 }
+    { a: 1 }.deep_merge(b: 2).should == { a: 1, b: 2 }
   end
 
   example do
-    { :a => { :b => 1 } }.deep_merge(:b => 2).should == { :a => { :b => 1 }, :b => 2 }
+    { a: { b: 1 } }.deep_merge(b: 2).should == { a: { b: 1 }, b: 2 }
   end
 
   example do
-    { :a => { :b => 1 } }.deep_merge(:a => { :b => 2 }).should == { :a => { :b => 2 } }
+    { a: { b: 1 } }.deep_merge(a: { b: 2 }).should == { a: { b: 2 } }
   end
 
   example do
-    lambda { { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => 2 }) }.should raise_error(TypeError)
+    lambda { { a: { b: { c: 1 } } }.deep_merge(a: { b: 2 }) }.should raise_error(TypeError)
   end
 
   example do
-    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :c => 2 } }).should == { :a => { :b => { :c => 2 } } }
+    { a: { b: { c: 1 } } }.deep_merge(a: { b: { c: 2 } }).should == { a: { b: { c: 2 } } }
   end
 
   example do
-    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :d => 2 } }).should == { :a => { :b => { :c => 1, :d => 2 } } }
+    { a: { b: { c: 1 } } }.deep_merge(a: { b: { d: 2 } }).should == { a: { b: { c: 1, d: 2 } } }
   end
 
   example do
-    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 } }
+    { a: { b: { c: 1 } } }.deep_merge(a: { b: { c: 2 }, d: 3 }).should == { a: { b: { c: 2 }, d: 3 } }
   end
 
   example do
-    { :a => { :b => { :c => 1 }, :d => 2 } }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 } }
+    { a: { b: { c: 1 }, d: 2 } }.deep_merge(a: { b: { c: 2 }, d: 3 }).should == { a: { b: { c: 2 }, d: 3 } }
   end
 
   example do
-    { :a => { :b => { :c => 1 }, :d => 2 }, :e => 3 }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 }, :e => 3 }
+    { a: { b: { c: 1 }, d: 2 }, e: 3 }.deep_merge(a: { b: { c: 2 }, d: 3 }).should == { a: { b: { c: 2 }, d: 3 }, e: 3 }
   end
 
   example do
-    { :a => { :b => { :c => 1 } }, :d => { :e => 3 } }.deep_merge(:a => { :b => { :c => 2 } }, :d => { :e => 4 }).should == { :a => { :b => { :c => 2 } }, :d => { :e => 4 } }
+    { a: { b: { c: 1 } }, d: { e: 3 } }.deep_merge(a: { b: { c: 2 } }, d: { e: 4 }).should == { a: { b: { c: 2 } }, d: { e: 4 } }
   end
 
   context do
 
     before :each do
-      @sub_hash1 = { :b => 1 }
-      @sub_hash2 = { :b => 2 }
+      @sub_hash1 = { b: 1 }
+      @sub_hash2 = { b: 2 }
 
-      @hash1 = { :a => @sub_hash1 }
-      @hash2 = { :a => @sub_hash2 }
-      @hash3 = { :a => { :b => 2} }
+      @hash1 = { a: @sub_hash1 }
+      @hash2 = { a: @sub_hash2 }
+      @hash3 = { a: { b: 2} }
     end
 
     example do

data/spec/nuggets/hash/seen_spec.rb

@@ -25,7 +25,7 @@ describe_extended Hash, Nuggets::Hash::SeenMixin, true do
   end
 
   example do
-    hash = Hash.seen.update(:a => :b)
+    hash = Hash.seen.update(a: :b)
     hash.should be_an_instance_of(Hash)
 
     hash[:a].should == :b

data/spec/nuggets/hash/unroll_spec.rb

@@ -18,12 +18,12 @@ describe_extended Hash, Nuggets::Hash::UnrollMixin do
   end
 
   example do
-    hash = { :a => { :b => 1 } }
+    hash = { a: { b: 1 } }
     hash.unroll.should == [[:a, 1]]
   end
 
   example do
-    hash = { :a => { :b => 1, :c => 2 } }
+    hash = { a: { b: 1, c: 2 } }
 
     result = hash.unroll.first
     result.size.should == 3
@@ -33,36 +33,24 @@ describe_extended Hash, Nuggets::Hash::UnrollMixin do
     result.should include(2)
   end
 
-if RUBY_VERSION < '1.9'
-  example do
-    hash = { :a => { :b => 1, :c => 2 } }
-    lambda { hash.unroll(:sort => true) }.should raise_error(NoMethodError, /<=>/)
-  end
-
-  example do
-    hash = { :a => { :b => 1, :c => 2 } }
-    lambda { hash.unroll(:sort_by => lambda { |h| h.to_s }) }.should_not raise_error(NoMethodError)
-  end
-end
-
   example do
     hash = { 'a' => { 'b' => 1, 'c' => 2 } }
-    hash.unroll(:sort => true).should == [['a', 1, 2]]
+    hash.unroll(sort: true).should == [['a', 1, 2]]
   end
 
   example do
     hash = { 'a' => { 'b' => 1, 'c' => 2 }, 'd' => { 'b' => 0, 'c' => 3 } }
-    hash.unroll('b', 'c', :sort => true).should == [['a', 1, 2], ['d', 0, 3]]
+    hash.unroll('b', 'c', sort: true).should == [['a', 1, 2], ['d', 0, 3]]
   end
 
   example do
     hash = { 'z' => { 'a' => { 'b' => 1, 'c' => 2 }, 'd' => { 'b' => 0, 'c' => 3 } } }
-    hash.unroll('b', :sort_by => lambda { |h| h.to_s }).should == [['z', 'a', 1], ['z', 'd', 0]]
+    hash.unroll('b', sort_by: lambda { |h| h.to_s }).should == [['z', 'a', 1], ['z', 'd', 0]]
   end
 
   example do
     hash = { 'z' => { 'a' => { 'b' => 1, 'c' => 2 }, 'd' => { 'b' => 0, 'c' => 3 } } }
-    hash.unroll(:sort => true) { |h| h['b'] = nil; h['c'] *= 2 }.should == [['z', 'a', nil, 4], ['z', 'd', nil, 6]]
+    hash.unroll(sort: true) { |h| h['b'] = nil; h['c'] *= 2 }.should == [['z', 'a', nil, 4], ['z', 'd', nil, 6]]
   end
 
 end

data/spec/nuggets/object/blank_spec.rb

@@ -23,11 +23,11 @@ describe_extended Object, Nuggets::Object::BlankMixin do
     example { o.should be_vain }
   }
 
-  [['', [], [nil], {}], { :x => nil, :y => [], :z => { :zz => nil } }].each { |o|
+  [['', [], [nil], {}], { x: nil, y: [], z: { zz: nil } }].each { |o|
     example { o.should_not be_void }
   }
 
-  [['', [], [nil], {}], { :x => nil, :y => [], :z => { :zz => nil } }].each { |o|
+  [['', [], [nil], {}], { x: nil, y: [], z: { zz: nil } }].each { |o|
     example { o.should be_vain }
   }
 

data/spec/nuggets/object/singleton_class_spec.rb

@@ -2,12 +2,13 @@ require 'nuggets/object/singleton_class'
 
 describe_extended Object, Nuggets::Object::SingletonClassMixin do
 
-  objects = [Class, Object.new, Class.new, 's', [1, 2], { :a => 'b' }]
+  objects = [Class, Object.new, Class.new, 's', [1, 2], { a: 'b' }]
   objects.unshift(Object) unless %w[jruby rbx].include?(RUBY_ENGINE)
 
   objects.each { |o|
     example { o.should_not be_a_singleton_class }
-    example { lambda { o.singleton_object }.should raise_error(TypeError) }
+    example(nil, if: o != Object || RUBY_VERSION < '2.3') {
+      lambda { o.singleton_object }.should raise_error(TypeError) }
 
     s = o.singleton_class
 

data/spec/nuggets/string/format_spec.rb

@@ -0,0 +1,85 @@
+require 'nuggets/string/format'
+
+describe_extended String, Nuggets::String::FormatMixin do
+
+  example do
+    expect{'a%bc'.format}.to raise_error(ArgumentError, 'wrong number of arguments (given 0, expected 1)')
+  end
+
+  example do
+    expect('a%bc'.format('b' => 'foo')).to eq('afooc')
+  end
+
+  example do
+    expect('a%bc'.format(b: 'foo')).to eq('afooc')
+  end
+
+  example do
+    expect('a%bc'.format(b: :foo)).to eq('afooc')
+  end
+
+  example do
+    expect('a%bc'.format(b: 42)).to eq('a42c')
+  end
+
+  example do
+    expect('a%bc'.format(b: '')).to eq('ac')
+  end
+
+  example do
+    expect('a%bc'.format(b: nil)).to eq('ac')
+  end
+
+  example do
+    expect('a%{foo}c'.format('foo' => 'bar')).to eq('abarc')
+  end
+
+  example do
+    expect('a%{foo}c'.format(foo: 'bar')).to eq('abarc')
+  end
+
+  example do
+    expect('a%{foo}c'.format(foo: :bar)).to eq('abarc')
+  end
+
+  example do
+    expect(''.format({})).to eq('')
+  end
+
+  example do
+    expect('%'.format({})).to eq('%')
+  end
+
+  example do
+    expect('%%'.format({})).to eq('%')
+  end
+
+  example do
+    expect{'%a'.format({})}.to raise_error(KeyError, 'key not found: a')
+  end
+
+  example do
+    expect{'%a'.format('b' => 'foo')}.to raise_error(KeyError, 'key not found: a')
+  end
+
+  example do
+    expect{'%a'.format(Hash.new(42))}.to raise_error(KeyError, 'key not found: a')
+  end
+
+  example do
+    expect('a%bc'.format(&:upcase)).to eq('aBc')
+  end
+
+  example do
+    expect('a%bc'.format{''}).to eq('ac')
+  end
+
+  example do
+    expect{'a%bc'.format{}}.to raise_error(ArgumentError, 'malformed format string - %b')
+  end
+
+  example do
+    expect('a%bc%d%{foo}%%{baz}'.format(b: 42, d: 'D', 'foo' => :bar)).to eq('a42cDbar%{baz}')
+  end
+
+end

data/spec/nuggets/string/highlight_spec.rb

@@ -0,0 +1,43 @@
+require 'nuggets/string/highlight'
+
+describe_extended String, Nuggets::String::HighlightMixin do
+
+  example do
+    s = 'lingo go do the go go'; t = s.dup
+    expect(s.highlight('lingo')).to eq('|lingo| go do the go go')
+    expect(s).to eq(t)
+
+    expect(s.highlight(/lingo/)).to eq('|lingo| go do the go go')
+    expect(s.highlight(/l.*ngo?/)).to eq('|lingo| go do the go go')
+
+    q = ['lingo', 'go', 'go go']
+    expect(s.highlight(q)).to eq('|lingo go| do the |go go|')
+  end
+
+  example do
+    s = 'lingö go do the go go'
+    q = ['lingö', 'go', 'go go']
+    expect(s.highlight(q)).to eq('|lingö| |go| do the |go go|')
+  end
+
+  example do
+    s = 'lingo go do the go go'
+    q = ['lingo', 'go', 'go go']
+    expect(s.highlight(q, '^')).to eq('^lingo go^ do the ^go go^')
+    expect(s.highlight(q, '<', '>')).to eq('<lingo go> do the <go go>')
+    expect(s.highlight(q, '<i>', '</i>')).to eq('<i>lingo go</i> do the <i>go go</i>')
+  end
+
+  example do
+    s = 'The fox went out on a chilly night'
+    q = [/[eo]n/]
+    expect(s.highlight(q)).to eq('The fox w|en|t out |on| a chilly night')
+    q << 'went'
+    expect(s.highlight(q)).to eq('The fox |went| out |on| a chilly night')
+    q << /ou.*a/
+    expect(s.highlight(q)).to eq('The fox |went| |out on a| chilly night')
+    q << 'went out'
+    expect(s.highlight(q)).to eq('The fox |went out on a| chilly night')
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuggets
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -205,8 +205,6 @@ files:
 - lib/nuggets/io/interact.rb
 - lib/nuggets/io/interact_mixin.rb
 - lib/nuggets/io/modes.rb
-- lib/nuggets/io/null.rb
-- lib/nuggets/io/null_mixin.rb
 - lib/nuggets/io/redirect.rb
 - lib/nuggets/io/redirect_mixin.rb
 - lib/nuggets/lazy_attr.rb
@@ -258,6 +256,10 @@ files:
 - lib/nuggets/string/case.rb
 - lib/nuggets/string/evaluate.rb
 - lib/nuggets/string/evaluate_mixin.rb
+- lib/nuggets/string/format.rb
+- lib/nuggets/string/format_mixin.rb
+- lib/nuggets/string/highlight.rb
+- lib/nuggets/string/highlight_mixin.rb
 - lib/nuggets/string/msub.rb
 - lib/nuggets/string/nsub.rb
 - lib/nuggets/string/sub_with_md.rb
@@ -339,6 +341,8 @@ files:
 - spec/nuggets/string/capitalize_first_spec.rb
 - spec/nuggets/string/case_spec.rb
 - spec/nuggets/string/evaluate_spec.rb
+- spec/nuggets/string/format_spec.rb
+- spec/nuggets/string/highlight_spec.rb
 - spec/nuggets/string/msub_spec.rb
 - spec/nuggets/string/nsub_spec.rb
 - spec/nuggets/string/sub_with_md_spec.rb
@@ -354,14 +358,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  nuggets-1.4.0 [2015-10-02]:
+  nuggets-1.5.0 [2016-04-19]:
 
-  * Added File.open_file.
-  * Added Array#extract_options.
+  * Added String#format.
+  * Added String#highlight.
+  * Dropped IO::NULL, available as File::NULL since Ruby 1.9.3.
 
 rdoc_options:
 - "--title"
-- nuggets Application documentation (v1.4.0)
+- nuggets Application documentation (v1.5.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -382,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Extending Ruby.

data/lib/nuggets/io/null.rb

@@ -1,5 +0,0 @@
-require 'nuggets/io/null_mixin'
-
-class IO
-  include Nuggets::IO::NullMixin
-end