facets 2.4.5 → 2.5.0

data/lib/core/facets/string/nchar.rb

@@ -12,8 +12,6 @@ class String
   #    str.nchar(4, 'that')    #=> "that"
   #    str                     #=> "that is text"
   #
-  #   CREDIT: ?
-
   def nchar(n, replacement=nil)
     if replacement
       s = self.dup

data/lib/core/facets/string/op_sub.rb

@@ -4,7 +4,7 @@ class String
   #
   #   "HELLO HELLO" - "LL"    #=> "HEO HEO"
   #
-  #   CREDIT: Benjamin David Oakes
+  # CREDIT: Benjamin David Oakes
 
   def -(pattern)
     self.gsub(pattern, '')

data/lib/core/facets/string/outdent.rb

@@ -0,0 +1 @@
+require 'facets/string/indent'

data/lib/core/facets/string/range.rb

@@ -4,7 +4,7 @@ class String
   #
   #   "This is a test!".range('test')  #=> 10..13
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def range(s, offset=0)
     if index(s, offset)
@@ -19,7 +19,7 @@ class String
   #
   #   TODO: Add offset, perhaps ?
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def range_all(s, reuse=false)
     r = []; i = 0
@@ -41,7 +41,7 @@ class String
   #   "this\nis\na\ntest".range_of_line
   #   #=> [0..4, 5..7, 8..9, 10..13]
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def range_of_line
     offset=0; charmap = []
@@ -61,7 +61,7 @@ class String
   #   "bbb".index_all('bb', false)  #=> [0]
   #   "bbb".index_all('bb', true)   #=> [0,1]
   #
-  #   TODO: Culd probably be defined for Indexable in general too.
+  # TODO: Culd probably be defined for Indexable in general too.
 
   def index_all(s, reuse=false)
     s = Regexp.new(Regexp.escape(s)) unless Regexp===s
@@ -74,4 +74,3 @@ class String
   end
 
 end
-

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

@@ -13,7 +13,7 @@ class String
   # === Output:
   # The rewritten string.
   #
-  #   CREDIT: George Moschovitis
+  # CREDIT: George Moschovitis
 
   def rewrite(rules)
     raise ArgumentError.new('The rules parameter is nil') unless rules

data/lib/core/facets/string/shatter.rb

@@ -10,7 +10,7 @@ class String
   #
   #   ["<p>", "This", "<b>", "is", "</b>", "a test.", "</p>"]
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def shatter( re )
     r = self.gsub( re ){ |s| "\1" + s + "\1" }

data/lib/core/facets/string/snakecase.rb

@@ -8,7 +8,7 @@ class String
   #   "SnakeCase".snakecase           #=> "snake_case"
   #   "Snake-Case".snakecase          #=> "snake_case"
   #   "SnakeCase::Errors".underscore  #=> "snake_case/errors"
-
+  #
   def snakecase
     gsub(/::/, '/').  # NOT SO SURE ABOUT THIS -T
     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').

data/lib/core/facets/string/splice.rb

@@ -15,7 +15,7 @@ class String
   #   a.splice(1)    #=> "E"
   #   a              #=> "HLLO"
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def splice(idx, sub=nil)
     if sub
@@ -23,7 +23,7 @@ class String
     else
       case idx
       when Range
-        slice!(idx) 
+        slice!(idx)
       else
         slice!(idx,1)
       end

data/lib/core/facets/string/start_with.rb

@@ -7,8 +7,7 @@ unless (RUBY_VERSION[0,3] == '1.9')
     #   "hello".starts_with?("he")    #=> true
     #   "hello".starts_with?("to")    #=> false
     #
-    #  CREDIT: Lucas Carlson
-    #  CREDIT: Blaine Cook
+    # CREDIT: Lucas Carlson, Blaine Cook
 
     def start_with?(prefix)
       self.index(prefix) == 0
@@ -19,8 +18,7 @@ unless (RUBY_VERSION[0,3] == '1.9')
     #   "hello".ends_with?("lo")    #=> true
     #   "hello".ends_with?("to")    #=> false
     #
-    #  CREDIT: Lucas Carlson
-    #  CREDIT: Blaine Cook
+    # CREDIT: Lucas Carlson, Blaine Cook
 
     def end_with?(suffix)
       self.rindex(suffix) == size - suffix.size

data/lib/core/facets/string/tab.rb

@@ -1,103 +1,20 @@
-class String
+require 'facets/string/tabto'
+require 'facets/string/margin'
+require 'facets/string/indent'
+require 'facets/string/expand_tab'
 
-  # LOG: DEPRECATED #whitespace?, alias of #blank?
-  #alias whitespace? blank?
+class String
 
   # Aligns each line n spaces.
   #
-  #  CREDIT: Gavin Sinclair
-
+  # CREDIT: Gavin Sinclair
+  #
   def tab(n)
     gsub(/^ */, ' ' * n)
   end
 
-  # Alias of tab that will be deprecated.
-  alias_method :taballto, :tab
-
-  # Expands tabs to +n+ spaces.  Non-destructive.  If +n+ is 0, then tabs are
-  # simply removed.  Raises an exception if +n+ is negative.
-  #
-  # Thanks to GGaramuno for a more efficient algorithm.  Very nice.
-  #
-  #  CREDIT: Gavin Sinclair
-  #  CREDIT: Noah Gibbs
-  #  CREDIT: GGaramuno
-
-  def expand_tabs(n=8)
-    n = n.to_int
-    raise ArgumentError, "n must be >= 0" if n < 0
-    return gsub(/\t/, "") if n == 0
-    return gsub(/\t/, " ") if n == 1
-    str = self.dup
-    while
-      str.gsub!(/^([^\t\n]*)(\t+)/) { |f|
-        val = ( n * $2.size - ($1.size % n) )
-        $1 << (' ' * val)
-      }
-    end
-    str
-  end
-
-  # Preserves relative tabbing.
-  # The first non-empty line ends up with n spaces before nonspace.
-  #
-  #  CREDIT: Gavin Sinclair
-
-  def tabto(n)
-    if self =~ /^( *)\S/
-      indent(n - $1.length)
-    else
-      self
-    end
-  end
-
-  # Indent left or right by n spaces.
-  # (This used to be called #tab and aliased as #indent.)
-  #
-  #  CREDIT: Gavin Sinclair
-  #  CREDIT: Trans
-
-  def indent(n)
-    if n >= 0
-      gsub(/^/, ' ' * n)
-    else
-      gsub(/^ {0,#{-n}}/, "")
-    end
-  end
-
-  # Outdent just indents a negative number of spaces.
-  #
-  #  CREDIT: Noah Gibbs
-
-  def outdent(n)
-    indent(-n)
-  end
-
-  # Provides a margin controlled string.
-  #
-  #   x = %Q{
-  #         | This
-  #         |   is
-  #         |     margin controlled!
-  #         }.margin
-  #
-  #
-  #   NOTE: This may still need a bit of tweaking.
-  #
-  #  CREDIT: Trans
-
-  def margin(n=0)
-    #d = /\A.*\n\s*(.)/.match( self )[1]
-    #d = /\A\s*(.)/.match( self)[1] unless d
-    d = ((/\A.*\n\s*(.)/.match(self)) ||
-        (/\A\s*(.)/.match(self)))[1]
-    return '' unless d
-    if n == 0
-      gsub(/\n\s*\Z/,'').gsub(/^\s*[#{d}]/, '')
-    else
-      gsub(/\n\s*\Z/,'').gsub(/^\s*[#{d}]/, ' ' * n)
-    end
-  end
+  # LOG: Deprecated #taballto which was an alias for #tab.
+  #alias_method :taballto, :tab
 
 end
 

data/lib/core/facets/string/tabto.rb

@@ -0,0 +1,19 @@
+require 'facets/string/indent'
+
+class String
+
+  # Preserves relative tabbing.
+  # The first non-empty line ends up with n spaces before nonspace.
+  #
+  # CREDIT: Gavin Sinclair
+
+  def tabto(n)
+    if self =~ /^( *)\S/
+      indent(n - $1.length)
+    else
+      self
+    end
+  end
+
+end
+

data/lib/core/facets/string/titlecase.rb

@@ -5,7 +5,7 @@ class String
   #   "this is a string".titlecase
   #   => "This Is A String"
   #
-  #  CREDIT: Eliazar Parra
+  # CREDIT: Eliazar Parra
 
   def titlecase
     gsub(/\b\w/){$&.upcase}

data/lib/core/facets/string/to_re.rb

@@ -4,7 +4,7 @@ class String
   #
   #   "a?".to_re  #=> /a?/
   #
-  #  CREDIT: Trans
+  # CREDIT: Trans
 
   def to_re(esc=false)
     Regexp.new((esc ? Regexp.escape(self) : self))
@@ -16,7 +16,7 @@ class String
   #
   #   "[".to_rx  #=> /\[/
   #
-  #  CREDIT: Trans
+  # CREDIT: Trans
 
   def to_rx(esc=true)
     Regexp.new((esc ? Regexp.escape(self) : self))

data/lib/core/facets/string/word_wrap.rb

@@ -13,8 +13,7 @@ class String
   # This is basic implementation of word wrap, but smart
   # enough to suffice for most use cases.
   #
-  #  CREDIT: Gavin Kistner
-  #  CREDIT: Dayne Broderson
+  # CREDIT: Gavin Kistner, Dayne Broderson
   #
   def word_wrap( col_width=80 )
     self.dup.word_wrap!( col_width )
@@ -22,8 +21,7 @@ class String
 
   # As with #word_wrap, but modifies the string in place.
   #
-  #   CREDIT: Gavin Kistner
-  #   CREDIT: Dayne Broderson
+  # CREDIT: Gavin Kistner, Dayne Broderson
   #
   def word_wrap!( col_width=80 )
     self.gsub!( /(\S{#{col_width}})(?=\S)/, '\1 ' )

data/lib/core/facets/struct.rb

@@ -0,0 +1,6 @@
+dir, base = *File.split(__FILE__)
+base = base.chomp('.rb')
+Dir[File.join(dir, base, '*')].each do |lib|
+  require "facets/#{base}/#{File.basename(lib)}"
+end
+

data/lib/core/facets/struct/attributes.rb

@@ -0,0 +1,11 @@
+class Struct
+
+  # Returns a hash containing the names and values for all instance variables in the Struct.
+  def attributes
+    h = {}
+    each_pair { |k,v| h[k] = v }
+    h
+  end
+
+end # class Struct
+

data/lib/core/facets/symbol/chomp.rb

@@ -4,7 +4,7 @@ class Symbol
   #
   #   :ab.chomp(:b)  #=> :a
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def chomp(seperator)
     to_s.chomp(seperator.to_s).to_sym
@@ -14,7 +14,7 @@ class Symbol
   #
   #   :ab.lchomp(:a)  #=> :b
   #
-  #   CREDIT: Trans
+  # CREDIT: Trans
 
   def lchomp(seperator)
     to_s.reverse.chomp(seperator.to_s).reverse.to_sym

data/lib/core/facets/symbol/generate.rb

@@ -10,7 +10,7 @@ class Symbol
   #
   #   TODO: Is the generated symbol format acceptable?
   #
-  #  CREDIT: Trans
+  # CREDIT: Trans
 
   def self.generate(key=nil)
     key = key.to_sym if key

data/lib/core/facets/symbol/not.rb

@@ -5,7 +5,7 @@ class Symbol
   #   "friend".to_sym.not?   #=> false
   #   "~friend".to_sym.not?  #=> true
   #
-  #  CREDIT: Trans
+  # CREDIT: Trans
 
   def not?
     self.to_s.slice(0,1) == '~'
@@ -15,7 +15,7 @@ class Symbol
   #
   #   ~:friend    #=> :"~friend"
   #
-  #  CREDIT: Trans
+  # CREDIT: Trans
 
   def ~@
     if self.to_s.slice(0,1) == '~'

data/lib/core/facets/symbol/succ.rb

@@ -8,7 +8,7 @@ unless (RUBY_VERSION[0,3] == '1.9')
     #
     #   :a.succ => :b
     #
-    #  TODO: Make this  work more like a simple character dial?
+    # TODO: Make this  work more like a simple character dial?
 
     def succ
       self.to_s.succ.intern

data/lib/core/facets/symbol/to_proc.rb

@@ -19,10 +19,9 @@ unless (RUBY_VERSION[0,3] == '1.9')
     #   %{john terry fiona}.map(&:capitalize)   # -> %{John Terry Fiona}
     #   sum = numbers.inject(&:+)
     #
-    #   TODO: This will be deprecated as of Ruby 1.9, since it will become standard Ruby.
+    # TODO: This will be deprecated as of Ruby 1.9, since it will become standard Ruby.
     #
-    # CREDIT: Florian Gross (orignal)
-    # CREDIT: Nobuhiro Imai (current)
+    # CREDIT: Florian Gross (orignal), Nobuhiro Imai (current)
 
     def to_proc
       Proc.new{|*args| args.shift.__send__(self, *args)}

data/lib/core/facets/time/advance.rb

@@ -5,7 +5,8 @@ class Time
   # <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>, <tt>:hours</tt>,
   # <tt>:minutes</tt>, <tt>:seconds</tt>.
   #
-  #   CREDIT: ActiveSupport
+  # CREDIT: ActiveSupport Team
+
   def advance(options)
     d = to_date.advance(options)
     time_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)

data/lib/core/facets/time/elapse.rb

@@ -4,7 +4,7 @@ class Time
   #
   #   Time.elapse { sleep 1 }  #=> 0.999188899993896
   #
-  #   CREDIT: Hal Fulton
+  # CREDIT: Hal Fulton
 
   def self.elapse
     raise "Need block" unless block_given?

data/lib/core/facets/time/hence.rb

@@ -2,7 +2,7 @@ require 'facets/time/set'
 
 class Time
 
-  if defined?(::ActiveSupport)
+  if defined?(::ActiveSupport) && method_defined?(:since)
 
     alias_method :in, :since
     alias_method :hence, :since
@@ -13,15 +13,16 @@ class Time
     # a number of time-units ago.
     #
     def ago(number, units=:seconds)
-      time =(
+      return hence(-number, units) if number < 0
+
+      time = (
         case units.to_s.downcase.to_sym
         when :years
           set(:year => (year - number))
         when :months
-          #years = ((month - number) / 12).to_i
-          y = ((month - number) / 12).to_i
-          m = ((month - number - 1) % 12) + 1
-          set(:year => (year - y), :month => m)
+          new_month = ((month - number - 1) % 12) + 1
+          y = (number / 12) + (new_month > month ? 1 : 0)
+          set(:year => (year - y), :month => new_month)
         when :weeks
           self - (number * 604800)
         when :days
@@ -43,14 +44,16 @@ class Time
     # a number of time-units hence.
 
     def hence(number, units=:seconds)
-      time =(
+      return ago(-number, units) if number < 0
+
+      time = (
         case units.to_s.downcase.to_sym
         when :years
           set( :year=>(year + number) )
         when :months
-          y = ((month + number) / 12).to_i
-          m = ((month + number - 1) % 12) + 1
-          set(:year => (year + y), :month => m)
+          new_month = ((month + number - 1) % 12) + 1
+          y = (number / 12) + (new_month < month ? 1 : 0)
+          set(:year => (year + y), :month => new_month)
         when :weeks
           self + (number * 604800)
         when :days
@@ -74,9 +77,9 @@ class Time
     # Adjust DST
     #
     # TODO: Can't seem to get this to pass ActiveSupport tests.
-    #       Even though it is essentially identical to the
-    #       ActiveSupport code (see Time#since in time/calculations.rb).
-    #       It handels all but 4 tests.
+    # Even though it is essentially identical to the
+    # ActiveSupport code (see Time#since in time/calculations.rb).
+    # It handles all but 4 tests.
     def dst_adjustment(time)
       self_dst = self.dst? ? 1 : 0
       time_dst = time.dst? ? 1 : 0