ruby-nuggets 0.6.2 → 0.6.3

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-nuggets version 0.6.2
+This documentation refers to ruby-nuggets version 0.6.3
 
 
 == DESCRIPTION
@@ -47,7 +47,7 @@ Rubyforge project:: <http://rubyforge.org/projects/prometheus>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2009 Jens Wille
+Copyright (C) 2007-2010 Jens Wille
 
 ruby-nuggets is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

data/Rakefile

@@ -1,25 +1,25 @@
+require %q{lib/nuggets/version}
+
 begin
   require 'hen'
+
+  Hen.lay! {{
+    :rubyforge => {
+      :project => %q{prometheus},
+      :package => %q{ruby-nuggets}
+    },
+
+    :gem => {
+      :version     => Nuggets::VERSION,
+      :summary     => 'Some extensions to the Ruby programming language.',
+      :files       => FileList['lib/**/*.rb'].to_a,
+      :extra_files => FileList['[A-Z]*'].to_a
+    }
+  }}
 rescue LoadError
   abort "Please install the 'hen' gem first."
 end
 
-require 'lib/nuggets/version'
-
-Hen.lay! {{
-  :rubyforge => {
-    :project => %q{prometheus},
-    :package => %q{ruby-nuggets}
-  },
-
-  :gem => {
-    :version     => Nuggets::VERSION,
-    :summary     => 'Some extensions to the Ruby programming language.',
-    :files       => FileList['lib/**/*.rb'].to_a,
-    :extra_files => FileList['[A-Z]*'].to_a
-  }
-}}
-
 desc "Run all specs in isolation"
 task 'spec:isolated' do
   ARGV.delete('spec:isolated')

data/lib/nuggets/hash/unroll_mixin.rb

@@ -59,29 +59,23 @@ module Nuggets
     args = value_keys.dup
     options = value_keys.last.is_a?(::Hash) ? value_keys.pop : {}
 
-    do_sort = if options.has_key?(:sort_by)
+    sort_proc = if options.has_key?(:sort_by)
       lambda { sort_by(&options[:sort_by]) }
     elsif options.has_key?(:sort)
-      sort_opt = options[:sort]
-
-      if sort_opt == true
-        lambda { sort }
-      elsif sort_opt.respond_to?(:to_proc)
-        lambda { sort(&sort_opt) }
-      end
+      options[:sort] == true ? lambda { sort } : lambda { sort(&options[:sort]) }
     end
 
     rows = []
 
     if values.first.is_a?(self.class)  # if any is, then all are
-      (do_sort ? do_sort.call : self).each { |key, value|
+      (sort_proc ? sort_proc.call : self).each { |key, value|
         value.unroll(*args, &block).each { |row| rows << [key, *row] }
       }
     else
       block[self] if block
 
       rows << if value_keys.empty?
-        do_sort ? do_sort.call.map { |key, value| value } : values
+        sort_proc ? sort_proc.call.map { |key, value| value } : values
       else
         values_at(*value_keys)
       end

data/lib/nuggets/string/msub.rb

@@ -4,7 +4,7 @@
 # A component of ruby-nuggets, some extensions to the Ruby programming        #
 # language.                                                                   #
 #                                                                             #
-# Copyright (C) 2007 Jens Wille                                               #
+# Copyright (C) 2007-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -40,8 +40,9 @@ class String
   # substitution]</tt> pairs, or, simply, a hash. Note that, when using a hash,
   # the ordering of how substitutions are processed might differ from what you
   # intended -- instead use an array when order matters. +pattern+ can be a
-  # string or a regexp, +substitution+ may contain string expressions (cf.
-  # #evaluate).
+  # string or a regexp, +substitution+ can be a string (which may contain string
+  # expressions; cf. #evaluate), a proc (which will be call()ed), or any object
+  # really (which will be converted into a string).
   def msub(*substitutions)
     (_dup = dup).msub!(*substitutions) || _dup
   end
@@ -51,15 +52,12 @@ class String
   #
   # Destructive version of #msub.
   def msub!(*substitutions)
-    substitutions = substitutions.first if substitutions.first.is_a?(Hash)
-
-    binding = substitutions.is_a?(Hash) ? substitutions.delete(:__binding__) :
-      substitutions.last.is_a?(Hash) ? substitutions.pop[:__binding__] : nil
-    binding ||= Kernel.binding
+    options = substitutions.last.is_a?(Hash) ? substitutions.pop : {}
+    binding = options.delete(:__binding__) || Kernel.binding
 
     keys, subs, cache = [], [], {}
 
-    substitutions.each { |key, value|
+    substitutions.concat(options.to_a).each { |key, value|
       key = Regexp.new(Regexp.escape(key)) unless key.is_a?(Regexp)
 
       keys << key
@@ -68,8 +66,18 @@ class String
 
     gsub!(Regexp.union(*keys)) { |match|
       cache[match] ||= begin
-        eval("__match__ = #{match.inspect}", binding)
-        subs.find { |key, _| key =~ match }.last.evaluate(binding)
+        value = subs.find { |key, _| key =~ match }.last
+
+        if value.respond_to?(:evaluate)
+          # make match available for string evaluation
+          eval("__match__ = #{match.inspect}", binding)
+
+          value.evaluate(binding)
+        elsif value.respond_to?(:call)
+          value.call(match)
+        else
+          value
+        end
       end
     }
   end
@@ -87,12 +95,9 @@ if $0 == __FILE__
   p s
 
   t = '!!!'
-  begin
-    p s.msub('r' => '???', 'z' => '#{t}')
-  rescue NameError => err
-    warn err
-  end
+  begin; p s.msub('r' => '???', 'z' => '#{t}'); rescue NameError => err; warn err; end
   p s.msub('r' => '???', 'z' => '#{t}', :__binding__ => binding)
 
   p s.msub(/[A-Z]/ => '#{__match__.downcase}', :__binding__ => binding)
+  p s.msub(/[A-Z]/ => lambda { |match| match.downcase })
 end

data/lib/nuggets/util/ansicolor2css.rb

@@ -4,7 +4,7 @@
 # A component of ruby-nuggets, some extensions to the Ruby programming        #
 # language.                                                                   #
 #                                                                             #
-# Copyright (C) 2007-2008 Jens Wille                                          #
+# Copyright (C) 2007-2010 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -31,14 +31,8 @@ module Util
 
     extend self
 
-    COLOUR_RE = %r{\e\[((?:[0-9]|[34][0-7])(?:;(?:[0-9]|[34][0-7]))*)m}
-
-    OPEN  = '<span style="'.freeze
-    OPENC = '">'.freeze
-    CLOSE = '</span>'.freeze
-
     ATTRIBUTES = {
-       '0' => CLOSE,                            # clear
+       '0' => nil,                              # clear
        '1' => 'font-weight: bold',              # bold
        '2' => '',                               # dark
        '3' => 'font-style: italic',             # italic -- not widely implemented
@@ -66,15 +60,31 @@ module Util
       '47' => 'background-color: white'         # on white
     }
 
+    ATTRIBUTES_RE = Regexp.union(*ATTRIBUTES.keys)
+
+    DELIMITER = ';'
+
+    COLOR_RE = %r{
+      \e \[ ( #{ATTRIBUTES_RE} (?: #{DELIMITER} #{ATTRIBUTES_RE} )* ) m
+    }x
+
+    STYLE = '<span style="%s">'
+    CLEAR = '</span>'
+
     def convert(string)
-      string.gsub(COLOUR_RE) {
-        subst, attrs = '', $1.split(';')
+      string.gsub(COLOR_RE) { format($1.split(DELIMITER).uniq) }
+    end
 
-        subst << CLOSE if attrs.delete('0')
-        subst << OPEN << attrs.map { |c| ATTRIBUTES[c] }.join('; ') << OPENC unless attrs.empty?
+    def format(attributes)
+      "#{clear(attributes)}#{style(attributes) if attributes.any?}"
+    end
 
-        subst
-      }
+    def clear(attributes)
+      CLEAR if attributes.delete('0')
+    end
+
+    def style(attributes)
+      STYLE % attributes.map { |code| ATTRIBUTES[code] }.join('; ')
     end
 
   end
@@ -87,4 +97,6 @@ class String
     Util::ANSIColor2CSS.convert(self)
   end
 
+  alias_method :ansicolour2css, :ansicolor2css
+
 end

data/lib/nuggets/version.rb

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nuggets
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 +01:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,135 +30,141 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/nuggets/env/user_home.rb
-- lib/nuggets/env/user_home_mixin.rb
-- lib/nuggets/env/user_encoding.rb
-- lib/nuggets/env/set_mixin.rb
-- lib/nuggets/env/user_encoding_mixin.rb
-- lib/nuggets/env/set.rb
-- lib/nuggets/numeric/limit.rb
-- lib/nuggets/numeric/to_multiple.rb
-- lib/nuggets/numeric/between.rb
-- lib/nuggets/numeric/duration.rb
-- lib/nuggets/numeric/signum.rb
-- lib/nuggets/array/to_hash.rb
-- lib/nuggets/array/variance.rb
-- lib/nuggets/array/runiq_mixin.rb
+- lib/nuggets.rb
+- lib/nuggets/integer/to_binary_s.rb
+- lib/nuggets/integer/factorial.rb
+- lib/nuggets/integer/length_mixin.rb
+- lib/nuggets/integer/length.rb
+- lib/nuggets/util/added_methods/init.rb
+- lib/nuggets/util/i18n.rb
+- lib/nuggets/util/dotted_decimal.rb
+- lib/nuggets/util/content_type.rb
+- lib/nuggets/util/ansicolor2css.rb
+- lib/nuggets/util/added_methods.rb
 - lib/nuggets/array/shuffle.rb
 - lib/nuggets/array/variance_mixin.rb
-- lib/nuggets/array/standard_deviation_mixin.rb
-- lib/nuggets/array/limit.rb
 - lib/nuggets/array/format.rb
+- lib/nuggets/array/to_hash.rb
+- lib/nuggets/array/rand.rb
+- lib/nuggets/array/runiq.rb
 - lib/nuggets/array/monotone.rb
-- lib/nuggets/array/only.rb
+- lib/nuggets/array/combination.rb
 - lib/nuggets/array/flatten_once.rb
-- lib/nuggets/array/runiq.rb
+- lib/nuggets/array/standard_deviation_mixin.rb
+- lib/nuggets/array/variance.rb
+- lib/nuggets/array/limit.rb
 - lib/nuggets/array/standard_deviation.rb
-- lib/nuggets/array/rand.rb
-- lib/nuggets/array/combination.rb
 - lib/nuggets/array/limit_mixin.rb
 - lib/nuggets/array/in_order.rb
-- lib/nuggets/hash/unroll_mixin.rb
-- lib/nuggets/hash/only.rb
-- lib/nuggets/hash/at.rb
-- lib/nuggets/hash/insert.rb
+- lib/nuggets/array/runiq_mixin.rb
+- lib/nuggets/array/only.rb
+- lib/nuggets/proc/bind_mixin.rb
+- lib/nuggets/proc/bind.rb
 - lib/nuggets/hash/nest_mixin.rb
+- lib/nuggets/hash/insert.rb
 - lib/nuggets/hash/unroll.rb
+- lib/nuggets/hash/unroll_mixin.rb
 - lib/nuggets/hash/nest.rb
+- lib/nuggets/hash/at.rb
 - lib/nuggets/hash/in_order.rb
-- lib/nuggets/enumerable/agrep.rb
+- lib/nuggets/hash/only.rb
 - lib/nuggets/enumerable/all_any_extended.rb
 - lib/nuggets/enumerable/minmax.rb
-- lib/nuggets/io/agrep.rb
-- lib/nuggets/io/modes.rb
-- lib/nuggets/all.rb
-- lib/nuggets/all_mixins.rb
-- lib/nuggets/uri/content_type.rb
-- lib/nuggets/uri/exist.rb
-- lib/nuggets/uri/content_type_mixin.rb
-- lib/nuggets/uri/exist_mixin.rb
-- lib/nuggets/string/msub.rb
+- lib/nuggets/enumerable/agrep.rb
+- lib/nuggets/tempfile/open.rb
+- lib/nuggets/file/which.rb
+- lib/nuggets/file/which_mixin.rb
+- lib/nuggets/numeric/between.rb
+- lib/nuggets/numeric/signum.rb
+- lib/nuggets/numeric/limit.rb
+- lib/nuggets/numeric/duration.rb
+- lib/nuggets/numeric/to_multiple.rb
+- lib/nuggets/string/xor_mixin.rb
 - lib/nuggets/string/capitalize_first.rb
-- lib/nuggets/string/wc_mixin.rb
 - lib/nuggets/string/evaluate.rb
+- lib/nuggets/string/wc_mixin.rb
+- lib/nuggets/string/nsub.rb
+- lib/nuggets/string/xor.rb
 - lib/nuggets/string/case.rb
+- lib/nuggets/string/msub.rb
 - lib/nuggets/string/wc.rb
 - lib/nuggets/string/sub_with_md.rb
-- lib/nuggets/string/nsub.rb
-- lib/nuggets/string/xor_mixin.rb
-- lib/nuggets/string/xor.rb
 - lib/nuggets/string/word_wrap.rb
-- lib/nuggets/integer/length.rb
-- lib/nuggets/integer/to_binary_s.rb
-- lib/nuggets/integer/length_mixin.rb
-- lib/nuggets/integer/factorial.rb
-- lib/nuggets/object/singleton_class_mixin.rb
-- lib/nuggets/object/uniclass.rb
+- lib/nuggets/io/agrep.rb
+- lib/nuggets/io/modes.rb
+- lib/nuggets/env/user_home_mixin.rb
+- lib/nuggets/env/set.rb
+- lib/nuggets/env/user_encoding_mixin.rb
+- lib/nuggets/env/set_mixin.rb
+- lib/nuggets/env/user_home.rb
+- lib/nuggets/env/user_encoding.rb
+- lib/nuggets/all_mixins.rb
+- lib/nuggets/uri/exist_mixin.rb
+- lib/nuggets/uri/content_type_mixin.rb
+- lib/nuggets/uri/exist.rb
+- lib/nuggets/uri/content_type.rb
+- lib/nuggets/range/quantile_mixin.rb
+- lib/nuggets/range/quantile.rb
+- lib/nuggets/all.rb
+- lib/nuggets/version.rb
 - lib/nuggets/object/virtual_class.rb
-- lib/nuggets/object/silence_mixin.rb
-- lib/nuggets/object/msend_mixin.rb
+- lib/nuggets/object/uniclass.rb
 - lib/nuggets/object/blank.rb
-- lib/nuggets/object/ghost_class.rb
-- lib/nuggets/object/metaclass.rb
+- lib/nuggets/object/msend.rb
 - lib/nuggets/object/singleton_class.rb
-- lib/nuggets/object/silence.rb
-- lib/nuggets/object/eigenclass.rb
 - lib/nuggets/object/boolean_mixin.rb
-- lib/nuggets/object/blank_mixin.rb
-- lib/nuggets/object/msend.rb
+- lib/nuggets/object/silence_mixin.rb
 - lib/nuggets/object/boolean.rb
-- lib/nuggets/proc/bind_mixin.rb
-- lib/nuggets/proc/bind.rb
-- lib/nuggets/range/quantile_mixin.rb
-- lib/nuggets/range/quantile.rb
-- lib/nuggets/util/added_methods.rb
-- lib/nuggets/util/content_type.rb
-- lib/nuggets/util/dotted_decimal.rb
-- lib/nuggets/util/ansicolor2css.rb
-- lib/nuggets/util/i18n.rb
-- lib/nuggets/util/added_methods/init.rb
-- lib/nuggets/version.rb
-- lib/nuggets/tempfile/open.rb
-- lib/nuggets/file/which_mixin.rb
-- lib/nuggets/file/which.rb
-- lib/nuggets.rb
+- lib/nuggets/object/ghost_class.rb
+- lib/nuggets/object/silence.rb
+- lib/nuggets/object/msend_mixin.rb
+- lib/nuggets/object/blank_mixin.rb
+- lib/nuggets/object/singleton_class_mixin.rb
+- lib/nuggets/object/eigenclass.rb
+- lib/nuggets/object/metaclass.rb
+- README
+- ChangeLog
 - Rakefile
 - COPYING
-- ChangeLog
-- README
 has_rdoc: true
 homepage: http://prometheus.rubyforge.org/ruby-nuggets
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --title
-- ruby-nuggets Application documentation
-- --main
-- README
 - --line-numbers
 - --inline-source
-- --all
+- --main
+- README
 - --charset
 - UTF-8
+- --title
+- ruby-nuggets Application documentation
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Some extensions to the Ruby programming language.