extlib 0.9.14 → 0.9.15

data/.gitignore

@@ -13,10 +13,23 @@ tmtags
 ## VIM
 *.swp
 
+## Rubinius
+*.rbc
+
 ## PROJECT::GENERAL
+*.gem
 coverage
 rdoc
 pkg
 tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/Rakefile

@@ -15,9 +15,8 @@ begin
 
     gem.rubyforge_project = 'extlib'
 
-    gem.add_development_dependency 'json_pure', '~> 1.2.0'
-    gem.add_development_dependency 'rspec',     '~> 1.2.9'
-    gem.add_development_dependency 'yard',      '~> 0.4.0'
+    gem.add_development_dependency 'json_pure', '~> 1.4'
+    gem.add_development_dependency 'rspec',     '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.9.14
+0.9.15

data/extlib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{extlib}
-  s.version = "0.9.14"
+  s.version = "0.9.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-05-18}
   s.description = %q{Support library for DataMapper and Merb}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "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",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
      "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",
@@ -93,7 +95,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{extlib}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Support library for DataMapper and Merb}
   s.test_files = [
     "spec/array_spec.rb",
@@ -129,18 +131,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<json_pure>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_development_dependency(%q<json_pure>, ["~> 1.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<json_pure>, ["~> 1.2.0"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<json_pure>, ["~> 1.4"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<json_pure>, ["~> 1.2.0"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<json_pure>, ["~> 1.4"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end
 

data/lib/extlib.rb

@@ -1,10 +1,10 @@
 require 'pathname'
 
-# for Pathname /
 require 'extlib/pathname'
 require 'extlib/class.rb'
 require 'extlib/object'
 require 'extlib/object_space'
+require 'extlib/local_object_space'
 require 'extlib/array'
 require 'extlib/string'
 require 'extlib/symbol'
@@ -27,6 +27,7 @@ require 'extlib/blank'
 require 'extlib/simple_set'
 require 'extlib/struct'
 require 'extlib/symbol'
+require 'extlib/try_dup'
 
 Extlib.autoload('Hook', 'extlib/hook')
 Extlib.autoload('Pooling', 'extlib/pooling')

data/lib/extlib/array.rb

@@ -1,3 +1,5 @@
+require 'extlib/mash'
+
 class Array
 
   ##

data/lib/extlib/class.rb

@@ -1,3 +1,5 @@
+require 'extlib/try_dup'
+
 # Copyright (c) 2004-2008 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining

data/lib/extlib/datetime.rb

@@ -1,4 +1,4 @@
-require "date"
+require 'time'
 
 class DateTime
   ##

data/lib/extlib/hash.rb

@@ -1,3 +1,11 @@
+require "time"
+require 'bigdecimal'
+
+require 'extlib/object'
+require 'extlib/mash'
+require 'extlib/class'
+require 'extlib/string'
+
 class Hash
   class << self
     # Converts valid XML into a Ruby Hash structure.

data/lib/extlib/hook.rb

@@ -1,3 +1,8 @@
+require 'extlib/assertions'
+require 'extlib/class'
+require 'extlib/object'
+require 'extlib/local_object_space'
+
 module Extlib
   #
   # TODO: Write more documentation!
@@ -30,16 +35,19 @@ module Extlib
         class << self
           def method_added(name)
             process_method_added(name, :instance)
+            super
           end
 
           def singleton_method_added(name)
             process_method_added(name, :class)
+            super
           end
         end
       end
     end
 
     module ClassMethods
+      extend Extlib::LocalObjectSpace
       include Extlib::Assertions
       # Inject code that executes before the target class method.
       #
@@ -260,14 +268,15 @@ module Extlib
       # Returns ruby code that will invoke the hook. It checks the arity of the hook method
       # and passes arguments accordingly.
       def inline_call(method_info, scope)
+        Extlib::Hook::ClassMethods.hook_scopes << method_info[:from]
         name = method_info[:name]
 
         if scope == :instance
           args = method_defined?(name) && instance_method(name).arity != 0 ? '*args' : ''
-          %(#{name}(#{args}) if self.class <= ObjectSpace._id2ref(#{method_info[:from].object_id}))
+          %(#{name}(#{args}) if self.class <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
         else
           args = respond_to?(name) && method(name).arity != 0 ? '*args' : ''
-          %(#{name}(#{args}) if self <= ObjectSpace._id2ref(#{method_info[:from].object_id}))
+          %(#{name}(#{args}) if self <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
         end
       end
 

data/lib/extlib/inflection.rb

@@ -1,3 +1,5 @@
+require 'extlib/string'
+
 module Extlib
 
   # = English Nouns Number Inflection.

data/lib/extlib/lazy_array.rb

@@ -1,3 +1,5 @@
+require 'extlib/try_dup'
+
 class LazyArray  # borrowed partially from StrokeDB
   include Enumerable
 

data/lib/extlib/local_object_space.rb

@@ -0,0 +1,12 @@
+module Extlib
+  module LocalObjectSpace
+    def self.extended(klass)
+      (class << klass; self; end).send :attr_accessor, :hook_scopes
+      klass.hook_scopes = []
+    end
+
+    def object_by_id(object_id)
+      self.hook_scopes.detect {|object| object.object_id == object_id}
+    end
+  end
+end

data/lib/extlib/mash.rb

@@ -1,3 +1,5 @@
+require 'extlib/hash'
+
 # This class has dubious semantics and we only have it so that people can write
 # params[:key] instead of params['key'].
 class Mash < Hash

data/lib/extlib/module.rb

@@ -1,3 +1,7 @@
+require 'extlib/object'
+require 'extlib/class'
+require 'extlib/blank'
+
 class Module
   def find_const(const_name)
     if const_name[0..1] == '::'

data/lib/extlib/object.rb

@@ -1,3 +1,6 @@
+require 'set'
+require 'extlib/blank'
+
 class Object
   # Extracts the singleton class, so that metaprogramming can be done on it.
   #
@@ -92,14 +95,14 @@ class Object
   # @param name<String> The name of the full module name to make
   #
   # @return [nil]
-  def make_module(str)
-    mod = str.split("::")
+  def make_module(string)
     current_module = self
-    mod.each do |x|
-      unless current_module.const_defined?(x)
-        current_module.class_eval "module #{x}; end", __FILE__, __LINE__
+    string.split('::').each do |part|
+      current_module = if current_module.const_defined?(part)
+        current_module.const_get(part)
+      else
+        current_module.const_set(part, Module.new)
       end
-      current_module = current_module.const_get(x)
     end
     current_module
   end

data/lib/extlib/time.rb

@@ -1,4 +1,5 @@
-require "date"
+require 'date'
+require 'extlib/datetime'
 
 class Time
 

data/lib/extlib/try_dup.rb

@@ -0,0 +1,44 @@
+class Object
+  # Override this in a child if it cannot be dup'ed
+  #
+  # @return [Object]
+  def try_dup
+    self.dup
+  end
+end
+
+class TrueClass
+  def try_dup
+    self
+  end
+end
+
+class FalseClass
+  def try_dup
+    self
+  end
+end
+
+class Module
+  def try_dup
+    self
+  end
+end
+
+class NilClass
+  def try_dup
+    self
+  end
+end
+
+class Numeric
+  def try_dup
+    self
+  end
+end
+
+class Symbol
+  def try_dup
+    self
+  end
+end

data/spec/array_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/array'
 
 describe Array do
   before :all do

data/spec/blank_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/blank'
 
 describe Object do
   it 'should provide blank?' do

data/spec/byte_array_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/byte_array'
 
 describe Extlib::ByteArray do
   it 'should be a String' do

data/spec/class_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/class'
 
 class Grandparent
 end

data/spec/datetime_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'json'
+require 'spec_helper'
+require 'extlib/datetime'
 
 describe DateTime, "#to_time" do
   before do

data/spec/hash_spec.rb

@@ -1,6 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require "date"
-require 'bigdecimal'
+require 'spec_helper'
+require 'extlib/hash'
 
 describe Hash, "environmentize_keys!" do
   it "should transform keys to uppercase text" do

data/spec/hook_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/hook'
 
 describe Extlib::Hook do
 

data/spec/inflection/plural_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
+require 'extlib/inflection'
 
 describe Extlib::Inflection, "#singular" do
   it "pluralizes equipment => equipment" do

data/spec/inflection/singular_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
+require 'extlib/inflection'
 
 describe Extlib::Inflection, "#singular" do
   # ==== exceptional cases

data/spec/inflection_extras_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/inflection'
 
 describe Extlib::Inflection do
   describe "#classify" do

data/spec/lazy_array_spec.rb

@@ -1,4 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/lazy_array'
+
+# only needed for specs
+require 'extlib/class'
 
 module LazyArraySpec
   module GroupMethods

data/spec/lazy_module_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 require 'extlib/lazy_module'
 
 describe LazyModule do

data/spec/mash_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/mash'
 
 class AwesomeHash < Hash
 end

data/spec/module_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/module'
 
 describe Module do
 
@@ -17,7 +18,7 @@ describe Module do
       end
     end
 
-    class ::Baz
+    class ::Bas
     end
 
     class ::Bar
@@ -39,7 +40,7 @@ describe Module do
 
   it "should find relative constants" do
     Foo.find_const('ModBar').should == Foo::ModBar
-    Foo.find_const('Baz').should == Baz
+    Foo.find_const('Bas').should == Bas
   end
 
   it "should find sibling constants" do

data/spec/object_space_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/object_space'
 
 describe ObjectSpace, "#classes" do
   it 'returns only classes, nothing else' do

data/spec/object_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require "set"
+require 'spec_helper'
+require 'extlib/object'
 
 module HactiveSupport
   class MemoizeConsideredUseless
@@ -27,8 +27,8 @@ describe Object do
 
   describe "#full_const_get" do
     it 'returns constant by FQ name in receiver namespace' do
-      Object.full_const_get("Extlib").should == Extlib
-      Object.full_const_get("Extlib::SimpleSet").should == Extlib::SimpleSet
+      Object.full_const_get("Oi").should == Oi
+      Object.full_const_get("Foo::Bar").should == Foo::Bar
     end
   end
 

data/spec/pooling_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'timeout'
+require 'spec_helper'
+require 'extlib' # extlib/pooling is enough but specs rely on methods defined in extlib.rb
 
 module Extlib::Pooling
   class << self

data/spec/simple_set_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/simple_set'
 
 describe Extlib::SimpleSet do
 

data/spec/spec_helper.rb

@@ -3,8 +3,5 @@ require "rubygems"
 require "spec"
 require "yaml"
 
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
+lib_path = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-
-require 'extlib'

data/spec/string_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/string'
 
 describe String, "#to_const_string" do
   it "swaps slashes with ::" do

data/spec/struct_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/struct'
 
 describe Struct do
 

data/spec/symbol_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/symbol'
 
 describe Symbol, "#/" do
   it "concanates operands with File::SEPARATOR" do

data/spec/time_spec.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/time'
+
 require 'json'
 
 describe Time, "#to_json" do

data/spec/try_call_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib'
 
 describe "#try_call" do
   describe "with an Object" do

data/spec/try_dup_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/try_dup'
 
 describe "try_dup" do
   it "returns a duplicate version on regular objects" do
@@ -38,7 +39,7 @@ describe "try_dup" do
   end
 
   it "returns self on modules" do
-    obj = Extlib
+    obj = Module.new
     oth = obj.try_dup
     obj.object_id.should == oth.object_id
   end

data/spec/virtual_file_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'extlib/virtual_file'
 
 describe VirtualFile do
   it 'inherits from StringIO' do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: extlib
 version: !ruby/object:Gem::Version 
-  version: 0.9.14
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Dan Kubb
@@ -9,39 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -08:00
+date: 2010-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+  version_requirements: *id002
 description: Support library for DataMapper and Merb
 email: dan.kubb@gmail.com
 executables: []
@@ -74,6 +75,7 @@ files:
 - 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
@@ -89,6 +91,7 @@ files:
 - 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
@@ -136,18 +139,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: extlib
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Support library for DataMapper and Merb