extlib 0.9.11 → 0.9.12

data/History.txt

@@ -1,4 +1,13 @@
-=== 0.9.11 / not released
+=== 0.9.12 / 2009-05-05
+
+* 4 bug fixes
+
+  * Fixed constant lookup for nested constructs
+  * Moved ByteArray to the Extlib module
+  * Fix specs for recent RSpec versions
+  * Fix compatibility with ActiveSupport
+
+=== 0.9.11 / 2009-03-29
 
 * 1 major enhancement:
 

data/Rakefile

@@ -22,8 +22,8 @@ PROJECT_URL         = "http://extlib.rubyforge.org"
 PROJECT_SUMMARY     = "Support library for DataMapper and Merb."
 PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-AUTHOR = "Sam Smoot"
-EMAIL  = "ssmoot@gmail.com"
+AUTHOR = "Dan Kubb"
+EMAIL  = "dan.kubb@gmail.com"
 
 GEM_NAME    = "extlib"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''

data/lib/extlib/byte_array.rb

@@ -1,4 +1,6 @@
 # This class has exists to represent binary data. This is mainly
 # used by DataObjects. Binary data sometimes needs to be quoted differently
 # than regular string data (even if the string is just plain ASCII).
-class ByteArray < String; end
+module Extlib
+  class ByteArray < ::String; end
+end

data/lib/extlib/datetime.rb

@@ -9,7 +9,7 @@ class DateTime
   # @return [Time] Time object representing the same moment as receiver
   #
   # @api public
-  remove_method :to_time if method_defined?(:to_time) || private_method_defined?(:to_time)
+  remove_method :to_time if instance_methods(false).any? { |m| m.to_sym == :to_time }
   def to_time
     Time.parse self.to_s
   end
@@ -22,7 +22,7 @@ class DateTime
   # @return [DateTime] Receiver
   #
   # @api public
-  remove_method :to_datetime if method_defined?(:to_datetime) || private_method_defined?(:to_datetime)
+  remove_method :to_datetime if instance_methods(false).any? { |m| m.to_sym == :to_datetime }
   def to_datetime
     self
   end

data/lib/extlib/hook.rb

@@ -243,12 +243,12 @@ module Extlib
 
           private
 
-          remove_method :#{before_hook_name} if method_defined?(:#{before_hook_name}) || private_method_defined?(:#{before_hook_name})
+          remove_method :#{before_hook_name} if instance_methods(false).any? { |m| m.to_sym == :#{before_hook_name} }
           def #{before_hook_name}(*args)
             #{before_hooks}
           end
 
-          remove_method :#{after_hook_name} if method_defined?(:#{after_hook_name}) || private_method_defined?(:#{after_hook_name})
+          remove_method :#{after_hook_name} if instance_methods(false).any? { |m| m.to_sym == :#{after_hook_name} }
           def #{after_hook_name}(*args)
             #{after_hooks}
           end
@@ -288,7 +288,7 @@ module Extlib
           end
         EOD
 
-        if scope == :instance && !instance_methods(false).map { |m| m.to_s }.include?(target_method.to_s)
+        if scope == :instance && !instance_methods(false).any? { |m| m.to_sym == target_method }
           send(:alias_method, renamed_target, target_method)
 
           proxy_module = Module.new
@@ -330,12 +330,12 @@ module Extlib
             after_hook_name  = hook_method_name(target_method, 'execute_after',  'hook_stack')
 
             hooks[target_method][:in].class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              remove_method :#{before_hook_name} if method_defined?(:#{before_hook_name}) || private_method_defined?(:#{before_hook_name})
+              remove_method :#{before_hook_name} if instance_methods(false).any? { |m| m.to_sym == :#{before_hook_name} }
               def #{before_hook_name}(*args)
                 super
               end
 
-              remove_method :#{after_hook_name} if method_defined?(:#{after_hook_name}) || private_method_defined?(:#{after_hook_name})
+              remove_method :#{after_hook_name} if instance_methods(false).any? { |m| m.to_sym == :#{before_hook_name} }
               def #{after_hook_name}(*args)
                 super
               end

data/lib/extlib/mash.rb

@@ -112,6 +112,13 @@ class Mash < Hash
   # @return <Mash> This mash unchanged.
   def stringify_keys!; self end
 
+  # @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.
   def to_hash
     Hash.new(default).merge(self)

data/lib/extlib/module.rb

@@ -19,7 +19,7 @@ class Module
       constants = []
 
       name.split('::').each do |part|
-        const = constants.first || Object
+        const = constants.last || Object
         constants << const.const_get(part)
       end
 

data/lib/extlib/pathname.rb

@@ -14,7 +14,7 @@ class Pathname
   end
 
   # alias to_s to to_str when to_str not defined
-  unless public_instance_methods(false).any? { |m| m.to_s == 'to_str' }
+  unless public_instance_methods(false).any? { |m| m.to_sym == :to_str }
     alias to_str to_s
   end
 end # class Pathname

data/lib/extlib/time.rb

@@ -23,7 +23,7 @@ class Time
   # @return [Time] Receiver
   #
   # @api public
-  remove_method :to_time if method_defined?(:to_time) || private_method_defined?(:to_time)
+  remove_method :to_time if instance_methods(false).any? { |m| m.to_sym == :to_time }
   def to_time
     self
   end
@@ -36,7 +36,7 @@ class Time
   # @return [DateTime] DateTime object representing the same moment as receiver
   #
   # @api public
-  remove_method :to_datetime if method_defined?(:to_datetime) || private_method_defined?(:to_datetime)
+  remove_method :to_datetime if instance_methods(false).any? { |m| m.to_sym == :to_datetime }
   def to_datetime
     DateTime.parse self.to_s
   end

data/lib/extlib/version.rb

@@ -1,3 +1,3 @@
 module Extlib
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

data/spec/byte_array_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
-describe ByteArray do
+describe Extlib::ByteArray do
   it 'should be a String' do
-    ByteArray.new.should be_kind_of(String)
+    Extlib::ByteArray.new.should be_kind_of(String)
   end
 end

data/spec/class_spec.rb

@@ -148,10 +148,10 @@ end
 
 describe Class, "#inheritable_accessor" do
   it "uses object_id for comparison" do
-    Model.methods.map { |m| m.to_s }.should include("plugin_options")
+    Model.methods.map { |m| m.to_sym }.should be_include(:plugin_options)
     Model.plugin_options.should == :foo
 
-    Model::Version.methods.map { |m| m.to_s }.should include("plugin_options")
+    Model::Version.methods.map { |m| m.to_sym }.should be_include(:plugin_options)
     Model::Version.plugin_options.should == :foo
   end
 end

data/spec/hash_spec.rb

@@ -177,18 +177,18 @@ describe Hash, "from_xml" do
 
   it "should undasherize keys as tags" do
     xml = "<tag-1>Stuff</tag-1>"
-    Hash.from_xml(xml).keys.should include( 'tag_1' )
+    Hash.from_xml(xml).should have_key('tag_1')
   end
 
   it "should undasherize keys as attributes" do
     xml = "<tag1 attr-1='1'></tag1>"
-    Hash.from_xml(xml)['tag1'].keys.should include( 'attr_1')
+    Hash.from_xml(xml)['tag1'].should have_key('attr_1')
   end
 
   it "should undasherize keys as tags and attributes" do
     xml = "<tag-1 attr-1='1'></tag-1>"
-    Hash.from_xml(xml).keys.should include( 'tag_1' )
-    Hash.from_xml(xml)['tag_1'].keys.should include( 'attr_1')
+    Hash.from_xml(xml).should have_key('tag_1' )
+    Hash.from_xml(xml)['tag_1'].should have_key('attr_1')
   end
 
   it "should render nested content correctly" do

data/spec/hook_spec.rb

@@ -52,9 +52,9 @@ describe Extlib::Hook do
         end
 
         @another_class.register_class_hooks :method_one, :method_two, :method_three
-        @another_class.class_hooks.keys.should include(:method_one)
-        @another_class.class_hooks.keys.should include(:method_two)
-        @another_class.class_hooks.keys.should include(:method_three)
+        @another_class.class_hooks.should have_key(:method_one)
+        @another_class.class_hooks.should have_key(:method_two)
+        @another_class.class_hooks.should have_key(:method_three)
       end
 
       it "should not allow a method that does not exist to be registered as hookable" do
@@ -158,9 +158,9 @@ describe Extlib::Hook do
         end
 
         @another_class.register_instance_hooks :method_one, :method_two, :method_three
-        @another_class.instance_hooks.keys.should include(:method_one)
-        @another_class.instance_hooks.keys.should include(:method_two)
-        @another_class.instance_hooks.keys.should include(:method_three)
+        @another_class.instance_hooks.should have_key(:method_one)
+        @another_class.instance_hooks.should have_key(:method_two)
+        @another_class.instance_hooks.should have_key(:method_three)
       end
 
       it "should not allow a method that does not exist to be registered as hookable" do

data/spec/lazy_array_spec.rb

@@ -1913,7 +1913,7 @@ end
     describe 'a method mixed into Array' do
       before :all do
         Enumerable.class_eval do
-          remove_method :lazy_spec if method_defined?(:lazy_spec) || private_method_defined?(:lazy_spec)
+          remove_method :lazy_spec if instance_methods(false).any? { |m| m.to_sym == :lazy_spec }
           def lazy_spec
             true
           end

data/spec/mash_spec.rb

@@ -13,7 +13,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
@@ -52,7 +52,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
@@ -70,7 +70,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
@@ -89,36 +89,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?"
 
@@ -167,19 +167,44 @@ describe Mash do
 
 
 
+  describe "#symbolize_keys" do
+    it 'returns instance of Mash' do
+      Mash.new(@hash).symbolize_keys.should be_an_instance_of(Hash)
+    end
+
+    it 'converts keys to symbols' do
+      mash = Mash.new(@hash)
+      converted  = mash.symbolize_keys
+
+      converted_keys = converted.keys.sort{|k1, k2| k1.to_s <=> k2.to_s}
+      orig_keys = mash.keys.map{|k| k.to_sym}.sort{|i1, i2| i1.to_s <=> i2.to_s}
+
+      converted_keys.should == orig_keys
+    end
+
+    it 'preserves value' do
+      mash = Mash.new(@hash)
+      converted = mash.symbolize_keys
+
+      mash.values.sort.should == converted.values.sort
+    end
+  end
+
+
+
   describe "#delete" do
     it 'converts Symbol key into String before deleting' 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
 
@@ -190,22 +215,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/module_spec.rb

@@ -7,6 +7,8 @@ describe Module do
       module ModBar
         module Noo
           module Too
+            module Boo
+            end
           end
         end
       end
@@ -45,9 +47,19 @@ describe Module do
   end
 
   it "should find nested constants on nested constants" do
-    Foo::ModBar.find_const('Noo::Too')
+    Foo::ModBar.find_const('Noo::Too').should == Foo::ModBar::Noo::Too
   end
 
+  it "should find constants outside of nested constants" do
+    Foo::ModBar::Noo::Too.find_const("Zed").should == Foo::Zed
+  end
+
+  it 'should be able to find past the second nested level' do
+    Foo::ModBar::Noo.find_const('Too').should == Foo::ModBar::Noo::Too
+    Foo::ModBar::Noo::Too.find_const('Boo').should == Foo::ModBar::Noo::Too::Boo
+  end
+
+
   it "should be able to deal with constants being added and removed" do
     Object.find_const('Bar') # First we load Bar with find_const
     Object.module_eval { remove_const('Bar') } # Now we delete it

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

@@ -3,7 +3,7 @@ require 'timeout'
 
 module Extlib::Pooling
   class << self
-    remove_method :scavenger_interval if method_defined?(:scavenger_interval) || private_method_defined?(:scavenger_interval)
+    remove_method :scavenger_interval if instance_methods(false).any? { |m| m.to_sym == :scavenger_interval }
     def scavenger_interval
       1
     end
@@ -56,7 +56,7 @@ describe "Extlib::Pooling" do
       end
 
       class << self
-        remove_method :pool_size if method_defined?(:pool_size) || private_method_defined?(:pool_size)
+        remove_method :pool_size if instance_methods(false).any? { |m| m.to_sym == :pool_size }
         def pool_size
           pool_size = if RUBY_PLATFORM =~ /java/
             20
@@ -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/simple_set_spec.rb

@@ -19,12 +19,12 @@ describe Extlib::SimpleSet do
   describe "#<<" do
     it "adds value to the set" do
       @s << "Hello"
-      @s.to_a.should include("Hello")
+      @s.to_a.should be_include("Hello")
     end
 
     it 'sets true mark on the key' do
       @s << "Fun"
-      @s["Fun"].should be(true)
+      @s["Fun"].should be_true
     end
   end
 

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: extlib
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
-- Sam Smoot
+- Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Support library for DataMapper and Merb.
-email: ssmoot@gmail.com
+email: dan.kubb@gmail.com
 executables: []
 
 extensions: []
@@ -28,7 +28,6 @@ files:
 - README
 - Rakefile
 - History.txt
-- lib/extlib
 - lib/extlib/array.rb
 - lib/extlib/assertions.rb
 - lib/extlib/blank.rb
@@ -56,7 +55,6 @@ files:
 - lib/extlib/string.rb
 - lib/extlib/struct.rb
 - lib/extlib/symbol.rb
-- lib/extlib/tasks
 - lib/extlib/tasks/release.rb
 - lib/extlib/time.rb
 - lib/extlib/version.rb
@@ -69,7 +67,6 @@ files:
 - spec/datetime_spec.rb
 - spec/hash_spec.rb
 - spec/hook_spec.rb
-- spec/inflection
 - spec/inflection/plural_spec.rb
 - spec/inflection/singular_spec.rb
 - spec/inflection_extras_spec.rb
@@ -92,6 +89,8 @@ files:
 - spec/virtual_file_spec.rb
 has_rdoc: false
 homepage: http://extlib.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -112,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Support library for DataMapper and Merb.
 test_files: []