facets 2.4.4 → 2.4.5

data/doc/rdoc/more/rdoc-style.css

@@ -1,10 +1,10 @@
 a {
-  color: #00F;
+  color: #F00;
   text-decoration: none;
 }
 
 a:hover {
-  color: #77F;
+  color: #F77;
   text-decoration: underline;
 }
 
@@ -29,7 +29,7 @@ body, td, p {
   margin-bottom: 1em;
   padding: 0.5em;
   padding-left: 2em;
-  background: #005;
+  background: #500;
   color: #FFF;
   font-weight: bold;
   border: 1px dotted black;
@@ -60,12 +60,12 @@ body, td, p {
 .file-title {
   font-size: large;
   font-weight: bold;
-  background: #005;
+  background: #500;
   color: #FFF;
 }
 
 .banner {
-  background: #005;
+  background: #500;
   color: #FFF;
   border: 1px solid black;
   padding: 1em;
@@ -77,7 +77,7 @@ body, td, p {
 }
 
 h1 a, h2 a, .sectiontitle a, .banner a {
-  color: #FF0;
+  color: #FCC;
 }
 
 h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
@@ -86,15 +86,15 @@ h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
 
 .dyn-source {
   display: none;
-  background: #FFE;
+  background: #EFE;
   color: #000;
-  border: 1px dotted black;
-  margin: 0.5em 2em 0.5em 2em;
+  border: 1px solid #cccccc;
+  margin: 0.5em 2em 0.5em 1em;
   padding: 0.5em;
 }
 
 .dyn-source .cmt {
-  color: #00F;
+  color: #F00;
   font-style: italic;
 }
 
@@ -111,8 +111,8 @@ h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
 
 .description pre {
   padding: 0.5em;
-  border: 1px dotted black;
-  background: #FFE;
+  border: 0px solid black;
+  background: #EFE;
 }
 
 .method .title {
@@ -132,8 +132,10 @@ h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
 }
 
 .method .sourcecode p.source-link {
+  text-align: right;
   text-indent: 0em;
   margin-top: 0.5em;
+  font-family: monospace;
 }
 
 .method .aka {
@@ -149,7 +151,7 @@ h1 {
   font-size: x-large;
   font-weight: bold;
   color: #FFF;
-  background: #007;
+  background: #700;
 }
 
 h2 {
@@ -158,18 +160,18 @@ h2 {
   font-size: large;
   font-weight: bold;
   color: #FFF;
-  background: #009;
+  background: #900;
 }
 
 h3, h4, h5, h6 {
   padding: 0.2em 1em 0.2em 1em;
   border: 1px dashed black;
   color: #000;
-  background: #AAF;
+  background: #FAA;
 }
 
 .sourcecode > pre {
   padding: 0.5em;
-  border: 1px dotted black;
+  border: 1px solid black;
   background: #FFE;
 }

data/lib/core/facets/array/combination.rb

@@ -1,4 +1,4 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+if RUBY_VERSION < '1.9'
 
   require 'enumerator'
 
@@ -38,21 +38,20 @@ unless (RUBY_VERSION[0,3] == '1.9')
     end
 
     # OLD WAY
-
-      #a = []
-      #s = self
-      #n = s.size
-      #return unless (1..n) === k
-      #dx = (0...k).to_a
-      #loop do
-      #  a << s.values_at(*idx)
-      #  i = k - 1
-      #  i -= 1 while idx[i] == n - k + i
-      #  break if i < 0
-      #  idx[i] += 1
-      #  (i + 1 ... k).each {|j| idx[j] = idx[i] + j - i}
-      #end
-      #a
+    #a = []
+    #s = self
+    #n = s.size
+    #return unless (1..n) === k
+    #dx = (0...k).to_a
+    #loop do
+    #  a << s.values_at(*idx)
+    #  i = k - 1
+    #  i -= 1 while idx[i] == n - k + i
+    #  break if i < 0
+    #  idx[i] += 1
+    #  (i + 1 ... k).each {|j| idx[j] = idx[i] + j - i}
+    #end
+    #a
 
   end
 

data/lib/core/facets/array/index.rb

@@ -2,9 +2,7 @@ class Array
 
   if RUBY_VERSION < '1.9'
 
-    alias_method :facets_override_of_index, :index
-
-    #private :facets_override_of_index
+    alias_method :_facets_index, :index
 
     # Allows #index to accept a block.
     #
@@ -12,12 +10,39 @@ class Array
     # overrides in Facets.
     #
     def index(obj=nil, &block)
-      return facets_override_of_index(obj) unless block_given?
-      i=0; i+=1 until yield(self[i])
-      return i
+      if block_given?
+        _facets_index(find(&block))
+      else
+        _facets_index(obj)
+      end
     end
 
   end
 
 end
 
+
+=begin :spec:
+
+  require 'quarry/spec'
+
+  Quarry.spec "Array" do
+
+    the_method "index" do
+
+      finds "an element" do
+        i = [1,2,3].index{ |e| e == 2 }
+        i.assert == 1
+      end
+
+      terminates "when no element is found" do
+        i = [1,2,3].index{ |e| e == 5 }
+        i.assert == nil
+      end
+
+    end
+
+  end
+
+=end
+

data/lib/core/facets/cattr.rb

@@ -0,0 +1,2 @@
+# TO BE DEPRECATED
+require 'facets/class/cattr'

data/lib/{more/facets → core/facets/class}/cattr.rb

@@ -1,28 +1,3 @@
-# = CAttr
-#
-# Class/Instance attributes.
-#
-# == Notes
-#
-# * This was suggested by Ara T. Howard
-#
-# == Authors
-#
-# * Thomas Sawyer
-#
-# == Copying
-#
-# Copyright (c) 2006 Thomas Sawyer
-#
-# Ruby License
-#
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
-#
-# This program 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.
-
 class Class
 
   # Creates a class-variable attribute that can
@@ -30,19 +5,19 @@ class Class
   #
   # NOTE This used to be a Module method. But turns out
   # it does not work as expected when included. The class-level
-  # method is not carried along. So it is now just class
-  # method. Accordingly, #mattr will eventually be deprecated,
-  # so use #cattr instead.
+  # method is not carried along. So it is now just a Class
+  # method. Accordingly, #mattr has been deprecated.
   #
   #  CREDIT: David Heinemeier Hansson
+  #  CREDIT: Ara T. Howard (for suggesting)
 
   def cattr( *syms )
-    accessors, readers = syms.flatten.partition { |a| a.to_s =~ /=$/ }
-    writers = accessors.collect{ |e| e.to_s.chomp('=').to_sym }
-    readers.concat( writers )
+    writers, readers = syms.flatten.partition{ |a| a.to_s =~ /=$/ }
+    writers = writers.collect{ |e| e.to_s.chomp('=').to_sym }
+    readers.concat( writers ) # writers also get readers
     cattr_writer( *writers )
     cattr_reader( *readers )
-    return readers + accessors
+    return readers + writers
   end
 
   # Creates a class-variable attr_reader that can
@@ -61,9 +36,14 @@ class Class
   def cattr_reader( *syms )
     syms.flatten.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
         def self.#{sym}
           @@#{sym}
         end
+
         def #{sym}
           @@#{sym}
         end
@@ -92,9 +72,14 @@ class Class
   def cattr_writer(*syms)
     syms.flatten.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
         def self.#{sym}=(obj)
           @@#{sym} = obj
         end
+
         def #{sym}=(obj)
           @@#{sym}=(obj)
         end
@@ -114,25 +99,14 @@ class Class
   #   MyClass.a           #=> 10
   #   mc = MyClass.new
   #   mc.a                #=> 10
-  #
-  #  CREDIT: David Heinemeier Hansson
 
   def cattr_accessor(*syms)
-    m = []
-    m.concat( cattr_reader(*syms) )
-    m.concat( cattr_writer(*syms) )
-    m
+    cattr_reader(*syms) + cattr_writer(*syms)
   end
 
 end
 
-
 #class Module
-  # NOTE: Module variations turn out not to work, because
-  # the class-level method created is not inherited when the
-  # module is included. Accordingly, #mattr and friends
-  # will be deprecated, so use #cattr instead.
-
   #alias_method :mattr,          :cattr            # deprecate
   #alias_method :mattr_reader,   :cattr_reader     # deprecate
   #alias_method :mattr_writer,   :cattr_writer     # deprecate

data/lib/core/facets/class/cattr_accessor.rb

@@ -0,0 +1 @@
+require 'facets/class/cattr'

data/lib/core/facets/class/cattr_reader.rb

@@ -0,0 +1 @@
+require 'facets/class/cattr'

data/lib/core/facets/class/cattr_writer.rb

@@ -0,0 +1 @@
+require 'facets/class/cattr'

data/lib/core/facets/enumerable/mode.rb

@@ -3,12 +3,13 @@ module Enumerable
   # In Statistics mode is the value that occurs most
   # frequently in a given set of data.
   #
-  #  CREDIT: Trans
+  #  CREDIT: Robert Klemme
 
   def mode
-    count = Hash.new(0)
-    each {|x| count[x] += 1 }
-    count.sort_by{|k,v| v}.last[0]
+    max = 0
+    c = Hash.new 0
+    each {|x| cc = c[x] += 1; max = cc if cc > max}
+    c.select {|k,v| v == max}.map {|k,v| k}
   end
 
 end

data/lib/core/facets/enumerable/split.rb

@@ -8,14 +8,18 @@ module Enumerable
   # CREDIT: Trans
 
   def split(pattern)
+    sect = []
     memo = []
     each do |obj|
       if pattern === obj
-        memo.push []
+        memo << sect
+        sect = []
       else
-        memo.last << obj
+        sect << obj
       end
     end
+    memo << sect #unless sect.empty?
+    memo.pop while memo.last.empty?
     memo
   end
 

data/lib/core/facets/file/append.rb

@@ -0,0 +1,14 @@
+class File
+
+  # Append to a file.
+  #
+  #   CREDIT: George Moschovitis
+
+  def self.append( file, str )
+    File.open( file, 'ab' ) { |f|
+      f << str
+    }
+  end
+
+end
+

data/lib/core/facets/file/create.rb

@@ -0,0 +1,21 @@
+class File
+
+  # Creates a new file, or overwrites an existing file,
+  # and writes a string into it. Can also take a block
+  # just like File#open, which is yielded _after_ the
+  # string is writ.
+  #
+  #   str = 'The content for the file'
+  #   File.create('myfile.txt', str)
+  #
+  #   CREDIT: George Moschovitis
+
+  def self.create(path, str='', &blk)
+    open(path, 'wb') do |f|
+      f << str
+      blk.call(f) if blk
+    end
+  end
+
+end
+

data/lib/core/facets/file/rewrite.rb

@@ -38,14 +38,14 @@ class File
       mode.delete!("^b+")
     end
 
-    old_str = File.open(name, "r#{mode}") { |file| file.read } #rescue ""
-    old_str = str.clone
+    old_str = open(name, "r#{mode}") { |file| file.read } #rescue ""
+    old_str = old_str.clone
 
     begin
       new_str = yield(old_str)
     ensure
       if old_str != new_str
-        File.open(name, "w#{mode}") { |file| file.write(new_str) }
+        open(name, "w#{mode}") { |file| file.write(new_str) }
       end
     end
   end
@@ -72,14 +72,14 @@ class File
       mode.delete!("^b+")
     end
 
-    old_str = File.open(name, "r#{mode}") { |file| file.read } #rescue ""
-    new_str = str.clone
+    old_str = open(name, "r#{mode}") { |file| file.read } #rescue ""
+    new_str = old_str.clone
 
     begin
       yield(new_str)
     ensure
       if old_str != new_str
-        File.open(name, "w#{mode}") { |file| file.write(str) }
+        open(name, "w#{mode}") { |file| file.write(str) }
       end
     end
   end