epitools 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "epitools"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = "2012-04-09"
+  s.date = "2012-04-28"
   s.description = "Miscellaneous utility libraries to make my life easier."
   s.email = "chris@ill-logic.com"
   s.extra_rdoc_files = [

data/lib/epitools/clitools.rb

@@ -1,4 +1,4 @@
-#require 'epitools'
+require 'epitools/colored'
 
 class String
 
@@ -8,9 +8,14 @@ class String
   #
   # The pattern can be a string or a regular expression.
   #
-  def highlight(pattern, color=:light_yellow)
+  def highlight(pattern, color=:light_yellow, &block)
     pattern = Regexp.new(Regexp.escape(pattern)) if pattern.is_a? String
-    gsub(pattern) { |match| match.send(color) }
+
+    if block_given?
+      gsub(pattern, &block)
+    else
+      gsub(pattern) { |match| match.send(color) }
+    end
   end
 
 end

data/lib/epitools/colored.rb

@@ -91,12 +91,14 @@ module Colored
     15  => :light_white,
   }
 
-  VALID_COLORS = Set.new(
-    COLORS.keys +
-    COLORS.map { |k,v| "light_#{k}" } +
-    COLORS.map { |k,v| "bright_#{k}"  } +
-    ["grey", "gray"]
-  )
+  VALID_COLORS = begin
+    normal         = COLORS.keys
+    lights         = normal.map { |fore| "light_#{fore}" }
+    brights        = normal.map { |fore| "bright_#{fore}" }
+    on_backgrounds = normal.map { |fore| normal.map { |back| "#{fore}_on_#{back}" } }.flatten
+
+    Set.new(normal + lights + brights + on_backgrounds + ["grey", "gray"])
+  end
   
   COLORS.each do |color, value|
     define_method(color) do 
@@ -248,10 +250,7 @@ module Colored
   #     
   def valid_tag?(tag)
     VALID_COLORS.include?(tag) or
-    (
-      tag =~ /^\d+$/ and
-      BBS_COLOR_TABLE.include?(tag.to_i)
-    )
+      (tag =~ /^\d+$/ and BBS_COLOR_TABLE.include?(tag.to_i) )
   end
     
   #

data/lib/epitools/core_ext.rb

@@ -169,9 +169,7 @@ class Range
   # Pick a random number from the range.
   #
   def rand
-    magnitude = last-first
-    magnitude += 1 if not exclude_end?
-    Kernel.rand(magnitude)+first
+    Kernel.rand(self)
   end
 
 end

data/lib/epitools/core_ext/enumerable.rb

@@ -178,7 +178,7 @@ module Enumerable
 
     end
   end
-  
+
   alias_method :recursive_map,    :deep_map
   alias_method :map_recursively,  :deep_map
   alias_method :map_recursive,    :deep_map 
@@ -188,16 +188,26 @@ module Enumerable
   # recursively on that element.
   #
   # Example:
-  #   [ [1,2], [3,4] ].deep_map{|e| e ** 2 } #=> [ [1,4], [9,16] ] 
+  #   [ [1,2], [3,4] ].deep_select{|e| e % 2 == 0 } #=> [ [2], [4] ] 
   #
   def deep_select(depth=nil, &block)
-    select do |e|
-      if (e.is_a? Array or e.is_a? Enumerable) and (depth && depth > 0)
-        e.select(depth-1, &block)
+    map do |*args|
+
+      if depth.nil? or depth > 0
+
+        case obj
+        when Hash
+
+        when Array, Enumerable
+          result = obj.deep_select(depth ? depth-1 : nil, &block)
+          result.any? ? result : nil
+        end
+
       else
-        block.call(e)
+        obj if block.call(obj)
       end
-    end
+
+    end.compact
   end
   
   alias_method :recursive_select, :deep_select

data/lib/epitools/core_ext/numbers.rb

@@ -41,7 +41,7 @@ class Numeric
     if block_given?
       Array.new(self, &block)
     else
-      Array.new(self)
+      (0...self).to_a
     end
   end
 

data/spec/clitools_spec.rb

@@ -11,6 +11,11 @@ describe String do
     "xxxmatchzzz".highlight(/m.+h/, color).should    == highlighted
     "xxxmatchzzz".highlight(/MATCH/i, color).should  == highlighted
   end
+
+  it "highlights with a block" do
+    result = "xxxmatchxxx".highlight(/match/) { |match| "<8>#{match}</8>" }
+    result.should == "xxx<8>match</8>xxx"
+  end
   
   it "cmds" do
     cmd( ['test -f ?', __FILE__] ).should == true

data/spec/colored_spec.rb

@@ -23,7 +23,8 @@ describe "Colored strings" do
     "<magenta>hello".colorize.should == "<purple>hello".colorize
     "<gray>hello".colorize.should == "<light_black>hello".colorize
     lambda { "</blue>".colorize }.should raise_error
-  end    
+    "<black_on_yellow>hello".colorize.should == "hello".black_on_yellow
+  end
   
 end
 

data/spec/core_ext_spec.rb

@@ -388,7 +388,7 @@ describe Enumerable do
   end
   
   it "selects deeply" do
-    [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [2,4] 
+    [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [[2],[4]]
     {1=>2, 3=>{4=>5, 6=>7}}.deep_select {|k,v| k == 1 }.should == {1=>2} 
     #[1,2,3,4].deep_select {|e| e ** 2}.should == [1,4,9,16] 
     #[[],[],1,2,3,4].deep_select {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec