rmtools 2.2.7 → 2.3.0

data/ext/rmtools.h

@@ -1,162 +1,162 @@
-#ifndef __RUBY_INTERNALS_HH__
-#define __RUBY_INTERNALS_HH__
-
-#include <ruby.h>
-
-#ifdef RUBY_IS_19
-
-#include <ruby/intern.h>
-#include <ruby/defines.h>
-#include <ruby/re.h>
-#include <assert.h>
-
-# define ARY_EMBED_P(ary) \
-    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
-     FL_TEST(ary, RARRAY_EMBED_FLAG))
-#define ARY_SET_EMBED_LEN(ary, n) do { \
-    long tmp_n = n; \
-    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
-    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
-} while (0)
-#define ARY_SET_HEAP_LEN(ary, n) do { \
-    RARRAY(ary)->as.heap.len = n; \
-} while (0)
-#define ARY_SET_LEN(ary, n) do { \
-    if (ARY_EMBED_P(ary)) { \
-        ARY_SET_EMBED_LEN(ary, n); \
-    } \
-    else { \
-        ARY_SET_HEAP_LEN(ary, n); \
-    } \
-} while (0) 
-
-#define BDIGITS(x) ((BDIGIT*)RBIGNUM_DIGITS(x))
-
-// copied from utilrb gem
-typedef struct RNode {
-    unsigned long flags;
-    char *nd_file;
-    union {
-	struct RNode *node;
-	ID id;
-	VALUE value;
-	VALUE (*cfunc)(ANYARGS);
-	ID *tbl;
-    } u1;
-    union {
-	struct RNode *node;
-	ID id;
-	long argc;
-	VALUE value;
-    } u2;
-    union {
-	struct RNode *node;
-	ID id;
-	long state;
-	struct global_entry *entry;
-	long cnt;
-	VALUE value;
-    } u3;
-} NODE;
-
-typedef struct RVALUE {
-    union {
-	struct {
-	    VALUE flags;		/* always 0 for freed obj */
-	    struct RVALUE *next;
-	} free;
-	struct RBasic  basic;
-	struct RObject object;
-	struct RClass  klass;
-	struct RFloat  flonum;
-	struct RString string;
-	struct RArray  array;
-	struct RRegexp regexp;
-	struct RHash   hash;
-	struct RData   data;
-	struct RStruct rstruct;
-	struct RBignum bignum;
-	struct RFile   file;
-	struct RNode   node;
-	struct RMatch  match;
-	struct RRational rational;
-	struct RComplex complex;
-    } as;
-} RVALUE;
-
-static const size_t SLOT_SIZE = sizeof(RVALUE);
-
-#else
-
-#include <intern.h>
-#include <node.h>
-#include <env.h>
-#include <re.h>
-
-# define STR_SET_LEN(x, i) (RSTRING(x)->len = (i))
-
-#ifndef RFLOAT_VALUE
-# define RFLOAT_VALUE(f) (RFLOAT(f)->value)
-# define RBIGNUM_DIGITS(f) (RBIGNUM(f)->digits)
-# define RBIGNUM_LEN(f) (RBIGNUM(f)->len)
-#endif 
-
-# define ARY_SET_LEN(x, i) (RARRAY(x)->len = (i))
-
-# define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
-
-// copied from utilrb gem
-typedef struct RVALUE {
-    union {
-        struct {
-            unsigned long flags;        /* always 0 for freed obj */
-            struct RVALUE *next;
-        } free;
-        struct RBasic  basic;
-        struct RObject object;
-        struct RClass  klass;
-        struct RFloat  flonum;
-        struct RString string;
-        struct RArray  array;
-        struct RRegexp regexp;
-        struct RHash   hash;
-        struct RData   data;
-        struct RStruct rstruct;
-        struct RBignum bignum;
-        struct RFile   file;
-        struct RNode   node;
-        struct RMatch  match;
-        struct RVarmap varmap;
-        struct SCOPE   scope;
-    } as;
-#ifdef GC_DEBUG
-    char *file;
-    int   line;
-#endif
-} RVALUE;
-static const size_t SLOT_SIZE = sizeof(RVALUE);
-
-
-#endif // 1.9
-
-
-
-// shortcuts for debug r_r
-extern void rb_log(const char* str)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, rb_str_new2(str));
-}
-extern void rb_log_obj(VALUE obj)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, obj);
-}
-extern void rb_log_file(const char* str)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, rb_str_new2(str));
-}
-extern void rb_log_file_obj(VALUE obj)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, obj);
-}
-
+#ifndef __RUBY_INTERNALS_HH__
+#define __RUBY_INTERNALS_HH__
+
+#include <ruby.h>
+
+#ifdef RUBY_IS_19
+
+#include <ruby/intern.h>
+#include <ruby/defines.h>
+#include <ruby/re.h>
+#include <assert.h>
+
+# define ARY_EMBED_P(ary) \
+    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
+     FL_TEST(ary, RARRAY_EMBED_FLAG))
+#define ARY_SET_EMBED_LEN(ary, n) do { \
+    long tmp_n = n; \
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
+    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
+} while (0)
+#define ARY_SET_HEAP_LEN(ary, n) do { \
+    RARRAY(ary)->as.heap.len = n; \
+} while (0)
+#define ARY_SET_LEN(ary, n) do { \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN(ary, n); \
+    } \
+    else { \
+        ARY_SET_HEAP_LEN(ary, n); \
+    } \
+} while (0) 
+
+#define BDIGITS(x) ((BDIGIT*)RBIGNUM_DIGITS(x))
+
+// copied from utilrb gem
+typedef struct RNode {
+    unsigned long flags;
+    char *nd_file;
+    union {
+	struct RNode *node;
+	ID id;
+	VALUE value;
+	VALUE (*cfunc)(ANYARGS);
+	ID *tbl;
+    } u1;
+    union {
+	struct RNode *node;
+	ID id;
+	long argc;
+	VALUE value;
+    } u2;
+    union {
+	struct RNode *node;
+	ID id;
+	long state;
+	struct global_entry *entry;
+	long cnt;
+	VALUE value;
+    } u3;
+} NODE;
+
+typedef struct RVALUE {
+    union {
+	struct {
+	    VALUE flags;		/* always 0 for freed obj */
+	    struct RVALUE *next;
+	} free;
+	struct RBasic  basic;
+	struct RObject object;
+	struct RClass  klass;
+	struct RFloat  flonum;
+	struct RString string;
+	struct RArray  array;
+	struct RRegexp regexp;
+	struct RHash   hash;
+	struct RData   data;
+	struct RStruct rstruct;
+	struct RBignum bignum;
+	struct RFile   file;
+	struct RNode   node;
+	struct RMatch  match;
+	struct RRational rational;
+	struct RComplex complex;
+    } as;
+} RVALUE;
+
+static const size_t SLOT_SIZE = sizeof(RVALUE);
+
+#else
+
+#include <intern.h>
+#include <node.h>
+#include <env.h>
+#include <re.h>
+
+# define STR_SET_LEN(x, i) (RSTRING(x)->len = (i))
+
+#ifndef RFLOAT_VALUE
+# define RFLOAT_VALUE(f) (RFLOAT(f)->value)
+# define RBIGNUM_DIGITS(f) (RBIGNUM(f)->digits)
+# define RBIGNUM_LEN(f) (RBIGNUM(f)->len)
+#endif 
+
+# define ARY_SET_LEN(x, i) (RARRAY(x)->len = (i))
+
+# define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
+
+// copied from utilrb gem
+typedef struct RVALUE {
+    union {
+        struct {
+            unsigned long flags;        /* always 0 for freed obj */
+            struct RVALUE *next;
+        } free;
+        struct RBasic  basic;
+        struct RObject object;
+        struct RClass  klass;
+        struct RFloat  flonum;
+        struct RString string;
+        struct RArray  array;
+        struct RRegexp regexp;
+        struct RHash   hash;
+        struct RData   data;
+        struct RStruct rstruct;
+        struct RBignum bignum;
+        struct RFile   file;
+        struct RNode   node;
+        struct RMatch  match;
+        struct RVarmap varmap;
+        struct SCOPE   scope;
+    } as;
+#ifdef GC_DEBUG
+    char *file;
+    int   line;
+#endif
+} RVALUE;
+static const size_t SLOT_SIZE = sizeof(RVALUE);
+
+
+#endif // 1.9
+
+
+
+// shortcuts for debug r_r
+extern void rb_log(const char* str)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, rb_str_new2(str));
+}
+extern void rb_log_obj(VALUE obj)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, obj);
+}
+extern void rb_log_file(const char* str)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, rb_str_new2(str));
+}
+extern void rb_log_file_obj(VALUE obj)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, obj);
+}
+
 #endif

data/lib/rmtools/core/class.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'rmtools/core/object'
-
 class Class
   
   def method_proxy *vars

data/lib/rmtools/dev/trace_format.rb

@@ -20,8 +20,12 @@ module RMTools
   #     >>  10/0 end
   #          from (irb):3
   #     >>  divbyzero
-  
-  IgnoreFiles = %r{#{Regexp.escape $:.grep(%r{/ruby/1\.(8|9\.\d)$})[0]}/irb(/|\.rb$)|/active_support/dependencies.rb$}
+
+  if RUBY_VERSION < '2'
+    IgnoreFiles = %r{#{Regexp.escape $:.grep(%r{/ruby/1\.(8|9\.\d)$})[0]}/irb(/|\.rb$)|/active_support/dependencies.rb$}
+  else
+    IgnoreFiles = %r{/irb(/|\.rb$)|/active_support/dependencies.rb$}
+  end
   
   def format_trace(a)
     return [] if !a.b

data/lib/rmtools/dev/watching.rb

@@ -117,7 +117,7 @@ module RMTools
       cmd = "scp #{fullpath.inspect} #{[@host, fpath].join(':').inspect} 2>&1"
       print "`#{cmd}`: " if @debug
       if res = RMTools::tick_while {`#{cmd}`}.b
-        puts "[ #{Painter.r_b('Error')} ]: #{res}"
+        puts "[ #{Painter.rb('Error')} ]: #{res}"
       else
         print "[ #{Painter.g('OK')} ]"
       end

data/lib/rmtools/enumerable/hash.rb

@@ -73,9 +73,5 @@ end
   def truth_map
     map_values {|v| !!v}
   end
-  
-  def key_value
-    to_a.first
-  end
 
 end

data/lib/rmtools/enumerable/set_ops.rb

@@ -14,8 +14,7 @@ module RMTools
         alias :coallition :+
         alias :subtraction :-
         alias :intersection :&
-        # :& won't work this way if :intersection will be protected
-        protected :union, :coallition, :subtraction
+        protected :union, :coallition, :subtraction, :intersection
         
         def |(ary) 
           return ary.uniq if empty?
@@ -56,17 +55,12 @@ module RMTools
           [self - common, ary - common]
         end
         
-        alias :diff :^
+        alias diff ^
         
         def intersects?(ary)
           (self & ary).any?
         end
         alias :x? :intersects?
-        
-        def =~(ary)
-          (self - ary).empty?
-        end
-        alias :is_subset_of? :=~
       }
       super
     end

data/lib/rmtools/lang/ansi.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
-require 'iconv'
-# Although ruby >= 1.9.3 would complain about not using String#encode, iconv is 2-4 times faster and still handles the ruby string encoding
+if RUBY_VERSION < '2'
+  # Although ruby >= 1.9.3 would complain about not using String#encode, iconv is 2-4 times faster and still handles the ruby string encoding
+  require 'iconv'
+end
 
 module RMTools
   ENCODINGS_PATTERNS = {}
@@ -17,48 +19,81 @@ module RMTools
       ANSI_ENCODING = ANSI_LETTERS_UC[0].encoding
     end
   
-    ENCODINGS_PATTERNS["WINDOWS-1251"] = /[#{ANSI_LETTERS_UC.join}]/
+    ENCODINGS_PATTERNS["WINDOWS-1251"] = /[#{ANSI_LETTERS_UC.concat(ANSI_YOYE).join}]/
   end
 
-  ICONVS = {}
-  ANSI2UTF = Cyrillic::ANSI2UTF = Iconv.new("UTF-8//IGNORE", "WINDOWS-1251//IGNORE").method(:iconv)
-  UTF2ANSI = Cyrillic::UTF2ANSI = Iconv.new("WINDOWS-1251//IGNORE", "UTF-8//IGNORE").method(:iconv)
+  if RUBY_VERSION < '2'
+    ICONVS = {}
+    ANSI2UTF = Cyrillic::ANSI2UTF = Iconv.new("UTF-8//IGNORE", "WINDOWS-1251//IGNORE").method(:iconv)
+    UTF2ANSI = Cyrillic::UTF2ANSI = Iconv.new("WINDOWS-1251//IGNORE", "UTF-8//IGNORE").method(:iconv)
+  else
+    ANSI2UTF = Cyrillic::ANSI2UTF = lambda {|str|
+      str.encode("WINDOWS-1251", :invalid => :replace, :undef => :replace, :replace => "").encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
+    }
+    UTF2ANSI = Cyrillic::UTF2ANSI = lambda {|str|
+      str.encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "").encode("WINDOWS-1251", :invalid => :replace, :undef => :replace, :replace => "")
+    }
+  end
 end
   
 class String
   
-  def utf(from_encoding="#{encoding.name.upcase}//IGNORE")
-    (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
-  end
-  
-  def ansi(from_encoding="#{encoding.name.upcase}//IGNORE")
-    (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
-  end
-  
-  def utf!(from_encoding="#{encoding.name.upcase}//IGNORE")
-    replace utf from_encoding
-  end
-  
-  def ansi!(from_encoding="#{encoding.name.upcase}//IGNORE")
-    replace ansi from_encoding
+  if RUBY_VERSION < '2'
+    
+    def utf(from_encoding='WINDOWS-1251//IGNORE')
+      (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
+    end
+    
+    def ansi(from_encoding='UTF-8//IGNORE')
+      (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
+    end
+    
+    def utf!(from_encoding='WINDOWS-1251//IGNORE')
+      replace utf from_encoding
+    end
+    
+    def ansi!(from_encoding='UTF-8//IGNORE')
+      replace ansi from_encoding
+    end
+    
+  else
+    
+    def utf(from_encoding='WINDOWS-1251')
+      encode(from_encoding, :invalid => :replace, :undef => :replace, :replace => "").encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
+    end
+    
+    def ansi(from_encoding='UTF-8')
+      encode(from_encoding, :invalid => :replace, :undef => :replace, :replace => "").encode("WINDOWS-1251", :invalid => :replace, :undef => :replace, :replace => "")
+    end
+    
+    def utf!(from_encoding='WINDOWS-1251')
+      replace utf from_encoding
+    end
+    
+    def ansi!(from_encoding='UTF-8')
+      replace ansi from_encoding
+    end
+    
   end
   
   
-  def utf?
+  def valid_encoding?
     begin
-      encoding == Encoding::UTF_8 and self =~ /./u
-    rescue Encoding::CompatibilityError
+      self =~ /./
+    rescue ArgumentError
       false
+    else
+      true
     end
   end
   
-  def find_compatible_encoding
+  def fix_encoding!
     # UTF-8 by default
-    return nil if utf?
+    return nil if valid_encoding?
     for enc, pattern in ENCODINGS_PATTERNS
       force_encoding(enc)
-      if self =~ pattern
-        return enc
+      if valid_encoding? and self =~ pattern
+        return encoding.name.upcase
       end
     end
     false

data/lib/rmtools/time/russian.rb

@@ -1,48 +1,96 @@
 # encoding: utf-8
 class String
+  if RUBY_VERSION < '1.9'
   
     def digit_date
-      gsub(/jan|[яЯ][нН][вВ]([аА][рР][яЯьЬ]?)?/i, '01').
-      gsub(/feb|[фФ][еЕ][вВ]([рР][аА][лЛ][яЯьЬ]?)?/i, '02').
-      gsub(/mar|[мМ][аА][рР]([тТ][аА]?)?/i, '03').
-      gsub(/apr|[аА][пП][рР]([еЕ][лЛ][яЯьЬ]?)?/i, '04').
-      gsub(/may|[мМ][аА][яЯйЙ]?/i, '05').
+      gsub(/jan(?:uary)?|[яЯ][нН][вВ](?:[аА][рР][яЯьЬ]?)?/i, '01').
+      gsub(/feb(?:ruary)?|[фФ][еЕ][вВ](?:[рР][аА][лЛ][яЯьЬ]?)?/i, '02').
+      gsub(/mar(?:ch)?|[мМ][аА][рР](?:[тТ][аА]?)?/i, '03').
+      gsub(/apr(?:il)?|[аА][пП][рР](?:[еЕ][лЛ][яЯьЬ]?)?/i, '04').
+      gsub(/may|[мМ][аА][яЯйЙ]/i, '05').
       gsub(/june?|[иИ][юЮ][нН][яЯьЬ]?/i, '06').
       gsub(/july?|[иИ][юЮ][лЛ][яЯьЬ]?/i, '07').
-      gsub(/aug|[аА][вВ][гГ]([уУ][сС][тТ][аА]?)?/i, '08').
-      gsub(/sep|[сС][еЕ][нН]([тТ][яЯ][бБ][рР][яЯьЬ]?)?/i, '09').
-      gsub(/oct|[оО][кК][тТ]([яЯ][бБ][рР][яЯьЬ]?)?/i, '10').
-      gsub(/nov|[нН][оО][яЯ]([бБ][рР][яЯьЬ]?)?/i, '11').
-      gsub(/dec|[дД][еЕ][кК]([аА][бБ][рР][яЯьЬ]?)?/i, '12')
+      gsub(/aug(?:ust)?|[аА][вВ][гГ](?:[уУ][сС][тТ][аА]?)?/i, '08').
+      gsub(/sep(?:tember)?|[сС][еЕ][нН](?:[тТ][яЯ][бБ][рР][яЯьЬ]?)?/i, '09').
+      gsub(/oct(?:ober)?|[оО][кК][тТ](?:[яЯ][бБ][рР][яЯьЬ]?)?/i, '10').
+      gsub(/nov(?:ember)?|[нН][оО][яЯ](?:[бБ][рР][яЯьЬ]?)?/i, '11').
+      gsub(/dec(?:ember)?|[дД][еЕ][кК](?:[аА][бБ][рР][яЯьЬ]?)?/i, '12')
     end
-    alias :digitize :digit_date
     
     def tr_date
-      gsub(/[яЯ][нН][вВ]([аА][рР][яЯьЬ]?)?/, 'jan').
-      gsub(/[фФ][еЕ][вВ]([рР][аА][лЛ][яЯьЬ]?)?/, 'feb').
-      gsub(/[мМ][аА][рР]([тТ][аА]?)?/, 'mar').
-      gsub(/[аА][пП][рР]([еЕ][лЛ][яЯьЬ]?)?/, 'apr').
+      gsub(/[яЯ][нН][вВ](?:[аА][рР][яЯьЬ]?)?/, 'jan').
+      gsub(/[фФ][еЕ][вВ](?:[рР][аА][лЛ][яЯьЬ]?)?/, 'feb').
+      gsub(/[мМ][аА][рР](?:[тТ][аА]?)?/, 'mar').
+      gsub(/[аА][пП][рР](?:[еЕ][лЛ][яЯьЬ]?)?/, 'apr').
       gsub(/[мМ][аА][яЯйЙ]?/, 'may').
       gsub(/[иИ][юЮ][нН][яЯьЬ]?/, 'jun').
       gsub(/[иИ][юЮ][лЛ][яЯьЬ]?/, 'jul').
-      gsub(/[аА][вВ][гГ]([уУ][сС][тТ][аА]?)?/, 'aug').
-      gsub(/[сС][еЕ][нН]([тТ][яЯ][бБ][рР][яЯьЬ]?)?/, 'sep').
-      gsub(/[оО][кК][тТ]([яЯ][бБ][рР][яЯьЬ]?)?/, 'oct').
-      gsub(/[нН][оО][яЯ]([бБ][рР][яЯьЬ]?)?/, 'nov').
-      gsub(/[дД][еЕ][кК]([аА][бБ][рР][яЯьЬ]?)?/, 'dec')
+      gsub(/[аА][вВ][гГ](?:[уУ][сС][тТ][аА]?)?/, 'aug').
+      gsub(/[сС][еЕ][нН](?:[тТ][яЯ][бБ][рР][яЯьЬ]?)?/, 'sep').
+      gsub(/[оО][кК][тТ](?:[яЯ][бБ][рР][яЯьЬ]?)?/, 'oct').
+      gsub(/[нН][оО][яЯ](?:[бБ][рР][яЯьЬ]?)?/, 'nov').
+      gsub(/[дД][еЕ][кК](?:[аА][бБ][рР][яЯьЬ]?)?/, 'dec')
     end
     
     def digit_nums
       gsub(/[оО][дД][иИ][нН]|[еЕ][дД][иИ][нН][иИ][цЦ][аА]/, '1').
-      gsub(/[дД][вВ]([оО][йЙ][кК])?[аА]/, '2').
-      gsub(/[тТ][рР]([иИ]|[оО][йЙ][кК][аА])/, '3').
-      gsub(/[чЧ][еЕ][тТ]([ыЫ][рР][еЕ]|[вВ][еЕёЁ][рР][кК][аА])/, '4').
-      gsub(/[пП][яЯ][тТ]([ьЬ]|[еЕёЁ][рР][кК][аА])/, '5').
-      gsub(/[шШ][еЕ][сС][тТ]([ьЬ]|[еЕёЁ][рР][кК][аА])/, '6').
-      gsub(/[сС][еЕ][мМ]([ьЬ]|[еЕёЁ][рР][кК][аА])/, '7').
-      gsub(/[вВ][оО][сС]([еЕ][мМ][ьЬ]|[ьЬ][мМ][еЕёЁ][рР][кК][аА])/i, '8').
-      gsub(/[дД][еЕ][вВ][яЯ][тТ]([ьЬ]|[кК][аА])/, '9').
+      gsub(/[дД][вВ](?:[оО][йЙ][кК])?[аА]/, '2').
+      gsub(/[тТ][рР](?:[иИ]|[оО][йЙ][кК][аА])/, '3').
+      gsub(/[чЧ][еЕ][тТ](?:[ыЫ][рР][еЕ]|[вВ][еЕёЁ][рР][кК][аА])/, '4').
+      gsub(/[пП][яЯ][тТ](?:[ьЬ]|[еЕёЁ][рР][кК][аА])/, '5').
+      gsub(/[шШ][еЕ][сС][тТ](?:[ьЬ]|[еЕёЁ][рР][кК][аА])/, '6').
+      gsub(/[сС][еЕ][мМ](?:[ьЬ]|[еЕёЁ][рР][кК][аА])/, '7').
+      gsub(/[вВ][оО][сС](?:[еЕ][мМ][ьЬ]|[ьЬ][мМ][еЕёЁ][рР][кК][аА])/i, '8').
+      gsub(/[дД][еЕ][вВ][яЯ][тТ](?:[ьЬ]|[кК][аА])/, '9').
       gsub(/[нН][оОуУ][лЛ][ьЬ]/, '0')
     end
-
+    
+  else
+  
+    def digit_date
+      gsub(/jan(?:uary)?|янв(?:ар[яь])?/i, '01').
+      gsub(/feb(?:ruary)?|фев(?:рал[яь])?/i, '02').
+      gsub(/mar(?:ch)?|март?а?/i, '03').
+      gsub(/apr(?:il)?|апр(?:ел[яь])?/i, '04').
+      gsub(/may|ма[яй]/i, '05').
+      gsub(/june?|июн[яь]?/i, '06').
+      gsub(/july?|июл[яь]?/i, '07').
+      gsub(/aug(?:ust)?|авг(?:уста?)?/i, '08').
+      gsub(/sep(?:tember)?|сен(?:тябр[яь])?/i, '09').
+      gsub(/oct(?:ober)?|окт(?:ябр[яь])?/i, '10').
+      gsub(/nov(?:ember)?|ноя(?:бр[яь])?/i, '11').
+      gsub(/dec(?:ember)?|дек(?:абр[яь])?/i, '12')
+    end
+    
+    def tr_date
+      gsub(/янв(?:ар[яь])?/i, 'jan').
+      gsub(/фев(?:рал[яь])?/i, 'feb').
+      gsub(/март?а?/i, 'mar').
+      gsub(/апр(?:ел[яь])?/i, 'apr').
+      gsub(/ма[яй]/i, 'may').
+      gsub(/июн[яь]?/i, 'jun').
+      gsub(/июл[яь]?/i, 'jul').
+      gsub(/авг(?:уста?)?/i, 'aug').
+      gsub(/сен(?:тябр[яь])?/i, 'sep').
+      gsub(/окт(?:ябр[яь])?/i, 'oct').
+      gsub(/ноя(?:бр[яь])?/i, 'nov').
+      gsub(/дек(?:абр[яь])?/i, 'dec')
+    end
+    
+    def digit_nums
+      gsub(/один|единица/i, '1').
+      gsub(/дв(?:ойк|а)/i, '2').
+      gsub(/тр(и|ойка)/i, '3').
+      gsub(/чет(?:ыре|в[её]рка)/i, '4').
+      gsub(/пят(?:ь|[её]рка)/i, '5').
+      gsub(/шест(?:ь|[её]рка)/, '6').
+      gsub(/сем(?:ь|[её]рка)/i, '7').
+      gsub(/вос(?:емь|ьм[её]рка)/i, '8').
+      gsub(/девят(ь|ка)/i, '9').
+      gsub(/н[оу]ль/i, '0')
+    end
+    
+  end
+  
+  alias :digitize :digit_date
 end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.2.7'
+  VERSION = '2.3.0'
 end

data/rmtools.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   
   spec.add_runtime_dependency "activesupport"
+  if RUBY_VERSION < '2'
   #unless ext_files_not_modified 'rmtools', RMTools::VERSION
     spec.extensions << 'ext/extconf.rb'
   #end
+  end
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"