extlib 0.9.15 → 0.9.16

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Dan Kubb
+Copyright (c) 2010 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -14,4 +14,4 @@ Support library for DataMapper and Merb.
 
 == Copyright
 
-Copyright (c) 2009 Dan Kubb. See LICENSE for details.
+Copyright (c) 2010 Dan Kubb. See LICENSE for details.

data/Rakefile

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.8.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
     gem.name        = 'extlib'
-    gem.summary     = 'Support library for DataMapper and Merb'
+    gem.summary     = 'Support library for Merb'
     gem.description = gem.summary
     gem.email       = 'dan.kubb@gmail.com'
     gem.homepage    = 'http://github.com/datamapper/extlib'
@@ -23,5 +23,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| load task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.8.4'
 end

data/VERSION

@@ -1 +1 @@
-0.9.15
+0.9.16

data/extlib.gemspec

@@ -1,136 +1,105 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{extlib}
-  s.version = "0.9.15"
+  s.name = "extlib"
+  s.version = "0.9.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-05-18}
-  s.description = %q{Support library for DataMapper and Merb}
-  s.email = %q{dan.kubb@gmail.com}
+  s.date = "2013-01-08"
+  s.description = "Support library for Merb"
+  s.email = "dan.kubb@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".autotest",
-     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "extlib.gemspec",
-     "lib/extlib.rb",
-     "lib/extlib/array.rb",
-     "lib/extlib/assertions.rb",
-     "lib/extlib/blank.rb",
-     "lib/extlib/boolean.rb",
-     "lib/extlib/byte_array.rb",
-     "lib/extlib/class.rb",
-     "lib/extlib/datetime.rb",
-     "lib/extlib/dictionary.rb",
-     "lib/extlib/hash.rb",
-     "lib/extlib/hook.rb",
-     "lib/extlib/inflection.rb",
-     "lib/extlib/lazy_array.rb",
-     "lib/extlib/lazy_module.rb",
-     "lib/extlib/local_object_space.rb",
-     "lib/extlib/logger.rb",
-     "lib/extlib/mash.rb",
-     "lib/extlib/module.rb",
-     "lib/extlib/nil.rb",
-     "lib/extlib/numeric.rb",
-     "lib/extlib/object.rb",
-     "lib/extlib/object_space.rb",
-     "lib/extlib/pathname.rb",
-     "lib/extlib/pooling.rb",
-     "lib/extlib/rubygems.rb",
-     "lib/extlib/simple_set.rb",
-     "lib/extlib/string.rb",
-     "lib/extlib/struct.rb",
-     "lib/extlib/symbol.rb",
-     "lib/extlib/time.rb",
-     "lib/extlib/try_dup.rb",
-     "lib/extlib/virtual_file.rb",
-     "spec/array_spec.rb",
-     "spec/blank_spec.rb",
-     "spec/byte_array_spec.rb",
-     "spec/class_spec.rb",
-     "spec/datetime_spec.rb",
-     "spec/hash_spec.rb",
-     "spec/hook_spec.rb",
-     "spec/inflection/plural_spec.rb",
-     "spec/inflection/singular_spec.rb",
-     "spec/inflection_extras_spec.rb",
-     "spec/lazy_array_spec.rb",
-     "spec/lazy_module_spec.rb",
-     "spec/mash_spec.rb",
-     "spec/module_spec.rb",
-     "spec/object_space_spec.rb",
-     "spec/object_spec.rb",
-     "spec/pooling_spec.rb",
-     "spec/rcov.opts",
-     "spec/simple_set_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/string_spec.rb",
-     "spec/struct_spec.rb",
-     "spec/symbol_spec.rb",
-     "spec/time_spec.rb",
-     "spec/try_call_spec.rb",
-     "spec/try_dup_spec.rb",
-     "spec/virtual_file_spec.rb",
-     "tasks/ci.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
-  ]
-  s.homepage = %q{http://github.com/datamapper/extlib}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{extlib}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Support library for DataMapper and Merb}
-  s.test_files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "extlib.gemspec",
+    "lib/extlib.rb",
+    "lib/extlib/array.rb",
+    "lib/extlib/assertions.rb",
+    "lib/extlib/blank.rb",
+    "lib/extlib/boolean.rb",
+    "lib/extlib/byte_array.rb",
+    "lib/extlib/class.rb",
+    "lib/extlib/datetime.rb",
+    "lib/extlib/dictionary.rb",
+    "lib/extlib/hash.rb",
+    "lib/extlib/hook.rb",
+    "lib/extlib/inflection.rb",
+    "lib/extlib/lazy_array.rb",
+    "lib/extlib/lazy_module.rb",
+    "lib/extlib/local_object_space.rb",
+    "lib/extlib/logger.rb",
+    "lib/extlib/mash.rb",
+    "lib/extlib/module.rb",
+    "lib/extlib/nil.rb",
+    "lib/extlib/numeric.rb",
+    "lib/extlib/object.rb",
+    "lib/extlib/object_space.rb",
+    "lib/extlib/pathname.rb",
+    "lib/extlib/pooling.rb",
+    "lib/extlib/rubygems.rb",
+    "lib/extlib/simple_set.rb",
+    "lib/extlib/string.rb",
+    "lib/extlib/struct.rb",
+    "lib/extlib/symbol.rb",
+    "lib/extlib/time.rb",
+    "lib/extlib/try_dup.rb",
+    "lib/extlib/virtual_file.rb",
     "spec/array_spec.rb",
-     "spec/blank_spec.rb",
-     "spec/byte_array_spec.rb",
-     "spec/class_spec.rb",
-     "spec/datetime_spec.rb",
-     "spec/hash_spec.rb",
-     "spec/hook_spec.rb",
-     "spec/inflection/plural_spec.rb",
-     "spec/inflection/singular_spec.rb",
-     "spec/inflection_extras_spec.rb",
-     "spec/lazy_array_spec.rb",
-     "spec/lazy_module_spec.rb",
-     "spec/mash_spec.rb",
-     "spec/module_spec.rb",
-     "spec/object_space_spec.rb",
-     "spec/object_spec.rb",
-     "spec/pooling_spec.rb",
-     "spec/simple_set_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/string_spec.rb",
-     "spec/struct_spec.rb",
-     "spec/symbol_spec.rb",
-     "spec/time_spec.rb",
-     "spec/try_call_spec.rb",
-     "spec/try_dup_spec.rb",
-     "spec/virtual_file_spec.rb"
+    "spec/blank_spec.rb",
+    "spec/byte_array_spec.rb",
+    "spec/class_spec.rb",
+    "spec/datetime_spec.rb",
+    "spec/hash_spec.rb",
+    "spec/hook_spec.rb",
+    "spec/inflection/plural_spec.rb",
+    "spec/inflection/singular_spec.rb",
+    "spec/inflection_extras_spec.rb",
+    "spec/lazy_array_spec.rb",
+    "spec/lazy_module_spec.rb",
+    "spec/mash_spec.rb",
+    "spec/module_spec.rb",
+    "spec/object_space_spec.rb",
+    "spec/object_spec.rb",
+    "spec/pooling_spec.rb",
+    "spec/rcov.opts",
+    "spec/simple_set_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/string_spec.rb",
+    "spec/struct_spec.rb",
+    "spec/symbol_spec.rb",
+    "spec/time_spec.rb",
+    "spec/try_call_spec.rb",
+    "spec/try_dup_spec.rb",
+    "spec/virtual_file_spec.rb",
+    "tasks/ci.rake",
+    "tasks/metrics.rake",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
+  s.homepage = "http://github.com/datamapper/extlib"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "extlib"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Support library for Merb"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<json_pure>, ["~> 1.4"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else

data/lib/extlib/hash.rb

@@ -1,5 +1,6 @@
-require "time"
 require 'bigdecimal'
+require 'time'
+require 'uri'
 
 require 'extlib/object'
 require 'extlib/mash'
@@ -7,6 +8,8 @@ require 'extlib/class'
 require 'extlib/string'
 
 class Hash
+  URI_ENCODE_PATTERN = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]").freeze
+
   class << self
     # Converts valid XML into a Ruby Hash structure.
     #
@@ -135,7 +138,7 @@ class Hash
     elsif value.is_a?(Hash)
       stack << [key,value]
     else
-      param << "#{key}=#{value}&"
+      param << [key,value].map {|v| URI.encode(v.to_s, URI_ENCODE_PATTERN)}.join('=') + '&'
     end
 
     stack.each do |parent, hash|
@@ -279,9 +282,7 @@ class REXMLUtilityNode
   self.typecasts["decimal"]       = lambda{|v| BigDecimal(v)}
   self.typecasts["double"]        = lambda{|v| v.nil? ? nil : v.to_f}
   self.typecasts["float"]         = lambda{|v| v.nil? ? nil : v.to_f}
-  self.typecasts["symbol"]        = lambda{|v| v.to_sym}
   self.typecasts["string"]        = lambda{|v| v.to_s}
-  self.typecasts["yaml"]          = lambda{|v| v.nil? ? nil : YAML.load(v)}
   self.typecasts["base64Binary"]  = lambda{|v| v.unpack('m').first }
 
   self.available_typecasts = self.typecasts.keys

data/lib/extlib/inflection.rb

@@ -322,96 +322,97 @@ module Extlib
     # One argument means singular and plural are the same.
 
     word 'equipment'
-    word 'information'
-    word 'money'
-    word 'species'
-    word 'series'
     word 'fish'
-    word 'sheep'
-    word 'moose'
-    word 'hovercraft'
     word 'grass'
-    word 'rain'
+    word 'hovercraft'
+    word 'information'
     word 'milk'
-    word 'rice'
+    word 'money'
+    word 'moose'
     word 'plurals'
     word 'postgres'
+    word 'rain'
+    word 'rice'
+    word 'series'
+    word 'sheep'
+    word 'species'
     word 'status'
 
     # Two arguments defines a singular and plural exception.
-    word 'status'    , 'status'
-    word 'Swiss'     , 'Swiss'
-    word 'life'      , 'lives'
-    word 'wife'      , 'wives'
-    word 'goose'     , 'geese'
-    word 'criterion' , 'criteria'
-    word 'alias'     , 'aliases'
-    word 'status'    , 'statuses'
-    word 'axis'      , 'axes'
-    word 'crisis'    , 'crises'
-    word 'testis'    , 'testes'
-    word 'potato'    , 'potatoes'
-    word 'tomato'    , 'tomatoes'
-    word 'buffalo'   , 'buffaloes'
-    word 'torpedo'   , 'torpedoes'
-    word 'quiz'      , 'quizzes'
-    word 'matrix'    , 'matrices'
-    word 'vertex'    , 'vertices'
-    word 'index'     , 'indices'
-    word 'ox'        , 'oxen'
-    word 'mouse'     , 'mice'
-    word 'louse'     , 'lice'
-    word 'thesis'    , 'theses'
-    word 'thief'     , 'thieves'
-    word 'analysis'  , 'analyses'
-    word 'erratum'   , 'errata'
-    word 'phenomenon', 'phenomena'
-    word 'octopus'   , 'octopi'
-    word 'thesaurus' , 'thesauri'
-    word 'movie'     , 'movies'
-    word 'cactus'    , 'cacti'
-    word 'plus'      , 'plusses'
-    word 'cross'     , 'crosses'
-    word 'medium'    , 'media'
-    word 'datum'     , 'data'
-    word 'basis'     , 'bases'
-    word 'diagnosis' , 'diagnoses'
+    word 'alias'      , 'aliases'
+    word 'analysis'   , 'analyses'
+    word 'axis'       , 'axes'
+    word 'basis'      , 'bases'
+    word 'buffalo'    , 'buffaloes'
+    word 'cactus'     , 'cacti'
+    word 'crisis'     , 'crises'
+    word 'criterion'  , 'criteria'
+    word 'cross'      , 'crosses'
+    word 'datum'      , 'data'
+    word 'diagnosis'  , 'diagnoses'
+    word 'drive'      , 'drives'
+    word 'erratum'    , 'errata'
+    word 'goose'      , 'geese'
+    word 'index'      , 'indices'
+    word 'life'       , 'lives'
+    word 'louse'      , 'lice'
+    word 'matrix'     , 'matrices'
+    word 'medium'     , 'media'
+    word 'mouse'      , 'mice'
+    word 'movie'      , 'movies'
+    word 'octopus'    , 'octopi'
+    word 'ox'         , 'oxen'
+    word 'phenomenon' , 'phenomena'
+    word 'plus'       , 'plusses'
+    word 'potato'     , 'potatoes'
+    word 'quiz'       , 'quizzes'
+    word 'status'     , 'status'
+    word 'status'     , 'statuses'
+    word 'Swiss'      , 'Swiss'
+    word 'testis'     , 'testes'
+    word 'thesaurus'  , 'thesauri'
+    word 'thesis'     , 'theses'
+    word 'thief'      , 'thieves'
+    word 'tomato'     , 'tomatoes'
+    word 'torpedo'    , 'torpedoes'
+    word 'vertex'     , 'vertices'
+    word 'wife'       , 'wives'
 
     # One-way singularization exception (convert plural to singular).
 
     # General rules.
-    rule 'person' , 'people', true
-    rule 'shoe'   , 'shoes', true
-    rule 'hive'   , 'hives', true
-    rule 'man'    , 'men', true
+    rule 'person' , 'people',   true
+    rule 'shoe'   , 'shoes',    true
+    rule 'hive'   , 'hives',    true
+    rule 'man'    , 'men',      true
     rule 'child'  , 'children', true
-    rule 'news'   , 'news', true
-    rule 'rf'   , 'rves'
-    rule 'af'   , 'aves'
-    rule 'ero'  , 'eroes'
-    rule 'man'  , 'men'
-    rule 'ch'   , 'ches'
-    rule 'sh'   , 'shes'
-    rule 'ss'   , 'sses'
-    rule 'ta'   , 'tum'
-    rule 'ia'   , 'ium'
-    rule 'ra'   , 'rum'
-    rule 'ay'   , 'ays'
-    rule 'ey'   , 'eys'
-    rule 'oy'   , 'oys'
-    rule 'uy'   , 'uys'
-    rule 'y'    , 'ies'
-    rule 'x'    , 'xes'
-    rule 'lf'   , 'lves'
-    rule 'ffe'  , 'ffes'
-    rule 'afe'  , 'aves'
-    rule 'ouse' , 'ouses'
+    rule 'news'   , 'news',     true
+    rule 'rf'     , 'rves'
+    rule 'af'     , 'aves'
+    rule 'ero'    , 'eroes'
+    rule 'man'    , 'men'
+    rule 'ch'     , 'ches'
+    rule 'sh'     , 'shes'
+    rule 'ss'     , 'sses'
+    rule 'ta'     , 'tum'
+    rule 'ia'     , 'ium'
+    rule 'ra'     , 'rum'
+    rule 'ay'     , 'ays'
+    rule 'ey'     , 'eys'
+    rule 'oy'     , 'oys'
+    rule 'uy'     , 'uys'
+    rule 'y'      , 'ies'
+    rule 'x'      , 'xes'
+    rule 'lf'     , 'lves'
+    rule 'ffe'    , 'ffes'
+    rule 'afe'    , 'aves'
+    rule 'ouse'   , 'ouses'
     # more cases of words ending in -oses not being singularized properly
     # than cases of words ending in -osis
-#    rule 'osis' , 'oses'
-    rule 'ox'   , 'oxes'
-    rule 'us'   , 'uses'
-    rule ''     , 's'
+#    rule 'osis'   , 'oses'
+    rule 'ox'     , 'oxes'
+    rule 'us'     , 'uses'
+    rule ''       , 's'
 
     # One-way singular rules.
 
@@ -426,7 +427,6 @@ module Extlib
     plural_rule 'ive' , 'ives' # don't want to snag wife
     plural_rule 'fe'  , 'ves'  # don't want to snag perspectives
 
-
   end
 end
 

data/spec/hash_spec.rb

@@ -141,12 +141,12 @@ describe Hash, "from_xml" do
 
   it "should typecast a true boolean" do
     xml = "<tag type='boolean'>true</tag>"
-    Hash.from_xml(xml)['tag'].should be_true
+    Hash.from_xml(xml)['tag'].should be(true)
   end
 
   it "should typecast a false boolean" do
     ["false"].each do |w|
-      Hash.from_xml("<tag type='boolean'>#{w}</tag>")['tag'].should be_false
+      Hash.from_xml("<tag type='boolean'>#{w}</tag>")['tag'].should be(false)
     end
   end
 
@@ -254,7 +254,7 @@ describe Hash, "from_xml" do
       'approved'   => nil,
       'written_on' => nil,
       'viewed_at'  => nil,
-      'content'    => nil,
+      'content'    => { 'type' => 'yaml' },
       'parent_id'  => nil
     }
     Hash.from_xml(topic_xml)["topic"].should == expected_topic_hash
@@ -292,12 +292,12 @@ describe Hash, "from_xml" do
       # Changed this line where the key is :message.  The yaml specifies this as a symbol, and who am I to change what you specify
       # The line in ActiveSupport is
       # 'content' => { 'message' => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
-      'content' => { :message => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
+      'content' => "--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true\n",
       'author_email_address' => "david@loudthinking.com",
       'parent_id' => nil,
       'ad_revenue' => BigDecimal("1.50"),
       'optimum_viewing_angle' => 135.0,
-      'resident' => :yes
+      'resident' => 'yes'
     }
 
     Hash.from_xml(topic_xml)["topic"].each do |k,v|
@@ -509,10 +509,10 @@ end
 describe Hash, 'to_params' do
   {
     { "foo" => "bar", "baz" => "bat" } => "foo=bar&baz=bat",
-    { "foo" => [ "bar", "baz" ] } => "foo[]=bar&foo[]=baz",
-    { "foo" => [ {"bar" => "1"}, {"bar" => 2} ] } => "foo[][bar]=1&foo[][bar]=2",
-    { "foo" => { "bar" => [ {"baz" => 1}, {"baz" => "2"}  ] } } => "foo[bar][][baz]=1&foo[bar][][baz]=2",
-    { "foo" => {"1" => "bar", "2" => "baz"} } => "foo[1]=bar&foo[2]=baz"
+    { "foo" => [ "bar", "baz" ] } => "foo%5B%5D=bar&foo%5B%5D=baz",
+    { "foo" => [ {"bar" => "1"}, {"bar" => 2} ] } => "foo%5B%5D%5Bbar%5D=1&foo%5B%5D%5Bbar%5D=2",
+    { "foo" => { "bar" => [ {"baz" => 1}, {"baz" => "2"}  ] } } => "foo%5Bbar%5D%5B%5D%5Bbaz%5D=1&foo%5Bbar%5D%5B%5D%5Bbaz%5D=2",
+    { "foo" => {"1" => "bar", "2" => "baz"} } => "foo%5B1%5D=bar&foo%5B2%5D=baz"
   }.each do |hash, params|
     it "should covert hash: #{hash.inspect} to params: #{params.inspect}" do
       hash.to_params.split('&').sort.should == params.split('&').sort
@@ -522,6 +522,14 @@ describe Hash, 'to_params' do
   it 'should not leave a trailing &' do
     { :name => 'Bob', :address => { :street => '111 Ruby Ave.', :city => 'Ruby Central', :phones => ['111-111-1111', '222-222-2222'] } }.to_params.should_not match(/&$/)
   end
+
+  it 'should encode query keys' do
+    { 'First & Last' => 'Alice Smith' }.to_params.should == "First%20%26%20Last=Alice%20Smith"
+  end
+
+  it 'should encode query values' do
+    { :name => 'Alice & Bob' }.to_params.should == "name=Alice%20%26%20Bob"
+  end
 end
 
 describe Hash, 'to_mash' do

data/spec/inflection/plural_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'extlib/inflection'
 
-describe Extlib::Inflection, "#singular" do
+describe Extlib::Inflection, "#plural" do
   it "pluralizes equipment => equipment" do
     "equipment".plural.should == "equipment"
   end
@@ -50,7 +50,7 @@ describe Extlib::Inflection, "#singular" do
     "hovercraft".plural.should == "hovercraft"
   end
 
-  it "pluralizes cacti => cactus" do
+  it "pluralizes cactus => cacti" do
     "cactus".plural.should == "cacti"
   end
 
@@ -176,16 +176,12 @@ describe Extlib::Inflection, "#singular" do
     "phenomenon".plural.should == "phenomena"
   end
 
-
-
-
+  it "pluralizes drive => drives" do
+    "drive".plural.should == "drives"
+  end
 
   # ==== bugs, typos and reported issues
 
-
-
-
-
   # ==== rules and most common cases
 
   it "pluralizes forum => forums" do

data/spec/inflection/singular_spec.rb

@@ -60,10 +60,14 @@ describe Extlib::Inflection, "#singular" do
     "hovercraft".singular.should == "hovercraft"
   end
 
-  it "singularizes cactus => cacti" do
+  it "singularizes cacti => cactus" do
     "cacti".singular.should == "cactus"
   end
 
+  it "singularizes cactuses => cactus" do
+    "cactuses".singular.should == "cactus"
+  end
+
   it "singularizes thesauri => thesaurus" do
     "thesauri".singular.should == "thesaurus"
   end
@@ -150,6 +154,10 @@ describe Extlib::Inflection, "#singular" do
     "indices".singular.should == "index"
   end
 
+  it "singularizes indexes => index" do
+    "indexes".singular.should == "index"
+  end
+
   it "singularizes oxen => ox" do
     "oxen".singular.should == "ox"
   end
@@ -186,16 +194,12 @@ describe Extlib::Inflection, "#singular" do
     "phenomena".singular.should == "phenomenon"
   end
 
-
-
-
+  it "singularizes drives => drive" do
+    "drives".singular.should == "drive"
+  end
 
   # ==== bugs, typos and reported issues
 
-
-
-
-
   # ==== rules
 
   it "singularizes forums => forum" do

data/spec/lazy_array_spec.rb

@@ -54,13 +54,13 @@ module LazyArraySpec
 
     def should_return_true
       it 'should return true' do
-        action.should be_true
+        action.should be(true)
       end
     end
 
     def should_return_false
       it 'should return false' do
-        action.should be_false
+        action.should be(false)
       end
     end
 
@@ -151,7 +151,7 @@ end
     subject { @lazy_array }
 
     it 'should be an Enumerable' do
-      (Enumerable === subject).should be_true
+      (Enumerable === subject).should be(true)
     end
 
     describe 'when frozen', state do
@@ -1948,7 +1948,7 @@ end
       end
 
       it 'should delegate to the Array' do
-        subject.lazy_spec.should be_true
+        subject.lazy_spec.should be(true)
       end
     end
 

data/spec/mash_spec.rb

@@ -14,7 +14,7 @@ describe Mash do
     it 'converts all keys into strings when param is a Hash' do
       mash = Mash.new(@hash)
 
-      mash.keys.any? { |key| key.is_a?(Symbol) }.should be_false
+      mash.keys.any? { |key| key.is_a?(Symbol) }.should be(false)
     end
 
     it 'converts all pure Hash values into Mashes if param is a Hash' do
@@ -53,7 +53,7 @@ describe Mash do
       mash = Mash.new(@hash)
       mash.update("starry" => "night")
 
-      mash.keys.any? { |key| key.is_a?(Symbol) }.should be_false
+      mash.keys.any? { |key| key.is_a?(Symbol) }.should be(false)
     end
 
     it 'converts all Hash values into Mashes if param is a Hash' do
@@ -71,7 +71,7 @@ describe Mash do
       mash = Mash.new(@hash)
       mash[:hash] = { "starry" => "night" }
 
-      mash.keys.any? { |key| key.is_a?(Symbol) }.should be_false
+      mash.keys.any? { |key| key.is_a?(Symbol) }.should be(false)
     end
 
     it 'converts all Hash value into Mash' do
@@ -90,36 +90,36 @@ describe Mash do
     end
 
     it 'converts key before lookup' do
-      @mash.key?("mash").should be_true
-      @mash.key?(:mash).should be_true
+      @mash.key?("mash").should be(true)
+      @mash.key?(:mash).should be(true)
 
-      @mash.key?("hash").should be_true
-      @mash.key?(:hash).should be_true
+      @mash.key?("hash").should be(true)
+      @mash.key?(:hash).should be(true)
 
-      @mash.key?(:rainclouds).should be_false
-      @mash.key?("rainclouds").should be_false
+      @mash.key?(:rainclouds).should be(false)
+      @mash.key?("rainclouds").should be(false)
     end
 
     it 'is aliased as include?' do
-      @mash.include?("mash").should be_true
-      @mash.include?(:mash).should be_true
+      @mash.include?("mash").should be(true)
+      @mash.include?(:mash).should be(true)
 
-      @mash.include?("hash").should be_true
-      @mash.include?(:hash).should be_true
+      @mash.include?("hash").should be(true)
+      @mash.include?(:hash).should be(true)
 
-      @mash.include?(:rainclouds).should be_false
-      @mash.include?("rainclouds").should be_false
+      @mash.include?(:rainclouds).should be(false)
+      @mash.include?("rainclouds").should be(false)
     end
 
     it 'is aliased as member?' do
-      @mash.member?("mash").should be_true
-      @mash.member?(:mash).should be_true
+      @mash.member?("mash").should be(true)
+      @mash.member?(:mash).should be(true)
 
-      @mash.member?("hash").should be_true
-      @mash.member?(:hash).should be_true
+      @mash.member?("hash").should be(true)
+      @mash.member?(:hash).should be(true)
 
-      @mash.member?(:rainclouds).should be_false
-      @mash.member?("rainclouds").should be_false
+      @mash.member?(:rainclouds).should be(false)
+      @mash.member?("rainclouds").should be(false)
     end
   end # describe "#key?"
 
@@ -198,14 +198,14 @@ describe Mash do
       mash = Mash.new(@hash)
 
       mash.delete(:hash)
-      mash.key?("hash").should be_false
+      mash.key?("hash").should be(false)
     end
 
     it 'works with String keys as well' do
       mash = Mash.new(@hash)
 
       mash.delete("mash")
-      mash.key?("mash").should be_false
+      mash.key?("mash").should be(false)
     end
   end
 
@@ -216,22 +216,22 @@ describe Mash do
       mash = Mash.new(@hash)
 
       hashless_mash = mash.except(:hash)
-      hashless_mash.key?("hash").should be_false
+      hashless_mash.key?("hash").should be(false)
     end
 
     it "works with String keys as well" do
       mash = Mash.new(@hash)
 
       mashless_mash = mash.except("mash")
-      mashless_mash.key?("mash").should be_false
+      mashless_mash.key?("mash").should be(false)
     end
 
     it "works with multiple keys" do
       mash = Mash.new(@hash)
 
       mashless = mash.except("hash", :mash)
-      mashless.key?(:hash).should be_false
-      mashless.key?("mash").should be_false
+      mashless.key?(:hash).should be(false)
+      mashless.key?("mash").should be(false)
     end
 
     it "should return a mash" do

data/spec/object_spec.rb

@@ -62,35 +62,35 @@ describe Object do
 
   describe "#quacks_like?" do
     it 'returns true if duck is a Symbol and receiver responds to it' do
-      SymbolicDuck.new.quacks_like?(:quack).should be_true
+      SymbolicDuck.new.quacks_like?(:quack).should be(true)
     end
 
     it 'returns false if duck is a Symbol and receiver DOES NOT respond to it' do
-      SymbolicDuck.new.quacks_like?(:wtf).should be_false
+      SymbolicDuck.new.quacks_like?(:wtf).should be(false)
     end
 
     it 'returns true if duck is a class and receiver is its instance' do
       receiver = ClassyDuck.new
-      receiver.quacks_like?(ClassyDuck).should be_true
+      receiver.quacks_like?(ClassyDuck).should be(true)
     end
 
     it 'returns false if duck is a class and receiver IS NOT its instance' do
       receiver = ClassyDuck.new
-      receiver.quacks_like?(SymbolicDuck).should be_false
+      receiver.quacks_like?(SymbolicDuck).should be(false)
     end
 
     it 'returns true if duck is an array and at least one of its members quacks like this duck' do
       receiver = ClassyDuck.new
       ary      = [ClassyDuck, SymbolicDuck]
 
-      receiver.quacks_like?(ary).should be_true
+      receiver.quacks_like?(ary).should be(true)
     end
 
     it 'returns false if duck is an array and none of its members quacks like this duck' do
       receiver = ClassyDuck.new
       ary      = [SymbolicDuck.new, SymbolicDuck]
 
-      receiver.quacks_like?(ary).should be_false
+      receiver.quacks_like?(ary).should be(false)
     end
   end
 
@@ -99,16 +99,16 @@ describe Object do
       @ary = [1, 2, 3]
       @set = Set.new([2, 3, 5])
 
-      1.in?(@ary).should be_true
-      2.in?(@ary).should be_true
-      3.in?(@ary).should be_true
-      4.in?(@ary).should be_false
+      1.in?(@ary).should be(true)
+      2.in?(@ary).should be(true)
+      3.in?(@ary).should be(true)
+      4.in?(@ary).should be(false)
 
-      1.in?(@set).should be_false
-      2.in?(@set).should be_true
-      3.in?(@set).should be_true
-      4.in?(@set).should be_false
-      5.in?(@set).should be_true
+      1.in?(@set).should be(false)
+      2.in?(@set).should be(true)
+      3.in?(@set).should be(true)
+      4.in?(@set).should be(false)
+      5.in?(@set).should be(true)
     end
   end
 end

data/spec/pooling_spec.rb

@@ -156,7 +156,7 @@ describe "Extlib::Pooling" do
     bob.release
     Extlib.exiting = true
     sleep(0.1)
-    Extlib::Pooling.scavenger?.should be_false
+    Extlib::Pooling.scavenger?.should be(false)
   end
 
   it "should be able to detach an instance from the pool" do
@@ -431,7 +431,7 @@ end
 #   it "acquires new instances from pool" do
 #     @instance_one = DisposableResource.new
 #
-#     DisposableResource.pool.acquired?(@instance_one).should be_true
+#     DisposableResource.pool.acquired?(@instance_one).should be(true)
 #   end
 #
 #   it "flushed existing pool on re-initialization" do
@@ -483,10 +483,10 @@ end
 #
 #   it "returns true when object's last aquisition time is greater than limit" do
 #     @t1 = DisposableResource.new
-#     DisposableResource.pool.time_to_release?(@t1).should be_false
+#     DisposableResource.pool.time_to_release?(@t1).should be(false)
 #
 #     sleep 3
-#     DisposableResource.pool.time_to_release?(@t1).should be_true
+#     DisposableResource.pool.time_to_release?(@t1).should be(true)
 #   end
 # end
 #

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/simple_set_spec.rb

@@ -25,7 +25,7 @@ describe Extlib::SimpleSet do
 
     it 'sets true mark on the key' do
       @s << "Fun"
-      @s["Fun"].should be_true
+      @s["Fun"].should be(true)
     end
   end
 

data/tasks/spec.rake

@@ -1,22 +1,38 @@
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-
 spec_defaults = lambda do |spec|
   spec.pattern    = 'spec/**/*_spec.rb'
   spec.libs      << 'lib' << 'spec'
   spec.spec_opts << '--options' << 'spec/spec.opts'
 end
 
-Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+begin
+  require 'spec/rake/spectask'
 
-Spec::Rake::SpecTask.new(:rcov) do |rcov|
-  spec_defaults.call(rcov)
-  rcov.rcov      = true
-  rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
 end
 
-RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
-  rcov.threshold = 100
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
 end
 
 task :spec => :check_dependencies

metadata

@@ -1,61 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: extlib
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 15
-  version: 0.9.15
+version: !ruby/object:Gem::Version
+  version: 0.9.16
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-18 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-description: Support library for DataMapper and Merb
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+description: Support library for Merb
 email: dan.kubb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .autotest
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -126,60 +123,28 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/extlib
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: extlib
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Support library for DataMapper and Merb
-test_files: 
-- spec/array_spec.rb
-- spec/blank_spec.rb
-- spec/byte_array_spec.rb
-- spec/class_spec.rb
-- spec/datetime_spec.rb
-- spec/hash_spec.rb
-- spec/hook_spec.rb
-- spec/inflection/plural_spec.rb
-- spec/inflection/singular_spec.rb
-- spec/inflection_extras_spec.rb
-- spec/lazy_array_spec.rb
-- spec/lazy_module_spec.rb
-- spec/mash_spec.rb
-- spec/module_spec.rb
-- spec/object_space_spec.rb
-- spec/object_spec.rb
-- spec/pooling_spec.rb
-- spec/simple_set_spec.rb
-- spec/spec_helper.rb
-- spec/string_spec.rb
-- spec/struct_spec.rb
-- spec/symbol_spec.rb
-- spec/time_spec.rb
-- spec/try_call_spec.rb
-- spec/try_dup_spec.rb
-- spec/virtual_file_spec.rb
+summary: Support library for Merb
+test_files: []

data/.gitignore

@@ -1,35 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-
-## PROJECT::SPECIFIC