ruby_ex 0.3.0 → 0.4.1.2

data/lib/module/instance_method_visibility.rb

@@ -1,28 +1,29 @@
 # Copyright:: Copyright (c) 2004  Nicolas Despres. All rights reserved.
 # Author::    Nicolas Despres  <polrop@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: instance_method_visibility.rb 339 2005-09-06 23:27:27Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/module/instance_method_visibility.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
+class Module
 
-module InstanceMethodVisibility
-
-  def instance_method_visibility(name)
-    if private_method_defined?(name)
-      :private
-    elsif protected_method_defined?(name)
-      :protected
-    elsif public_method_defined?(name)
-      :public
-    else
-      raise(NoMethodError,
-            "`#{name}' - not an instance method of `#{self.name}'")
+  module InstanceMethodVisibility
+
+    def instance_method_visibility(name)
+      if private_method_defined?(name)
+        :private
+      elsif protected_method_defined?(name)
+        :protected
+      elsif public_method_defined?(name)
+        :public
+      else
+        raise(NoMethodError,
+              "`#{name}' - not an instance method of `#{self.name}'")
+      end
     end
-  end
 
-end # module InstanceMethodVisibility
+  end # module InstanceMethodVisibility
 
-class Module
   include InstanceMethodVisibility
+
 end # class Module
 
 module InstanceMethodVisibility

data/lib/object_monitor.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: object_monitor.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/object_monitor.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'observable'

data/lib/object_monitor_activity.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: object_monitor_activity.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/object_monitor_activity.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'observable'

data/lib/observable.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: observable.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/observable.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'observer'

data/lib/observable_pool.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: observable_pool.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/observable_pool.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'observable'

data/lib/ordered_hash.rb

@@ -18,7 +18,7 @@
 #
 
 # $LastChangedBy: ertai $
-# $Id: ordered_hash.rb 367 2005-09-24 19:53:40Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/ordered_hash.rb 7972 2005-09-24T19:53:40.837778Z ertai  $
 
 
 module OrderedHash

data/lib/r_path.rb

@@ -1,9 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: r_path.rb 339 2005-09-06 23:27:27Z ertai $
-
-require 'regex_path'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/r_path.rb 22076 2006-02-21T14:40:09.796627Z pouillar  $
 
 class Object
 
@@ -39,19 +37,26 @@ class Object
   # tree.rpath('/B//home/nowhere') { |x| p x } # => 'nowhere'
   #
   # But you would prefer get the complete baz record, so to do that you
-  # can mark your dezired levels with `*'.
+  # can mark your dezired levels with `()'.
   #
-  # tree.rpath('/B//*home/nowhere') { |x| p x[:email] } # => 'baz@bar.com'
+  # tree.rpath('/B//()home/nowhere') { |x| p x[:email] } # => 'baz@bar.com'
   #
-  # tree.rpath('/B//*home/ere') { |x| p x[:email] }
+  # tree.rpath('/B//()home/ere') { |x| p x[:email] }
   # => 'foo@foo.com'
   # => 'baz@bar.com'
   #
-  # tree.rpath('/B//*home/(.*)') { |tree, home| p [home, tree[:email]] }
+  # tree.rpath('/B//()home/(.*)') { |tree, home| p [home, tree[:email]] }
   # => [ 'here', 'foo@foo.com' ]
   # => [ "bar's home", 'bar@foo.bar' ]
   # => [ 'nowhere', 'baz@bar.com' ]
   #
+  # You can negate some parts of your RPath using the '!' modifier:
+  #
+  # tree.rpath('/B//()home/!ere') { |x| p x[:email] }
+  # => 'bar@foo.com'
+  #
+  # You can also specify a negative RPath with the '\N' tag.
+  #
   def rpath ( re, &block )
     raise ArgumentError, 'no block given' unless block_given?
     re = RegexPath.new(re) unless re.is_a? RegexPath
@@ -108,7 +113,7 @@ end # class Object
 class Hash
 
   def regex_path_match ( re, trees, args, &block ) # :nodoc:
-    trees = (trees || []) + [self] if re.starred?
+    trees = (trees || []) + [self] if re.captured?
 
     if re.empty?
       trees ||= [self]
@@ -118,8 +123,10 @@ class Hash
       each do |key, val|
         match_data = seg =~ key.to_s
         if match_data
-          sub_args = args + match_data.to_a[1..-1]
+          sub_args = args + match_data[1..-1]
           val.regex_path_match(tail_re, trees, sub_args, &block)
+        elsif re.negative?
+          val.regex_path_match(tail_re, trees, args, &block)
         end
       end
     end
@@ -144,12 +151,19 @@ class String
   def regex_path_match ( re, trees, args, &block ) # :nodoc:
     seg, tail_re = re.split
 
-    trees = (trees || []) + [self] if re.starred?
+    trees = (trees || []) + [self] if re.captured?
 
-    if (seg.nil? or match_data = seg =~ self) and tail_re.empty?
-      trees ||= [self]
-      args = args + match_data.to_a[1..-1] if defined? match_data and match_data
-      trees.each { |tree| block[tree, *args] }
+    if tail_re.empty?
+      match_data = seg =~ self
+      if seg.nil? or match_data
+        trees ||= [self]
+      else
+        trees ||= []
+      end
+      if seg.nil? or match_data or re.negative?
+        args = args + match_data[1..-1] if defined? match_data and match_data
+        trees.each { |tree| block[tree, *args] }
+      end
     end
   end
 
@@ -238,19 +252,23 @@ module RPath
 
         assert_rpath('//a/Se', ["Sea", "Sex"])
         assert_rpath('/users/name/Se[ax]', ["Sea", "Sex"])
+        assert_rpath('/users/!name/', ["111", "222", "333", "222", "SeSe"])
+        assert_rpath('/users/!(name|tel)/', ["SeSe"])
+        assert_rpath('/!users/!(name|tel)/![S@]', ["1", "2", "a", "3", "4"])
         assert_rpath('/users//S[eu].', ["Sea", "Sex", 'Sun', 'SeSe'])
         assert_rpath('/users//S[eu].$', ["Sea", "Sex", 'Sun'])
 
-        assert_rpath('//*a/Sea', ['name' => 'Sea', 'tel' => '111'])
+        assert_rpath('//()a/Sea', ['name' => 'Sea', 'tel' => '111'])
 
-        assert_rpath('//*a/Se', [{"name"=>"Sea", "tel"=>"111"},
-                                 {"name"=>"Sex", "tel"=>"222"}])
+        assert_rpath('//()a/Se', [{"name"=>"Sea", "tel"=>"111"},
+                                  {"name"=>"Sex", "tel"=>"222"}])
 
-        assert_rpath('//*a/*Se', [{"name"=>"Sea", "tel"=>"111"}, 'Sea',
+        assert_rpath('//()a/()Se', [{"name"=>"Sea", "tel"=>"111"}, 'Sea',
                                   {"name"=>"Sex", "tel"=>"222"}, 'Sex'])
 
-        assert_rpath('/*/*a/*Se', [@tree, {"name"=>"Sea", "tel"=>"111"}, 'Sea',
+        assert_rpath('/()/()a/()Se', [@tree, {"name"=>"Sea", "tel"=>"111"}, 'Sea',
                                    @tree, {"name"=>"Sex", "tel"=>"222"}, 'Sex'])
+        assert_rpath('Emails/!edu', ["foo312@coldmail.com", "bfoo@staff.com"])
       end
 
       def test_example
@@ -278,12 +296,15 @@ module RPath
 
         assert_rpath('/B//home/nowhere', ['nowhere'])
 
-        assert_rpath('/B//*home/nowhere', [baz])
+        assert_rpath('/B//()home/nowhere', [baz])
 
-        assert_rpath_set('/B//*home/ere', [foo, baz])
+        assert_rpath_set('/B//()home/ere', [foo, baz])
 
-        assert_rpath_set('/B//*home/(.*)', [foo, bar, baz],
+        assert_rpath_set('/B//()home/(.*)', [foo, bar, baz],
                          [['here'], ["bar's home"], ['nowhere']])
+
+        assert_rpath_set('/B//()home/!ere', [bar])
+        assert_rpath_set('\N/B//()home/ere', [@tree[:A][:AA], foo, bar, baz]) # FIXME strange
       end
 
       def test_match_data
@@ -304,4 +325,4 @@ module RPath
 
   end
 
-end # module RPath
+end # module RPath

data/lib/random_generators/random_generator.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: random_generator.rb 339 2005-09-06 23:27:27Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/random_generators/random_generator.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 module RandomGenerators
 

data/lib/random_generators/ruby.rb

@@ -1,9 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: ruby.rb 339 2005-09-06 23:27:27Z ertai $
-
-RandomGenerators.import!
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/random_generators/ruby.rb 8041 2005-12-31T12:05:24.130674Z ertai  $
 
 module RandomGenerators
 
@@ -22,6 +20,4 @@ module RandomGenerators
 
   end # class Ruby
 
-  self.default = Ruby.new
-
 end # module RandomGenerators

data/lib/random_generators.rb

@@ -1,16 +1,31 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: random_generators.rb 339 2005-09-06 23:27:27Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/random_generators.rb 8050 2005-12-31T16:04:24.515191Z ertai  $
 
-require 'active_support/module_attribute_accessors'
-
-RandomGenerators.import!
+silence_warnings { require 'active_support/module_attribute_accessors' }
 
 module RandomGenerators
 
   mattr_accessor :default
+  self.default = Ruby.new
 
 end # module RandomGenerators
 
-require 'random_generators/ruby'
+test_section __FILE__ do
+  class TestRandomGenerators < ::Test::Unit::TestCase
+
+    def setup
+    end
+
+    def teardown
+    end
+
+    def test_default
+      assert_nothing_raised do
+        assert_equal('RandomGenerators::Ruby', RandomGenerators.default.class.name)
+      end
+    end
+
+  end # class TestRandomGenerators
+end

data/lib/regex_list.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: regex_list.rb 379 2005-09-29 22:00:37Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/regex_list.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 class RegexList
 
@@ -125,10 +125,7 @@ class RegexList
 
 end # class RegexList
 
-PathList.import!
-class PathList
-  include RegexList::PathListExtension
-end
+PathList.send :include, RegexList::PathListExtension
 
 
 test_section __FILE__ do

data/lib/regex_path.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: regex_path.rb 339 2005-09-06 23:27:27Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/regex_path.rb 22076 2006-02-21T14:40:09.796627Z pouillar  $
 
 
 class RegexPath
@@ -11,21 +11,31 @@ class RegexPath
 
     attr_reader :re
 
-    def initialize ( re, starred=false )
+    def initialize ( re, captured=false, negative=false )
       @re = Regexp.new(re)
-      @starred = starred
+      @captured = !!captured
+      @negative = !!negative
     end
 
     def =~ ( value )
-      @re.match(value)
+      match_data = @re.match(value)
+      if negative?
+        (match_data)? nil : (//.match value)
+      else
+        match_data
+      end
+    end
+
+    def captured?
+      @captured
     end
 
-    def starred?
-      @starred
+    def negative?
+      @negative
     end
 
     def eql? ( rhs )
-      @re.eql?(rhs.re) and @starred.eql?(rhs.starred?)
+      @re.eql?(rhs.re) and @captured.eql?(rhs.captured?)
     end
 
     def == ( rhs )
@@ -38,27 +48,41 @@ class RegexPath
 
   attr_reader :segments
 
-  def initialize ( str )
-    raise ArgumentError, 'Argument must be a string' unless str.is_a?(String)
+  def initialize ( orig )
+    raise ArgumentError, 'Argument must be a string' unless orig.is_a?(String)
     @segments = []
-    @root = (str[0] == ?/)
-    str = '/' + str unless @root
-    @final = (str[-1] == ?\Z)
-    str.sub!(/\\Z$/, '')
-    while str =~ /^\/(\*?)((?:(?:\\.)|[^\\\/])+)?/
-      sep, key, = $1, $2
-      @segments << Segment.new((key.nil?)? '' : key, sep == "*")
-      str = $'
+    orig =~ /^(\\N)?(\/)?(.*?)(\\Z)?$/
+    str = '/' + $3
+    @negative = !!$1
+    @root = !!$2
+    @final = !!$4
+    cap = /(\(\))/
+    neg = /(!)/
+    neg_cap = /(?:#{cap}?#{neg}?|#{neg}?#{cap}?)/
+    while str =~ /^\/#{neg_cap}((?:\\.|[^\\\/])+)?/
+      m = Regexp.last_match
+      str = m.post_match
+      key = m[5]
+      @segments << Segment.new((key.nil?)? '' : key,
+                               m[1] || m[3], m[2] || m[4])
+    end
+    unless str.nil? or str.empty? or str == '\\'
+      raise ArgumentError, "Parsing error trailing chars '#{str}' in '#{orig}'"
     end
   end
 
   def initialize_copy ( rhs )
     @segments = rhs.segments.dup
     @root = rhs.root?
+    @negative = rhs.negative?
+  end
+
+  def captured?
+    ! @segments.empty? and @segments.first.captured?
   end
 
-  def starred?
-    ! @segments.empty? and @segments.first.starred?
+  def negative?
+    @negative
   end
 
   def root?
@@ -105,17 +129,34 @@ test_section __FILE__ do
       compare('m\/ho', [ 'm\/ho' ])
       compare('mho/foo', [ 'mho', 'foo' ])
       compare('mho/35/foo/test', [ 'mho', '35', 'foo' , 'test' ])
-      compare('test/*status/PASS', [ 'test', Seg.new('status', true), 'PASS' ])
-      compare('/*mho', [ Seg.new('mho', true) ])
-      compare('mho/*', [ 'mho', Seg.new('', true) ])
-      compare('/*mho/*', [ Seg.new('mho', true), Seg.new('', true) ])
+      compare('test/()status/PASS', [ 'test', Seg.new('status', true), 'PASS' ])
+      compare('/()mho', [ Seg.new('mho', true) ])
+      compare('mho/()', [ 'mho', Seg.new('', true) ])
+      compare('/()mho/()', [ Seg.new('mho', true), Seg.new('', true) ])
     end
 
     def test_final?
       assert(RegexPath.new('/foo/bar\Z').final?)
+      assert(! RegexPath.new('/foo/barZ').final?)
       assert(! RegexPath.new('/foo/bar').final?)
     end
     
+    def test_root?
+      assert(RegexPath.new('/foo/bar\Z').root?)
+      assert(! RegexPath.new('\/foo/barZ').root?)
+      assert(! RegexPath.new('foo/bar').root?)
+    end
+    
+    def test_negative_path
+      assert(RegexPath.new('\N/foo/bar\Z').negative?)
+      assert(RegexPath.new('\Nfoo/bar').negative?)
+      assert(! RegexPath.new('/foo/barZ').negative?)
+      assert(! RegexPath.new('/\Nfoo/bar').negative?)
+      assert(! RegexPath.new('foo/bar').negative?)
+      assert(! RegexPath.new('\foo/bar').negative?)
+      assert(! RegexPath.new('Nfoo/bar').negative?)
+    end
+    
     def test_errors
       assert_raise(ArgumentError) { RegexPath.new(42) }
     end

data/lib/ruby_ex.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: ruby_ex.rb 385 2005-10-02 17:05:35Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/ruby_ex.rb 22058 2006-02-20T21:41:08.060925Z pouillar  $
 
 require 'pathname'
 
@@ -47,11 +47,20 @@ module RubyEx
       require 'core_ex'
     end
   end
+  require 'uri'
   suppress(LoadError) { core_ex_require 'highline' }
+  $LOADED_FEATURES << 'ruby_ex.rb' << 'uri.rb'
+  Dependencies.loaded << 'ruby_ex' << 'uri'
+
+  # Setup exceptions about the camel_case of URI and its classes.
+  Inflector.inflections do |i|
+    i.fixed_cases 'URI', 'DRuby', 'MySQL', 'PgSQL', 'FTP', 'HTTP'
+  end
 
   dir.load_path!
   (dir + 'module').load_path!
 
-  Controllers::Algorithms.import!
+  URI::HttpEx.import!
+  URI::FtpEx.import!
 
 end # module RubyEx

data/lib/safe_eval.rb

@@ -2,8 +2,8 @@
 # Author: Nicolas Despres  <polrop@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: safe_eval.rb 339 2005-09-06 23:27:27Z ertai $
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/safe_eval.rb 21871 2006-02-19T00:36:31.457482Z pouillar  $
 
 
 class SafeEval
@@ -250,13 +250,8 @@ class SafeEvalTest < Test::Unit::TestCase
     exc = assert_raises(SyntaxError) do
       se.run('4syntaxerror', nil, 'toto.yml', 1)
     end
-    expected_message = <<EOF
-compile error
-toto.yml:1: syntax error
-4syntaxerror
-            ^
-EOF
-    expected_message.chomp!
+    # expected_message = "compile error\ntoto.yml:1: syntax error\n4syntaxerror\n            ^"
+    expected_message = "compile error\ntoto.yml:1: parse error, unexpected tIDENTIFIER, expecting $\n4syntaxerror\n            ^"
     assert_equal(expected_message, exc.message)
   end
 
@@ -270,12 +265,8 @@ EOF
     exc = assert_raises(SyntaxError) do
       se.run(code, nil, 'toto.yml', 1)
     end
-    expected_message = <<EOF
-compile error
-toto.yml:3: syntax error
-4syntaxerror;
-            ^
-EOF
+    # expected_message = "compile error\ntoto.yml:3: syntax error\n4syntaxerror;\n            ^"
+    expected_message = "compile error\ntoto.yml:3: parse error, unexpected tIDENTIFIER, expecting $\n4syntaxerror;\n            ^"
     expected_message.chomp!
     assert_equal(expected_message, exc.message)
   end