ruby_ext 0.5.9 → 0.5.10

data/Rakefile

@@ -3,11 +3,10 @@ $LOAD_PATH << lib_dir unless $LOAD_PATH.include? lib_dir
 
 require 'rake_ext'
 
-project(
+project \
   name: "ruby_ext",
   gem: true,
   summary: "Ruby Extensions",
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/ruby_ext"
-)
+  homepage: "http://github.com/alexeypetrushin/ruby_ext"

data/lib/rake_ext/project.rb

@@ -7,7 +7,7 @@ YAML::ENGINE.yamler = 'syck'
 #
 # Helper for releasing gem, add following code to Your Rakefile:
 #
-#   project(
+#   project \
 #     name: "fake_gem",
 #     gem: true,
 #     summary: "Makes any directory looks like Ruby Gem",
@@ -18,7 +18,6 @@ YAML::ENGINE.yamler = 'syck'
 #
 #     author: "Alexey Petrushin",
 #     homepage: "http://github.com/alexeypetrushin/fake_gem"
-#   )
 #
 # use "rake gem" to release gem
 #

data/lib/rspec_ext.rb

@@ -12,10 +12,6 @@
 #
 # CLASS_LOADER_GENERATE_TMP_FILES = true
 
-
-#
-# RSpec
-#
 require 'rspec'
 require 'fileutils'
 
@@ -40,9 +36,17 @@ rspec do
 end
 
 rspec do
+  def self.before_all &block
+    before :all, &block
+  end
+
+  def self.after_all &block
+    after :all, &block
+  end
+
   def self.with_load_path *paths
-    before(:all){paths.each{|path| $LOAD_PATH << path}}
-    after(:all){paths.each{|path| $LOAD_PATH.delete path}}
+    before_all{paths.each{|path| $LOAD_PATH << path}}
+    after_all{paths.each{|path| $LOAD_PATH.delete path}}
   end
 
   def with_load_path *paths, &b
@@ -76,16 +80,10 @@ rspec do
   end
 
   def self.with_spec_dir dir
-    before(:all){@spec_dir = dir}
-    after(:all){@spec_dir = nil}
+    before_all{@spec_dir = dir}
+    after_all{@spec_dir = nil}
   end
 
-  # def self.with_spec_dir
-
-  # def self.spec_dir dir = nil
-  #   @spec_dir ||= calculate_spec_dir_for_current_caller
-  # end
-
   def self.spec_dir
     self.calculate_default_spec_dir || raise(":spec_dir not defined!")
   end
@@ -106,35 +104,39 @@ rspec do
     args = args.first if args.size == 1 and args.first.is_a?(Array)
     args.each{|c| Object.send :remove_const, c if Object.const_defined? c}
   end
-
-  # def spec_tmp_dir
-  #   $spec_tmp_dir || raise("you should call :with_tmp_spec_dir to be able to use :spec_tmp_dir!")
-  # end
 end
 
 
-#
-# dirname, parent_dirname
-#
 class String
   unless method_defined? :dirname
     def dirname
       File.expand_path(File.dirname(self))
     end
   end
-end
 
+  def to_xhtml css = nil
+    require 'rspec_ext/nokogiri'
+
+    node = Nokogiri::HTML(self)
+    unless css
+      node
+    else
+      nodes = node.css(css)
+      raise "Elements for '#{css}' CSS query not found!" if nodes.size < 1
+      raise "Found more than one elment for '#{css}' CSS query!" if nodes.size > 1
+      nodes.first
+    end
+  end
+end
 
-#
-# instance_stub
-#
-# class Class
-#   def instance_stub! &block
-#     new_method = method(:new)
-#     stub!(:new).and_return do |*args|
-#       instance = new_method.call(*args)
-#       block.call instance
-#       instance
-#     end
-#   end
-# end
+# Stubbing every instances of class.
+class Class
+  def instance_stub! &block
+    new_method = method :new
+    stub! :new do |*args|
+      instance = new_method.call *args
+      block.call instance
+      instance
+    end
+  end
+end

data/lib/rspec_ext/nokogiri.rb

@@ -0,0 +1,26 @@
+# Helpers to express expectation about html nodes.
+require 'nokogiri'
+
+class RSpec::FuzzyHash < Hash
+  def == o
+    return true if super
+
+    if o.respond_to? :each
+      o.each do |k, v|
+        return false if (self[k.to_sym] || self[k.to_s]) != v
+      end
+      return true
+    end
+
+    false
+  end
+end
+
+::Nokogiri::XML::Node.class_eval do
+  def to_fuzzy_hash
+    h = RSpec::FuzzyHash.new
+    attributes.each{|n, v| h[n] = v.value}
+    h[:content] = content
+    h
+  end
+end

data/lib/ruby_ext/core.rb

@@ -1,9 +1,5 @@
 raise 'ruby 1.9.2 or higher required!' if RUBY_VERSION < '1.9.2'
 
-require 'ruby_ext/fixes'
-
-autoload :OpenObject, 'ruby_ext/core/open_object'
-
 %w(
   basic_object
   nil_class
@@ -19,4 +15,6 @@ autoload :OpenObject, 'ruby_ext/core/open_object'
   deep_clone
   time
   multiple_inheritance
-).each{|f| require "ruby_ext/core/#{f}"}
+).each{|f| require "ruby_ext/core/#{f}"}
+
+autoload :OpenObject, 'ruby_ext/core/open_object'

data/lib/ruby_ext/core/array.rb

@@ -1,4 +1,4 @@
-class Array
+Array.class_eval do
   def sfilter *filters
     filters = filters.first if filters.size == 1 and filters.first.is_a?(Array)
     filters.collect!{|o| o.is_a?(Regexp) ? o : /#{Regexp.escape o}/}

data/lib/ruby_ext/core/basic_object.rb

@@ -1,4 +1,4 @@
-class BasicObject
+BasicObject.class_eval do
   protected :==, :equal?, :!, :!=
 
   protected

data/lib/ruby_ext/core/deep_clone.rb

@@ -1,4 +1,6 @@
-class Object
+require 'date'
+
+Object.class_eval do
   def deep_clone
     clone = self.clone
     instance_variables.each do |name|
@@ -18,15 +20,6 @@ Hash.class_eval do
   end
 end
 
-OpenObject.class_eval do
-  def deep_clone
-    clone = super
-    clone.clear
-    each{|k, v| clone[k.deep_clone] = v.deep_clone}
-    clone
-  end
-end
-
 Struct.class_eval do
   def deep_clone
     clone = super

data/lib/ruby_ext/core/enumerable.rb

@@ -1,5 +1,5 @@
-module Enumerable
-  class EveryProxy < BasicObject
+Enumerable.class_eval do
+  class ::Enumerable::EveryProxy < BasicObject
     def initialize enumerable
       @enumerable = enumerable
     end
@@ -12,6 +12,6 @@ module Enumerable
   end
 
   def every
-    EveryProxy.new(self)
+    ::Enumerable::EveryProxy.new self
   end
 end

data/lib/ruby_ext/core/false_class.rb

@@ -1,3 +1,3 @@
-class FalseClass
+FalseClass.class_eval do
   def blank?; true end
 end

data/lib/ruby_ext/core/hash.rb

@@ -1,4 +1,4 @@
-class Hash
+Hash.class_eval do
   def subset *keys, &block
     keys = keys.first if keys.first.is_a? Array
     h = {}
@@ -27,14 +27,30 @@ class Hash
     merge!( other_hash ){|key,left,right| left }
   end
 
-  # Haml relies on :inspect default format, can't use it.
-  #
-  # def inspect
-  #   "{" + collect{|k, v| "#{k}: #{v}"}.join(', ') + "}"
-  # end
-  # alias_method :to_s, :inspect
+  # Haml relies on :inspect default format and it brokes haml, but I prefer new hash notation,
+  # disable it if You use Haml.
+  unless $dont_extend_hash_inspect
+    def inspect
+      "{" + collect{|k, v| "#{k}: #{v}"}.join(', ') + "}"
+    end
+    alias_method :to_s, :inspect
+  end
 
   alias_method :blank?, :empty?
 
   alias_method :to_h, :to_hash
+
+  # OpenObject.
+
+  def to_openobject deep = false
+    OpenObject.initialize_from self, deep
+  end
+  alias_method :to_oo, :to_openobject
+
+  alias_method :eql_without_oo, :==
+  def == other
+    true if self.equal? other
+    other == self if other.is_a? OpenObject
+    eql_without_oo other
+  end
 end

data/lib/ruby_ext/core/module.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 Module.class_eval do
   def alias name = nil
     if name
@@ -16,48 +14,26 @@ Module.class_eval do
   end
 
   def namespace
-    if @module_namespace_defined
+    if @module_namespace_cached
       @module_namespace
     else
-      @module_namespace_defined = true
+      @module_namespace_cached = true
       @module_namespace = Module.namespace_for name
     end
   end
 
-  def each_namespace &block
-    current = namespace
-    while current do
-      block.call current
-      current = current.namespace
-    end
-  end
-
-  def each_ancestor include_standard = false, &block
-    if include_standard
-      ancestors.each{|a| block.call a unless a == self}
-    else
-      exclude = [self, Object, Kernel]
-      ancestors.each do |a|
-        block.call a unless exclude.include? a
-      end
-    end
-  end
-
-  def self_ancestors_and_namespaces &b
-    b.call self
-    each_ancestor &b
-    each_namespace &b
-  end
-
-  # TODO cache it?
   def self.namespace_for class_name
-    list = class_name.split("::")
-    if list.size > 1
-      list.pop
-      return eval(list.join("::"), TOPLEVEL_BINDING, __FILE__, __LINE__)
-    else
-      return nil
+    @namespace_for_cache ||= {}
+    unless @namespace_for_cache.include? class_name
+      list = class_name.split("::")
+      @namespace_for_cache[class_name] = if list.size > 1
+        list.pop
+        eval list.join("::"), TOPLEVEL_BINDING, __FILE__, __LINE__
+      else
+        nil
+      end
     end
+    @namespace_for_cache[class_name]
   end
 
   def inheritable_accessor attribute_name, default_value
@@ -90,42 +66,46 @@ Module.class_eval do
     end
   end
 
-  raise "Internal error, it shouldn't be loaded twice!" if defined? ESCAPE_METHOD_SYMBOLS # some tricky error when runing spec with rake.
-  ESCAPE_METHOD_SYMBOLS = [
-    ['==', 'assign'],
-    ['>', 'gt'],
-    ['<', 'lt'],
-    ['>=', 'gte'],
-    ['<=', 'lte'],
-    ['?', 'qst'],
-    ['!', 'imp'],
-    ['<=>', 'lorg'],
-    ['*', 'mp'],
-    ['+', 'add'],
-    ['-', 'sub'],
-    ['=', 'assign'],
-    ['**', 'pw'],
-    ['=~', 'sim'],
-    ['[]', 'sb'],
-  ]
+  METHOD_ESCAPE_SYMBOLS = {
+    '=='  => 'assign',
+    '>'   => 'gt',
+    '<'   => 'lt',
+    '>='  => 'gte',
+    '<='  => 'lte',
+    '?'   => 'qst',
+    '!'   => 'imp',
+    '<=>' => 'lorg',
+    '*'   => 'mp',
+    '+'   => 'add',
+    '-'   => 'sub',
+    '='   => 'assign',
+    '**'  => 'pw',
+    '=~'  => 'sim',
+    '[]'  => 'sb'
+  }
 
   def escape_method method
     m = method.to_s.clone
-    ESCAPE_METHOD_SYMBOLS.each{|from, to| m.gsub! from, to}
+    METHOD_ESCAPE_SYMBOLS.each{|from, to| m.gsub! from, to}
     raise "Invalid method name '#{method}'!" unless m =~ /^[_a-zA-Z0-9]+$/
     m.to_sym
   end
 
   def attr_required *attrs
     attrs.each do |attr|
-      define_method(attr){instance_variable_get(:"@#{attr}") || raise("attribute :#{attr} not defined on #{self}!")}
+      iv_name = :"@#{attr}"
+      define_method attr do
+        variable = instance_variable_get iv_name
+        raise "attribute :#{attr} not defined on #{self}!" if iv_name == nil
+        variable
+      end
     end
   end
 
   public :include, :define_method
 
   # Copied from rails.
-  def delegate(*methods)
+  def delegate *methods
     options = methods.pop
     unless options.is_a?(Hash) && to = options[:to]
       raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."

data/lib/ruby_ext/core/multiple_inheritance.rb

@@ -16,16 +16,16 @@
 #
 class Module
   def directly_included_by
-    @directly_included_by ||= Set.new
+    @directly_included_by ||= {}
   end
 
   def include2 mod
     # unless mod.directly_included_by.include? self
-    mod.directly_included_by.add self
+    mod.directly_included_by[self] = true
     # end
 
     include mod
-    directly_included_by.each do |child|
+    directly_included_by.each do |child, v|
       child.include2 self
     end
   end