ruby_ext 0.4.11 → 0.4.12

data/lib/ruby_ext/{file.rb → core/file.rb}

@@ -1,8 +1,11 @@
 require 'fileutils'
 
 File.class_eval do
+  def file_name
+    File.basename path
+  end
+  
   class << self
-    
     def write(path, data)
       File.open(path, "wb") do |file|
         return file.write(data)
@@ -14,7 +17,7 @@ File.class_eval do
     end
     
     def delete_directory dir
-      FileUtils.rm_r dir, :force => true if File.exist? dir
+      FileUtils.rm_r dir, force: true if File.exist? dir
     end
   end
 end

data/lib/ruby_ext/core/hash.rb

@@ -0,0 +1,23 @@
+class Hash
+  def subset *keys, &block
+    keys = keys.first if keys.first.is_a? Array
+    h = {}    
+    if keys
+      self.each do |k, v|
+        h[k] = v if keys.include? k
+      end
+    else
+      self.each do |k, v|
+        h[k] = v if block.call k
+      end
+    end
+    h
+  end
+    
+  def validate_options! *valid_options
+    unknown_options = keys - valid_options
+    raise "unknown options :#{unknown_options.join(': ')}!" unless unknown_options.empty?
+  end
+  
+  alias_method :to_h, :to_hash
+end

data/lib/ruby_ext/{module.rb → core/module.rb}

@@ -1,6 +1,16 @@
 require 'set'
 
 Module.class_eval do
+  def alias name = nil
+    if name
+      name.must_be.a String
+      name.must_not_be.blank
+      @alias = name.to_s
+    else
+      @alias ||= self.name.split('::').last
+    end
+  end
+  
   def is?(base)
     ancestors.include?(base)
   end
@@ -47,6 +57,7 @@ Module.class_eval do
     each_namespace &b
   end
   
+  # TODO cache it?
   def self.namespace_for class_name
     list = class_name.split("::")
     if list.size > 1
@@ -112,8 +123,8 @@ Module.class_eval do
     m = method.to_s.clone
     ESCAPE_METHOD_SYMBOLS.each{|from, to| m.gsub! from, to}
     raise "Invalid method name '#{method}'!" unless m =~ /^[_a-zA-Z0-9]+$/
-    m
+    m.to_sym
   end
   
-  public :include
+  public :include, :define_method
 end

data/lib/ruby_ext/{multiple_inheritance.rb → core/multiple_inheritance.rb}

@@ -19,14 +19,14 @@ class Module
     @directly_included_by ||= Set.new
   end
   
-  def fixed_include mod
-    unless mod.directly_included_by.include? self
-      mod.directly_included_by.add self
-    end
+  def include2 mod
+    # unless mod.directly_included_by.include? self
+    mod.directly_included_by.add self
+    # end
 
     include mod
     directly_included_by.each do |child|
-      child.fixed_include self
+      child.include2 self
     end
   end
 end
@@ -38,12 +38,19 @@ end
 class Module
   def class_prototype
     unless @class_prototype
-      unless const_defined? :ClassMethods
+      ancestor = ancestors[1]
+      if(
+        !const_defined?(:ClassMethods) or 
+        (
+          const_defined?(:ClassMethods) and ancestor and ancestor.const_defined?(:ClassMethods) and 
+          const_get(:ClassMethods) == ancestor.const_get(:ClassMethods)
+        )
+      )
         class_eval "module ClassMethods; end", __FILE__, __LINE__        
       end      
       @class_prototype = const_get :ClassMethods
       
-      (class << self; self end).fixed_include @class_prototype
+      (class << self; self end).include2 @class_prototype
     end
     @class_prototype
   end
@@ -57,20 +64,29 @@ class Module
     end
   end
   
+  def inherited &b
+    @inherited = b if b
+    @inherited
+  end
+  
   def inherit *modules
     modules.each do |mod|
       # Instance Methods
-      fixed_include mod
+      include2 mod
       
       # Class Methods
-      if self.class == Module        
-        class_prototype.fixed_include mod.class_prototype
-      else
-        (class << self; self end).fixed_include mod.class_prototype
-      end          
+      unless self.class_prototype == mod.class_prototype
+        if self.class == Module   
+# p self => self.class_prototype, mod => mod.class_prototype             
+          class_prototype.include2 mod.class_prototype
+        else        
+          (class << self; self end).include2 mod.class_prototype
+        end          
+      end
       
       # callback
-      mod.inherited self if mod.respond_to? :inherited
+      # mod.inherited self if mod.respond_to? :inherited
+      self.instance_eval &mod.inherited if mod.inherited
     end
   end
 end

data/lib/ruby_ext/{must.rb → core/must.rb}

@@ -1,9 +1,9 @@
-class AssertionError < StandardError; end
+class AssertionError < RuntimeError; end
 
-class MustAssertions < ExtraBlankSlate
+class MustAssertions < BasicObject
   attr_reader :obj
   
-  def initialize obj
+  def initialize obj    
     @obj = obj
   end
   
@@ -24,18 +24,18 @@ class MustAssertions < ExtraBlankSlate
   end
   
   def defined
-    !nil
+    @obj != nil
   end
   
   def respond_to method
     @obj.respond_to? method
   end
     
-  def a klass
-    if klass.class == Array
-      klass.any?{|k| @obj.is_a? k}
+  def a *args    
+    if args.class == ::Array
+      args.any?{|k| @obj.is_a? k}
     else
-      @obj.is_a? klass
+      @obj.is_a? args
     end
   end
   alias_method :an, :a
@@ -55,7 +55,7 @@ class MustAssertions < ExtraBlankSlate
   def in *args
     if args.size == 1 
       obj = args.first
-      if obj.is_a?(Array) or obj.is_a?(Range)
+      if obj.is_a?(::Array) or obj.is_a?(::Range)
         obj.include? @obj
       else
         args.include? @obj
@@ -73,7 +73,7 @@ class MustAssertions < ExtraBlankSlate
     !@obj
   end
 
-  def empty
+  def empty    
     @obj.empty?
   end
   
@@ -101,11 +101,11 @@ class MustAssertions < ExtraBlankSlate
     @obj <= o
   end
   
-  def exist arg
-    @obj.exist? arg
+  def exist *args
+    @obj.exist? *args
   end
   
-  def be
+  def be    
     @prefix = 'be'
     self
   end
@@ -116,25 +116,25 @@ class MustAssertions < ExtraBlankSlate
   end
   
   def self.assertions
-    special = %w{be have}
-    instance_methods.select{|m| m !~ /^__/ and m != 'be'}
+    special = [:be, :have]
+    public_instance_methods.select{|m| m !~ /^__/ and !special.include?(m)}    
   end
-
+  
   protected
-    def method_missing m, *args, &b
-      raise RuntimeError, "Assertion '#{m}' is unknown!", caller[1..-1]
-    end
+    # def method_missing m, *args, &b
+    #   raise ::RuntimeError, "Assertion '#{m}' is unknown!", caller[1..-1]
+    # end
   
     def failed method, negative, *args
-      stack = caller.sfilter('must.rb')
+      stack = ::Object.send(:caller).sfilter('must.rb')
       
       unless args.empty?
-        Kernel.raise AssertionError, "
+        ::Object.send :raise, ::AssertionError, "
   ASSERTION FAILED (#{stack.first}):
-  #{@obj.inspect} must #{'not ' if negative}#{"#{@prefix} " if @prefix}#{method} #{args.first.inspect}
+  #{@obj.inspect} must #{'not ' if negative}#{"#{@prefix} " if @prefix}#{method} #{args.collect{|a| a.inspect}.join(', ')}
         ", stack
       else
-        Kernel.raise AssertionError, "
+        ::Object.send :raise, ::AssertionError, "
   ASSERTION FAILED (#{stack.first}):
   #{@obj.inspect} must #{'not ' if negative}#{"#{@prefix} " if @prefix}#{method}
         ", stack
@@ -151,11 +151,15 @@ class Must < MustAssertions
       @obj
     end
   end
+  
+  def inspect
+    "<#Must>"
+  end
 end
 
 class MustNot < MustAssertions
-  assertions.each do |m|
-    desition = "_#{m}"
+  assertions.each do |m|    
+    desition = "_#{m}".to_sym
     alias_method desition, m
     define_method m do |*args|
       failed m, true, *args if __send__(desition, *args)
@@ -164,8 +168,7 @@ class MustNot < MustAssertions
   end
 end
 
-Object.class_eval do
-  
+Object.class_eval do  
   def must
     Must.new(self)
   end

data/lib/ruby_ext/{open_object.rb → core/open_object.rb}

@@ -1,14 +1,18 @@
 raise "You shouldn't use OpenObject defined in facets, it's incopatible with this version!" if defined?(OpenObject)
 
-class OpenObject < Hash
-  
-  PUBLIC_METHODS = %w(as send each size is_a? clone dup empty? blank? present? merge merge! stringify_keys stringify_keys! symbolize_keys symbolize_keys! to_query)
-  PUBLIC_METHODS_RE = /(^__|^object_)/
-
-  protected(*public_instance_methods.select{ |m| !PUBLIC_METHODS.include?(m) and m !~ PUBLIC_METHODS_RE })
-
+class OpenObject < Hash    
+  #
+  # delete methods
+  #
+  PUBLIC_METHODS = %w(
+    as send each each_pair size is_a? clone dup empty? blank? present? merge merge! stringify_keys stringify_keys! symbolize_keys symbolize_keys! to_query
+  ).collect{|m| m.to_sym}
+  PUBLIC_METHODS_RE = /(^__|^object_|^must|^stub)/  
+  protected(*public_instance_methods.select{|m| !PUBLIC_METHODS.include?(m) and m !~ PUBLIC_METHODS_RE})
+    
   def inspect
-    "#<#{self.class}:#{self.object_id} #{super}>"
+    # "#<#{self.class}:#{self.object_id} #{super}>"
+    "<#{super}>"
   end
 
   def to_a; super end
@@ -30,6 +34,7 @@ class OpenObject < Hash
       r
     end 
   end
+  alias_method :to_oo, :to_openobject
 
   def each &block; super(&block) end
 
@@ -47,12 +52,12 @@ class OpenObject < Hash
   end
 
   def update other
-    other.to_hash.each{|k,v| self[k.to_s] = v}
+    other.to_hash.each{|k,v| self[k.to_sym] = v}
     self
   end
 
   def delete key
-    super key.to_s
+    super key.to_sym
   end
 
   def == other
@@ -64,15 +69,15 @@ class OpenObject < Hash
   end
 
   def []= k, v
-    super k.to_s, v
+    super k.to_sym, v
   end
 
   def [] k
-    super k.to_s
+    super k.to_sym
   end
   
   def include? k
-    super k.to_s
+    super k.to_sym
   end
   
   def to_hash deep = false
@@ -105,10 +110,8 @@ class OpenObject < Hash
   end
 
   protected
-    def method_missing m, arg = nil, &block
-      m = m.to_s
+    def method_missing m, arg = nil, &block      
       type = m[-1,1]
-      # key = m.to_s.sub(/[=?!]$/,'').to_s
       if type == '='
         self[m[0..-2]] = arg
       elsif type == '!'        
@@ -129,6 +132,7 @@ class NilClass
   def to_openobject deep = false
     OpenObject.new
   end
+  alias_method :to_oo, :to_openobject
 end
 
 class Hash
@@ -147,6 +151,7 @@ class Hash
       r
     end
   end
+  alias_method :to_oo, :to_openobject
   
   alias_method :oo_eql, :==
   def == other

data/lib/ruby_ext/{string.rb → core/string.rb}

@@ -7,6 +7,10 @@ String.class_eval do
     File.expand_path(File.dirname(self) + "/..")
   end
   
+  def expand_path
+    File.expand_path(self)
+  end
+  
   def to_reader
     self.to_sym
   end
@@ -19,6 +23,10 @@ String.class_eval do
     "@#{self}"
   end
   
+  def to_a
+    [self]
+  end
+  
   def interpolate binding
     binding.must_be.a Binding
     return gsub(/\#\{.+?\}/) do |term|
@@ -41,4 +49,23 @@ String.class_eval do
     word.downcase!
     word
   end
+  
+  def camelize first_letter_in_uppercase = true
+    if first_letter_in_uppercase
+      gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      self[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+    end
+  end
+  
+  def constantize
+    names = self.split('::')
+    names.shift if names.empty? || names.first.empty?
+
+    constant = Object
+    names.each do |name|
+      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    end
+    constant
+  end
 end

data/lib/ruby_ext/fixes.rb

@@ -0,0 +1,6 @@
+# clone doesn't unfreeze String
+class String
+  def clone
+    "" + self
+  end
+end