ruby-nuggets 0.9.8.1 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20e3a6fc4cdbc194e6fae2ce281cba22be27d19b
-  data.tar.gz: f96c5db576f411f940de1effc136ba022699a13f
+  metadata.gz: efd0fc2a1e207d02a5c1615f520546f04670a134
+  data.tar.gz: 34a92b46ae4b4201598feef5fb9ff329fba2f98d
 SHA512:
-  metadata.gz: d6b4aa7f85cb7cd2ca92ffe24cac338dcb45dd7264b63e5beb855a7d62b45da42c4779111164a08f6bea6a109c71495e4363c92b2f57cbb3f8b15ef7e8856f78
-  data.tar.gz: aff5162458b1fa163a0a8142ddf16720ec0a08c975535d3e2a1f0c312015e0979197a25451aba6807a08c44463bbfdf344f2b582498393a6d59e2e2bb6581546
+  metadata.gz: bdaa6f53862c08efa393837dbdd2dcabea561911141ceecdeec1221e0866ed531da04c15bc850d72d3ec0a82b4ace4066b9832bb3c2368fcddc002f5453a5f32
+  data.tar.gz: a9db082c3a292393906f1c1c8151aff57cf719abd9c36ebf698808363105dfcad662c506efd4b4aa498670329a9992bf342012a987cb92ca51b1cec61b12e6a6

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-nuggets version 0.9.8
+This documentation refers to ruby-nuggets version 0.9.9
 
 
 == DESCRIPTION

data/Rakefile

@@ -18,9 +18,6 @@ begin
        #'amatch',         # enumerable/agrep
         'mime-types',     # content_type
         'open4',          # ruby
-       #'rbzip2',         # rdf/compression
-       #'rdf',            # rdf/{prefix,uri,compression}
-       #'rdf-turtle',     # rdf/turtle
        #'ruby-filemagic'  # content_type
       ]
     }
@@ -39,3 +36,12 @@ task 'spec:isolated' do
     system($0, *ARGV)
   }
 end
+
+if RUBY_PLATFORM == 'java'
+  task :spec => :enable_objspace
+
+  task :enable_objspace do
+    k, v = 'JRUBY_OPTS', '-X+O'
+    ENV[k] ? ENV[k] += " #{v}" : ENV[k] = v
+  end
+end

data/lib/nuggets/all.rb

@@ -29,7 +29,7 @@ base = ::File.dirname(__FILE__)
 base_re = ::Regexp.escape(base)
 
 ::Dir[::File.join(base, %w[* ** *.rb])].sort.each { |path|
-  next if path =~ /_mixin\.rb\z/
+  next if path.include?('/util/') || path.end_with?('_mixin.rb')
 
   ext_re = ::Regexp.escape(::File.extname(path))
   require path.sub(/#{base_re}(.*)#{ext_re}/, 'nuggets\1')

data/lib/nuggets/array/combination.rb

@@ -38,14 +38,9 @@ class Array
     # If no sizes are given, produce all!
     sizes = (0..size).to_a.reverse if sizes.empty?
 
-    # Container for our combinations
-    combinations = []
-
-    # Collect combinations and, optionally, yield to block.
-    collect_and_yield = lambda { |combination|
+    combinations, collect_and_yield = [], lambda { |combination|
+      yield combination if block_given?
       combinations << combination
-
-      yield(combination) if block_given?
     }
 
     sizes.each { |n|
@@ -62,25 +57,7 @@ class Array
       end
     }
 
-    # Anyway, return what we've found...
     combinations
   end
 
 end
-
-if $0 == __FILE__
-  a = %w[a b c d]
-  p a
-
-  p a.comb(3)
-  a.comb(3) { |x|
-    p x
-  }
-
-  p a.comb(4, 2, 4)
-
-  p a.comb
-  a.comb { |x|
-    p x
-  }
-end

data/lib/nuggets/array/flatten_once.rb

@@ -51,18 +51,7 @@ class Array
   #
   # Destructive version of #flatten_once.
   def flatten_once!
-    replace flatten_once
+    replace(flatten_once)
   end
 
 end
-
-if $0 == __FILE__
-  a = [1, 2, [3, 4, 5], 6, [7, [8, 9]]]
-  p a
-
-  p a.flatten
-  p a.flatten_once
-
-  a.flatten_once!
-  p a
-end

data/lib/nuggets/array/format.rb

@@ -44,9 +44,7 @@ class Array
     opts = { :sep => ', ' }
     opts.update(pop) if last.is_a?(::Hash)
 
-    default = lambda { |n|
-      ['%s'] * n * opts[:sep]
-    }
+    default = lambda { |n| ['%s'] * n * opts[:sep] }
 
     case args
       when ::String
@@ -56,9 +54,7 @@ class Array
         i = 0
         [*args].comb { |x|
           return (self[i] || default[x.size]) % x unless
-            x.empty? || x.any? { |y|
-              y.nil? || y.empty?
-            }
+            x.empty? || x.any? { |y| y.nil? || y.empty? }
 
           i += 1
         }
@@ -68,57 +64,3 @@ class Array
   end
 
 end
-
-if $0 == __FILE__
-  [[], 'string', ''].each { |x|
-    p x
-    puts '>> ' << ['"%s"'] % x
-  }
-
-  [ ['place', 'country'],
-    ['place', ''       ],
-    ['',      'country'],
-    ['',      ''       ]
-  ].each { |x|
-    p x
-    puts '>> ' << ['%s, (%s)', '%s', '(%s)'] % x
-  }
-
-  puts '=' * 80
-
-  [ ['author', 'title', 'year'],
-    ['author', 'title', ''    ],
-    ['author', '',      'year'],
-    ['',       'title', 'year'],
-    ['author', ''     , ''    ],
-    ['',       'title', ''    ],
-    ['',       '',      'year'],
-    ['',       '',      ''    ]
-  ].each { |x|
-    p x
-    puts '>> ' << ['%s: %s (%s)', '%s: %s', '%s (%s)', '%s (%s)'] % x
-  }
-
-  puts '=' * 80
-
-  [ ['1', '2', '3', '4'],
-    ['1', '2', '3', '' ],
-    ['1', '2', '',  '4'],
-    ['1', '',  '3', '4'],
-    ['',  '2', '3', '4'],
-    ['1', '2', '',  '' ],
-    ['1', '',  '3', '' ],
-    ['1', '',  '',  '4'],
-    ['',  '2', '3', '' ],
-    ['',  '2', '',  '4'],
-    ['',  '',  '3', '4'],
-    ['1', '',  '',  '' ],
-    ['',  '2', '',  '' ],
-    ['',  '',  '3', '' ],
-    ['',  '',  '',  '4'],
-    ['',  '',  '',  '' ]
-  ].each { |x|
-    p x
-    puts '>> ' << [{ :sep => ':' }] % x
-  }
-end

data/lib/nuggets/array/in_order.rb

@@ -45,18 +45,7 @@ class Array
   #
   # Destructive version of #in_order.
   def in_order!(*ordered)
-    replace in_order(*ordered)
+    replace(in_order(*ordered))
   end
 
 end
-
-if $0 == __FILE__
-  a = [:created_at, :email, :login, :updated_at]
-  p a
-
-  p a.in_order(:login, :email)
-  p a.in_order(:email, :address)
-
-  a.in_order!(:login, :email)
-  p a
-end

data/lib/nuggets/array/monotone.rb

@@ -31,13 +31,17 @@ class Array
   #   array.monotone?(operator) => +true+ or +false+
   #
   # Check whether _array_ is monotone according to +operator+.
-  def monotone?(operator)
-    inject { |a, b|
-      return false unless a.send(operator, b)
-      b
-    }
+  def monotone?(operator = nil)
+    if [nil, true, false].include?(operator)
+      ascending?(operator) || descending?(operator)
+    else
+      inject { |a, b|
+        return false unless a.send(operator, b)
+        b
+      }
 
-    true
+      true
+    end
   end
   alias_method :monotonic?, :monotone?
 
@@ -78,24 +82,3 @@ class Array
   alias_method :strictly_decreasing?, :strictly_descending?
 
 end
-
-if $0 == __FILE__
-  a = [1, 2, 3, 4]
-  p a
-
-  p a.ascending?           # => true
-  p a.strictly_ascending?  # => true
-  p a.descending?          # => false
-
-  b = [1, 2, 4, 3]
-  p b
-
-  p b.ascending?           # => false
-  p b.descending?          # => false
-
-  c = [1, 2, 4, 4]
-  p c
-
-  p c.ascending?           # => true
-  p c.strictly_ascending?  # => false
-end

data/lib/nuggets/array/only.rb

@@ -36,22 +36,7 @@ class Array
   #
   # Idea stolen from Gavin Sinclair's Ruby Extensions Project.
   def only(relax = size == 1)
-    raise ::IndexError, 'not a single-element array' unless relax
-    first
+    relax ? first : raise(::IndexError, 'not a single-element array')
   end
 
 end
-
-if $0 == __FILE__
-  [[5], [1, 2, 3], []].each { |a|
-    p a
-
-    begin
-      p a.only
-    rescue ::IndexError => err
-      warn err
-    end
-
-    p a.only(true)
-  }
-end

data/lib/nuggets/array/shuffle.rb

@@ -123,7 +123,7 @@ if $0 == __FILE__
     x2 = 0
     score.sort.each { |key, value|
       x = value - e
-      y = x**2 / e
+      y = x ** 2 / e
       #puts '%s: %d (% .2f/%.2f)' % [key, value, x, y]
 
       x2 += y

data/lib/nuggets/array/to_hash.rb

@@ -59,28 +59,7 @@ class Array
 
     hash
   end
-  alias_method :to_h, :to_hash
-
-end
 
-if $0 == __FILE__
-  a = [[:a, 1], [:b, 2], [:c, 3]]
-  p a
-  p a.to_h
-
-  b = [[:a, [1, 2]], [:b, 3], [[:c, :d], [4, [5, 6]]]]
-  p b
-  p b.to_h
-
-  c = %w[a b c d]
-  p c
-  p c.to_h
-  p c.to_h(1)
-  p c.to_h { nil }
+  alias_method :to_h, :to_hash
 
-  h = { :a => 1, :b => [2, 3], :c => { :d => 4}}
-  p h
-  p h.to_a
-  p h.to_a.to_h
-  p h.to_a.to_h == h
 end

data/lib/nuggets/cli.rb

@@ -2,7 +2,7 @@ begin
   require 'cyclops'
   module Nuggets; CLI = ::Cyclops; end
 
-  warn "#{__FILE__}: Nuggets::CLI is deprecated, use Cyclops instead."
+  warn "#{__FILE__}: Nuggets::CLI is deprecated, use Cyclops instead." unless ENV['NUGGETS_DEPRECATED_CLI']
 rescue LoadError => err
-  warn "#{__FILE__}: Nuggets::CLI is no longer available; install `cyclops' instead. (#{err})"
+  warn "#{__FILE__}: Nuggets::CLI is no longer available; install `cyclops' instead. (#{err})" unless ENV['NUGGETS_DEPRECATED_CLI']
 end

data/lib/nuggets/content_type.rb

@@ -25,14 +25,9 @@
 ###############################################################################
 #++
 
-begin
-  require 'rubygems'
-rescue ::LoadError
-end
-
 begin
   require 'filemagic/ext'
-rescue ::LoadError
+rescue LoadError
   def File.content_type(path)  # :nodoc:
     nil
   end
@@ -40,7 +35,7 @@ end
 
 begin
   require 'nuggets/uri/content_type'
-rescue ::LoadError
+rescue LoadError
   module URI
     def self.content_type(path)  # :nodoc:
       nil
@@ -50,7 +45,7 @@ end
 
 begin
   require 'mime/types'
-rescue ::LoadError
+rescue LoadError
   module MIME    # :nodoc:
     class Types  # :nodoc:
       def self.of(path)

data/lib/nuggets/dotted_decimal.rb

@@ -58,21 +58,3 @@ class Array
   end
 
 end
-
-if $0 == __FILE__
-  [2294967042, 4294967040].each { |i|
-    p i.to_binary_s(32)
-    p i.to_dotted_decimal
-  }
-
-  puts '#' * 34
-
-  %w[77.47.161.3 196.101.53.1].each { |s|
-    p s
-    p s.from_dotted_decimal.to_binary_s(32)
-  }
-
-  a = %w[77.47.161.3 196.101.53.1 77.47.161.11]
-  p a.sort
-  p a.sort_by_dotted_decimal
-end

data/lib/nuggets/enumerable/all_any_extended.rb

@@ -65,30 +65,3 @@ module Enumerable
   end
 
 end
-
-if $0 == __FILE__
-  e = %w[quux quuux quix]
-  p e
-
-  p e.all?(::String)
-  p e.any?(::Numeric)
-
-  e = [:one, 'c', nil, 88]
-  p e
-
-  p e.all?(::Object)
-  p e.any?(::NilClass)
-
-  begin
-    e.any?(::NilClass) { |i| i.nil? }
-  rescue ::ArgumentError => err
-    puts "#{err.backtrace.first}: #{err} (#{err.class})"
-  end
-
-  e = [0, 10, 20]
-  p e
-
-  p e.any?(9..99)
-  p e.any?(9, :<)
-  p e.any? { |i| i < 9 }
-end

data/lib/nuggets/enumerable/minmax.rb

@@ -87,9 +87,8 @@ module Enumerable
   #
   # Maximum #minmax. If +what+ is omitted, or +nil+, the original Enumerable#max
   # is called.
-  def max(what = nil)
-    what ? minmax(:max, what) : block_given? ?
-      _nuggets_original_max { |*a| yield(*a) } : _nuggets_original_max
+  def max(what = nil, &block)
+    what ? minmax(:max, what) : _nuggets_original_max(&block)
   end
 
   # call-seq:
@@ -97,28 +96,8 @@ module Enumerable
   #
   # Minimum #minmax. If +what+ is omitted, or +nil+, the original Enumerable#min
   # is called.
-  def min(what = nil)
-    what ? minmax(:min, what) : block_given? ?
-      _nuggets_original_min { |*a| yield(*a) } : _nuggets_original_min
+  def min(what = nil, &block)
+    what ? minmax(:min, what) : _nuggets_original_min(&block)
   end
 
 end
-
-if $0 == __FILE__
-  e = %w[quux quuux quix]
-  p e
-
-  p e.max
-  p e.max_by(:length)
-  p e.max(:length)
-
-  e = [3, 222, 45]
-  p e
-
-  # the last digit counts ;-)
-  l = lambda { |i| i.to_s.split(//).last.to_i }
-
-  p e.max
-  p e.max_by(l)
-  p e.max(l)
-end

data/lib/nuggets/hash/at.rb

@@ -34,15 +34,10 @@ class Hash
   #
   # Returns the key/value pair of _hash_ at key position +what+. Remember that
   # hashes might not have the intended (or expected) order in pre-1.9 Ruby.
-  def at(what)
+  def at(what, &block)
     return {} if empty?
 
-    key = case what
-      when ::Integer
-        keys[what]
-      else
-        block_given? ? keys.send(*what) { |*a| yield(*a) } : keys.send(*what)
-    end
+    key = what.is_a?(::Integer) ? keys[what] : keys.send(*what, &block)
 
     { key => self[key] }
   end
@@ -72,16 +67,3 @@ class Hash
   end
 
 end
-
-if $0 == __FILE__
-  h = { :a => 1, 2 => 3, nil => nil, 'foo' => %w[b a r]}
-  p h
-
-  p h.first
-  p h.last
-  p h.rand
-
-  p h.at(0)
-  p h.at(1)
-  p h.at(-1)
-end

data/lib/nuggets/hash/deep_fetch.rb

@@ -0,0 +1,5 @@
+require 'nuggets/hash/deep_fetch_mixin'
+
+class Hash
+  include Nuggets::Hash::DeepFetchMixin
+end

data/lib/nuggets/hash/deep_fetch_mixin.rb

@@ -0,0 +1,75 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of ruby-nuggets, some extensions to the Ruby programming        #
+# language.                                                                   #
+#                                                                             #
+# Copyright (C) 2007-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# ruby-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.                                                  #
+#                                                                             #
+# ruby-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 ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  class Hash
+    module DeepFetchMixin
+
+  # call-seq:
+  #   hash.deep_fetch(path[, separator]) => anObject
+  #   hash.deep_fetch(path[, separator]) { |key| ... } => anObject
+  #
+  # Recursively fetches keys in +path+, separated by +separator+
+  # if +path+ is not an array, from _hash_. Maps each individual
+  # key according to the block if provided.
+  #
+  # Examples:
+  #
+  #   hash = { 'foo' => { 'bar' => { 'baz' => 42 }, 'bay' => 23 } }
+  #   hash.deep_fetch('foo/bar/baz') #=> 42
+  #   hash.deep_fetch('foo/bar/bax') #=> nil
+  #   hash.deep_fetch('foo/bax/baz') #=> KeyError
+  #   hash.deep_fetch('foo/bay/baz') #=> TypeError
+  #   hash % 'foo/bar/baz' #=> 42
+  #   hash % %w[foo bar baz] #=> 42
+  #
+  #   hash = { foo: { bar: { baz: 42 } } }
+  #   hash.deep_fetch('foo/bar/baz', &:to_sym) #=> 42
+  #   hash % [:foo, :bar, :baz] #=> 42
+  def deep_fetch(path, separator = '/')
+    keys = path.is_a?(::Array) ? path : path.split(separator)
+    raise ::ArgumentError, 'no keys given' if keys.empty?
+
+    hash, klass = self, self.class
+
+    loop {
+      key = keys.shift
+      key = yield key if block_given?
+
+      return hash[key] if keys.empty?
+
+      unless (hash = hash.fetch(key)).is_a?(klass)
+        raise ::TypeError, '%p: %s expected, got %s' % [key, klass, hash.class]
+      end
+    }
+  end
+
+  alias_method :%, :deep_fetch
+
+    end
+  end
+end

data/lib/nuggets/hash/in_order.rb

@@ -42,11 +42,3 @@ class Hash
   end
 
 end
-
-if $0 == __FILE__
-  a = { :a => 1, :b => 2, :c => 3 }
-  p a
-
-  p a.in_order(:b, :c)
-  p a.in_order(:b, :d)
-end

data/lib/nuggets/hash/insert.rb

@@ -47,19 +47,8 @@ class Hash
   #   hash.insert!(other) { |key, old_value, new_value| ... } => hash
   #
   # Destructive version of #insert.
-  def insert!(other)
-    replace block_given? ? insert(other) { |*a| yield(*a) } : insert(other)
+  def insert!(other, &block)
+    replace(insert(other, &block))
   end
 
 end
-
-if $0 == __FILE__
-  h = { :a => 0, :b => { :b1 => 1, :b2 => 2 } }
-  p h
-
-  p h.insert(:a => -1)
-  p h.insert(:b => { :b3 => 3 })
-
-  h.insert!(:b => { :b0 => 0 })
-  p h
-end

data/lib/nuggets/hash/only.rb

@@ -36,9 +36,8 @@ class Hash
   # Returns the only key/value pair of _hash_. Raises an IndexError if _hash_'s
   # size is not 1, unless parameter +true+ is passed.
   def only(relax = size == 1, split = false)
-    raise ::IndexError, 'not a single-element hash' unless relax
-
-    split ? Array(*first) : first
+    relax ? split ? Array(*first) : first :
+      raise(::IndexError, 'not a single-element hash')
   end
 
   # call-seq:
@@ -52,18 +51,3 @@ class Hash
   end
 
 end
-
-if $0 == __FILE__
-  [{ :a => 5 }, { 1 => 2, 3 => 4 }, {}].each { |h|
-    p h
-
-    begin
-      p h.only
-      p h.only_pair
-    rescue ::IndexError => err
-      warn err
-    end
-
-    p h.only(true)
-  }
-end

data/lib/nuggets/i18n.rb

@@ -136,7 +136,7 @@ class String
       # But:
       #   'SÖS' => 'SOES' (not 'SOeS'!)
       if s.length > 1
-        t = $'[0..0]
+        t = $'[0, 1]
         s[1..-1] = s[1..-1].downcase if t == t.downcase
       end
 
@@ -154,12 +154,3 @@ class String
   end
 
 end
-
-if $0 == __FILE__
-  s = 'Äh, Rüby iß sö cüül, nö? SÖS!'
-  p s
-  p s.replace_diacritics
-
-  s.replace_diacritics!
-  p s
-end