extlib 0.9.13 → 0.9.14

data/lib/extlib/hash.rb

@@ -115,7 +115,7 @@ class Hash
   # @param [Object] key The key for the param.
   # @param [Object] value The value for the param.
   #
-  # @return <String> This key value pair as a param
+  # @return [String] This key value pair as a param
   #
   # @api public
   def normalize_param(key, value)
@@ -176,7 +176,7 @@ class Hash
     hash
   end
 
-  # @return <String> The hash as attributes for an XML tag.
+  # @return [String] The hash as attributes for an XML tag.
   #
   # @example
   #   { :one => 1, "two"=>"TWO" }.to_xml_attributes
@@ -209,7 +209,7 @@ class Hash
   # Converts all keys into string values. This is used during reloading to
   # prevent problems when classes are no longer declared.
   #
-  # @return <Array> An array of they hash's keys
+  # @return [Array] An array of they hash's keys
   #
   # @example
   #   hash = { One => 1, Two => 2 }.proctect_keys!
@@ -234,7 +234,7 @@ class Hash
   # Destructively and non-recursively convert each key to an uppercase string,
   # deleting nil values along the way.
   #
-  # @return <Hash> The newly environmentized hash.
+  # @return [Hash] The newly environmentized hash.
   #
   # @example
   #   { :name => "Bob", :contact => { :email => "bob@bob.com" } }.environmentize_keys!
@@ -361,7 +361,7 @@ class REXMLUtilityNode
   #   "date"::
   #     Parses +value+ using Date.parse
   #
-  # @return <Integer, TrueClass, FalseClass, Time, Date, Object>
+  # @return [Integer, Boolean, Time, Date, Object]
   #   The result of typecasting +value+.
   #
   # @note
@@ -377,7 +377,7 @@ class REXMLUtilityNode
   #
   # @param value<#gsub> An XML fragment.
   #
-  # @return <#gsub> The XML fragment after converting entities.
+  # @return [#gsub] The XML fragment after converting entities.
   def translate_xml_entities(value)
     value.gsub(/&lt;/,   "<").
           gsub(/&gt;/,   ">").
@@ -401,7 +401,7 @@ class REXMLUtilityNode
 
   # Converts the node into a readable HTML node.
   #
-  # @return <String> The HTML node in text form.
+  # @return [String] The HTML node in text form.
   def to_html
     attributes.merge!(:type => @type ) if @type
     "<#{name}#{attributes.to_xml_attributes}>#{@nil_element ? '' : inner_html}</#{name}>"

data/lib/extlib/inflection.rb

@@ -10,10 +10,13 @@ module Extlib
       #
       # @example
       #   "egg_and_hams".classify #=> "EggAndHam"
+      #   "enlarged_testes".classify #=> "EnlargedTestis"
       #   "post".classify #=> "Post"
       #
       def classify(name)
-        camelize(singularize(name.to_s.sub(/.*\./, '')))
+        words = name.to_s.sub(/.*\./, '').split('_')
+        words[-1] = singularize(words[-1])
+        words.collect { |word| word.capitalize }.join
       end
 
       # By default, camelize converts strings to UpperCamelCase.
@@ -48,7 +51,7 @@ module Extlib
       #   "employee_salary" #=> "Employee salary"
       #   "author_id" #=> "Author"
       def humanize(lower_case_and_underscored_word)
-        lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+        lower_case_and_underscored_word.to_s.gsub(/_id$/, '').tr('_', ' ').capitalize
       end
 
       # Removes the module part from the expression in the string
@@ -65,10 +68,13 @@ module Extlib
       #
       # @example
       #   "RawScaledScorer".tableize #=> "raw_scaled_scorers"
+      #   "EnlargedTestis".tableize #=> "enlarged_testes"
       #   "egg_and_ham".tableize #=> "egg_and_hams"
       #   "fancyCategory".tableize #=> "fancy_categories"
       def tableize(class_name)
-        pluralize(class_name.to_const_path.gsub(/\//, '_'))
+        words = class_name.to_const_path.tr('/', '_').split('_')
+        words[-1] = pluralize(words[-1])
+        words.join('_')
       end
 
       # Creates a foreign key name from a class name.
@@ -253,7 +259,7 @@ module Extlib
 
       attr_reader :singular_of, :plural_of
 
-      # Convert an English word from plurel to singular.
+      # Convert an English word from plural to singular.
       #
       #   "boys".singular      #=> boy
       #   "tomatoes".singular  #=> tomato
@@ -281,7 +287,7 @@ module Extlib
       #
       alias_method(:singularize, :singular)
 
-      # Convert an English word from singular to plurel.
+      # Convert an English word from singular to plural.
       #
       #   "boy".plural     #=> boys
       #   "tomato".plural  #=> tomatoes

data/lib/extlib/lazy_array.rb

@@ -1,5 +1,5 @@
 class LazyArray  # borrowed partially from StrokeDB
-  instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ send class dup object_id kind_of? respond_to? equal? assert_kind_of should should_not instance_variable_set instance_variable_get extend ].include?(m.to_s) }
+  include Enumerable
 
   attr_reader :head, :tail
 
@@ -82,7 +82,11 @@ class LazyArray  # borrowed partially from StrokeDB
   end
 
   def empty?
-    !any?
+    (@tail.nil? || @tail.empty?) &&
+    (@head.nil? || @head.empty?) && begin
+      lazy_load
+      @array.empty?
+    end
   end
 
   def any?(&block)
@@ -214,21 +218,21 @@ class LazyArray  # borrowed partially from StrokeDB
     self
   end
 
-  def pop
-    if lazy_possible?(@tail)
-      @tail.pop
+  def pop(*args)
+    if lazy_possible?(@tail, *args)
+      @tail.pop(*args)
     else
       lazy_load
-      @array.pop
+      @array.pop(*args)
     end
   end
 
-  def shift
-    if lazy_possible?(@head)
-      @head.shift
+  def shift(*args)
+    if lazy_possible?(@head, *args)
+      @head.shift(*args)
     else
       lazy_load
-      @array.shift
+      @array.shift(*args)
     end
   end
 
@@ -401,6 +405,16 @@ class LazyArray  # borrowed partially from StrokeDB
     raise ArgumentError, "arguments may be 1 or 2 Integers, or 1 Range object, was: #{args.inspect}", caller(1)
   end
 
+  def each
+    lazy_load
+    if block_given?
+      @array.each { |entry| yield entry }
+      self
+    else
+      @array.each
+    end
+  end
+
   # delegate any not-explicitly-handled methods to @array, if possible.
   # this is handy for handling methods mixed-into Array like group_by
   def method_missing(method, *args, &block)
@@ -419,14 +433,14 @@ class LazyArray  # borrowed partially from StrokeDB
       # 0 and incrementally compare each entry. if other is a LazyArray
       # this has a lesser likelyhood of triggering a lazy load
       0.upto(@head.size - 1) do |i|
-        return false unless @head[i].send(operator, other[i])
+        return false unless @head[i].__send__(operator, other[i])
       end
 
       # compare the tail against the end of other.  start at index
       # -1 and decrementally compare each entry. if other is a LazyArray
       # this has a lesser likelyhood of triggering a lazy load
       -1.downto(@tail.size * -1) do |i|
-        return false unless @tail[i].send(operator, other[i])
+        return false unless @tail[i].__send__(operator, other[i])
       end
 
       lazy_load
@@ -434,24 +448,4 @@ class LazyArray  # borrowed partially from StrokeDB
 
     @array.send(operator, other.to_ary)
   end
-
-  # add proxies for all remaining Array and Enumerable methods
-  (Array.public_instance_methods(false) | Enumerable.public_instance_methods(false)).each do |method|
-    next if public_method_defined?(method)
-
-    target = if method.to_s[-1, 1] == '='
-      "send(:#{method}, *args, &block)"
-    else
-      "#{method}(*args, &block)"
-    end
-
-    class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      public
-      def #{method}(*args, &block)                # def []=(*args, &block)
-        lazy_load                                 #   lazy_load
-        results = @array.#{target}                #   results = @array.send(:[]=, *args, &block)
-        results.equal?(@array) ? self : results   #   results.equal?(@array) ? self : results
-      end                                         # end
-    RUBY
-  end
 end

data/lib/extlib/mash.rb

@@ -47,7 +47,7 @@ class Mash < Hash
   #   A hash to update values in the mash with. The keys and the values will be
   #   converted to Mash format.
   #
-  # @return <Mash> The updated mash.
+  # @return [Mash] The updated mash.
   def update(other_hash)
     other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
     self
@@ -57,7 +57,7 @@ class Mash < Hash
 
   # @param key<Object> The key to check for. This will be run through convert_key.
   #
-  # @return <TrueClass, FalseClass> True if the key exists in the mash.
+  # @return [Boolean] True if the key exists in the mash.
   def key?(key)
     super(convert_key(key))
   end
@@ -70,7 +70,7 @@ class Mash < Hash
   # @param key<Object> The key to fetch. This will be run through convert_key.
   # @param *extras<Array> Default value.
   #
-  # @return <Object> The value at key or the default value.
+  # @return [Object] The value at key or the default value.
   def fetch(key, *extras)
     super(convert_key(key), *extras)
   end
@@ -78,14 +78,14 @@ class Mash < Hash
   # @param *indices<Array>
   #   The keys to retrieve values for. These will be run through +convert_key+.
   #
-  # @return <Array> The values at each of the provided keys
+  # @return [Array] The values at each of the provided keys
   def values_at(*indices)
     indices.collect {|key| self[convert_key(key)]}
   end
 
   # @param hash<Hash> The hash to merge with the mash.
   #
-  # @return <Mash> A new mash with the hash values merged in.
+  # @return [Mash] A new mash with the hash values merged in.
   def merge(hash)
     self.dup.update(hash)
   end
@@ -98,7 +98,7 @@ class Mash < Hash
 
   # @param *rejected<Array[(String, Symbol)] The mash keys to exclude.
   #
-  # @return <Mash> A new mash without the selected keys.
+  # @return [Mash] A new mash without the selected keys.
   #
   # @example
   #   { :one => 1, :two => 2, :three => 3 }.except(:one)
@@ -109,17 +109,17 @@ class Mash < Hash
 
   # Used to provide the same interface as Hash.
   #
-  # @return <Mash> This mash unchanged.
+  # @return [Mash] This mash unchanged.
   def stringify_keys!; self end
 
-  # @return <Hash> The mash as a Hash with symbolized keys.
+  # @return [Hash] The mash as a Hash with symbolized keys.
   def symbolize_keys
     h = Hash.new(default)
     each { |key, val| h[key.to_sym] = val }
     h
   end
 
-  # @return <Hash> The mash as a Hash with string keys.
+  # @return [Hash] The mash as a Hash with string keys.
   def to_hash
     Hash.new(default).merge(self)
   end
@@ -127,7 +127,7 @@ class Mash < Hash
   protected
   # @param key<Object> The key to convert.
   #
-  # @param <Object>
+  # @param [Object]
   #   The converted key. If the key was a symbol, it will be converted to a
   #   string.
   #
@@ -138,7 +138,7 @@ class Mash < Hash
 
   # @param value<Object> The value to convert.
   #
-  # @return <Object>
+  # @return [Object]
   #   The converted value. A Hash or an Array of hashes, will be converted to
   #   their Mash equivalents.
   #

data/lib/extlib/object.rb

@@ -1,7 +1,7 @@
 class Object
   # Extracts the singleton class, so that metaprogramming can be done on it.
   #
-  # @return <Class> The meta class.
+  # @return [Class] The meta class.
   #
   # @example [Setup]
   #   class MyString < String; end
@@ -60,7 +60,7 @@ class Object
 
   # @param name<String> The name of the constant to get, e.g. "Merb::Router".
   #
-  # @return <Object> The constant corresponding to the name.
+  # @return [Object] The constant corresponding to the name.
   def full_const_get(name)
     list = name.split("::")
     list.shift if list.first.blank?
@@ -76,7 +76,7 @@ class Object
   # @param name<String> The name of the constant to get, e.g. "Merb::Router".
   # @param value<Object> The value to assign to the constant.
   #
-  # @return <Object> The constant corresponding to the name.
+  # @return [Object] The constant corresponding to the name.
   def full_const_set(name, value)
     list = name.split("::")
     toplevel = list.first.blank?
@@ -91,7 +91,7 @@ class Object
   #
   # @param name<String> The name of the full module name to make
   #
-  # @return <NilClass>
+  # @return [nil]
   def make_module(str)
     mod = str.split("::")
     current_module = self
@@ -114,7 +114,7 @@ class Object
   #     Check whether the object quacks_like? at least one of the options in the
   #     array.
   #
-  # @return <TrueClass, FalseClass>
+  # @return [Boolean]
   #   True if the object quacks like duck.
   def quacks_like?(duck)
     case duck
@@ -131,7 +131,7 @@ class Object
 
   # Override this in a child if it cannot be dup'ed
   #
-  # @return <Object>
+  # @return [Object]
   def try_dup
     self.dup
   end
@@ -140,7 +140,7 @@ class Object
   # returns result. If not, just returns receiver
   # itself
   #
-  # @return <Object>
+  # @return [Object]
   def try_call(*args)
     if self.respond_to?(:call)
       self.call(*args)
@@ -152,7 +152,7 @@ class Object
   # @param arrayish<#include?> Container to check, to see if it includes the object.
   # @param *more<Array>:: additional args, will be flattened into arrayish
   #
-  # @return <TrueClass, FalseClass>
+  # @return [Boolean]
   #   True if the object is included in arrayish (+ more)
   #
   # @example 1.in?([1,2,3]) #=> true
@@ -165,7 +165,7 @@ class Object
   # Add instance_variable_defined? for backward compatibility
   # @param variable<Symbol, String>
   #
-  # @return <TrueClass, FalseClass>
+  # @return [Boolean]
   #   True if the object has the given instance variable defined
   unless respond_to?(:instance_variable_defined?)
     def instance_variable_defined?(variable)

data/lib/extlib/object_space.rb

@@ -2,7 +2,7 @@ module ObjectSpace
 
   class << self
 
-    # @return <Array[Class]> All the classes in the object space.
+    # @return [Array<Class>] All the classes in the object space.
     def classes
       klasses = []
       ObjectSpace.each_object(Class) {|o| klasses << o}

data/lib/extlib/rubygems.rb

@@ -30,7 +30,7 @@ module Gem
     # from any other location. If there are two gems of different versions in
     # the gems directory, the later one will load as usual.
     #
-    # @return <Array[Array]> The object used for sorting gem specs.
+    # @return [Array<Array>] The object used for sorting gem specs.
     def sort_obj
       [@name, installation_path == File.join(defined?(Merb) && Merb.respond_to?(:root) ? Merb.root : Dir.pwd,"gems") ? 1 : -1, @version.to_ints, @new_platform == Gem::Platform::RUBY ? -1 : 1]
     end

data/lib/extlib/string.rb

@@ -36,9 +36,10 @@ class String
   #
   # @api public
   def snake_case
-    return self.downcase if self =~ /^[A-Z]+$/
-    self.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
-      return $+.downcase
+    return downcase if match(/\A[A-Z]+\z/)
+    gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+    gsub(/([a-z])([A-Z])/, '\1_\2').
+    downcase
   end
 
   ##

data/spec/inflection_extras_spec.rb

@@ -2,10 +2,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe Extlib::Inflection do
   describe "#classify" do
-    it 'classifies data_mapper as DataMaper' do
+    it 'classifies data_mapper as DataMapper' do
       Extlib::Inflection.classify('data_mapper').should == 'DataMapper'
     end
 
+    it "classifies enlarged_testes as EnlargedTestis" do
+      Extlib::Inflection.classify('enlarged_testes').should == 'EnlargedTestis'
+    end
+
     it "singularizes string first: classifies data_mappers as egg_and_hams as EggAndHam" do
       Extlib::Inflection.classify('egg_and_hams').should == 'EggAndHam'
     end
@@ -72,13 +76,26 @@ describe Extlib::Inflection do
       Extlib::Inflection.tableize('fancy_category').should == 'fancy_categories'
     end
 
+    it 'underscores CamelCase strings before pluralization: enlarged_testis => enlarged_testes' do
+      Extlib::Inflection.tableize('enlarged_testis').should == 'enlarged_testes'
+    end
+
     it 'underscores CamelCase strings before pluralization: FancyCategory => fancy_categories' do
       Extlib::Inflection.tableize('FancyCategory').should == 'fancy_categories'
     end
 
+    it 'underscores CamelCase strings before pluralization: EnlargedTestis => enlarged_testes' do
+      Extlib::Inflection.tableize('EnlargedTestis').should == 'enlarged_testes'
+    end
+
     it 'replaces :: with underscores: Fancy::Category => fancy_categories' do
       Extlib::Inflection.tableize('Fancy::Category').should == 'fancy_categories'
     end
+
+    it 'underscores CamelCase strings before pluralization: Enlarged::Testis => enlarged_testes' do
+      Extlib::Inflection.tableize('Enlarged::Testis').should == 'enlarged_testes'
+    end
+
   end
 
   describe "#foreign_key" do