oniguruma 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1 / 2007-03-28
+* Minimal recommended version of oniglib changed to be compatible with Ruby 1.9, now is 4.6 or higher.
+* Restore check for onig version to build with 4.6
+* In getting replacement do not create temp string object, but directly add to resulting buffer (performance impr.)
+
 == 1.0.0 / 2007-03-27
 * Added documentation for MatchData.
 * Added ogsub, ogsub!, sub and sub! to ::String.

data/Manifest.txt

@@ -5,4 +5,6 @@ Syntax.txt
 Rakefile
 lib/oniguruma.rb
 ext/oregexp.c
+ext/extconf.rb
 test/test_oniguruma.rb
+win/oregexp.so

data/Rakefile

@@ -1,18 +1,41 @@
 require 'rubygems'
 require 'hoe'
 
-class Hoe; def extra_deps; @extra_deps.reject { |x| Array(x).first == 'hoe' }; end end
+class Hoe 
+   # Dirty hack to eliminate Hoe from gem dependencies
+   def extra_deps 
+      @extra_deps.reject { |x| Array(x).first == 'hoe' }
+   end
+   
+   # Dirty hack to package only the required files per platform
+   def spec= s 
+      if ENV['PLATFORM'] =~ /win32/
+         s.files = s.files.reject! {|f| f =~ /ext\//}
+      else
+         s.files = s.files.reject! {|f| f =~ /win\//}
+      end
+      @spec = s
+   end
+end
+
+version = /^== *(\d+\.\d+\.\d+)/.match( File.read( 'History.txt' ) )[1]
 
-Hoe.new('oniguruma', '1.0.0') do |p|
+Hoe.new('oniguruma', version) do |p|
   p.rubyforge_name = 'oniguruma'
-  p.author = 'Dizan Vasquez'
-  p.email = 'dix_ans@yahoo.com'
+  p.author = ['Dizan Vasquez', 'Nikolai Lugovoi']
+  p.email = 'dichodaemon@gmail.com'
   p.summary = 'Bindings for the oniguruma regular expression library'
   p.description = p.paragraphs_of('README.txt', 1 ).join('\n\n')
   p.url = 'http://oniguruma.rubyforge.org'
-  p.spec_extras[:extensions] = ["ext/extconf.rb"]
+  if ENV['PLATFORM'] =~ /win32/
+     p.lib_files = ["win/oregexp.so"]
+     p.spec_extras[:require_paths] = ["win", "lib", "ext" ]
+     p.spec_extras[:platform] = Gem::Platform::WIN32
+  else
+     p.spec_extras[:extensions] = ["ext/extconf.rb"]
+  end
   p.rdoc_pattern = /^(lib|bin|ext)|txt$/
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 0).join("\n\n")
 end
 
 

data/ext/oregexp.c

@@ -58,7 +58,9 @@ static OnigEncodingType * int2encoding( VALUE v_index ) {
       case 26: return ONIG_ENCODING_SJIS;
       /*case 27: return ONIG_ENCODING_KOI8;*/
       case 28: return ONIG_ENCODING_KOI8_R;
+#if ONIGURUMA_VERSION_MAJOR == 5      
       case 29: return ONIG_ENCODING_CP1251;
+#endif      
       case 30: return ONIG_ENCODING_BIG5;
       case 31: return ONIG_ENCODING_GB18030;
       case 32: return ONIG_ENCODING_UNDEF;
@@ -224,14 +226,14 @@ backslash). */
 
 /* scan the replacement text, looking for substitutions (\n) and \escapes. */
 static VALUE
-oregexp_get_replacement(pat, src_text, repl_text, region)
+oregexp_append_replacement(pat, src_text, repl_text, region, ret)
      VALUE           pat,
      		     src_text,
                      repl_text;
      OnigRegion * region;
+     VALUE           ret;
 {
     ORegexp 	*oregexp;
-    VALUE 	ret;
     int32_t  replIdx = 0, name_pos, name_start, name_end ;
     int32_t  replacementLength = RSTRING(repl_text)->len;
     UChar    *replacementText = RSTRING(repl_text)->ptr;
@@ -248,8 +250,6 @@ oregexp_get_replacement(pat, src_text, repl_text, region)
     Data_Get_Struct( pat, ORegexp, oregexp );
     enc = onig_get_encoding( oregexp->reg );
 
-    ret = rb_str_buf_new(RSTRING(repl_text)->len);
-
     while (replIdx < replacementLength) {
         OnigCodePoint c = ONIGENC_MBC_TO_CODE(enc, replacementText+replIdx, replacementEnd);
 	int c_len =ONIGENC_MBC_ENC_LEN(enc, replacementText+replIdx) ; 
@@ -438,10 +438,10 @@ oregexp_gsub(self, argc, argv,  bang, once, region)
             block_res = rb_yield( match_data );
 	    str_mod_check( string_str, str_ptr, str_len);
             curr_repl = rb_obj_as_string(block_res); 
+            rb_str_append(buf, curr_repl);
 	} else {
-	    curr_repl = oregexp_get_replacement(self, string_str, repl, region);
+	    oregexp_append_replacement(self, string_str, repl, region, buf);
 	}
-	rb_str_append(buf, curr_repl);
 	if( once ) break;
 	// find next match
         if( end == beg) { 

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: oniguruma
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-03-27 00:00:00 +02:00
+  version: 1.0.1
+date: 2007-03-28 00:00:00 +02:00
 summary: Bindings for the oniguruma regular expression library
 require_paths: 
 - lib
 - ext
-email: dix_ans@yahoo.com
+email: dichodaemon@gmail.com
 homepage: http://oniguruma.rubyforge.org
 rubyforge_project: oniguruma
 description: Ruby bindings to the Oniguruma[http://www.geocities.jp/kosako3/oniguruma/] regular expression library (no need to recompile Ruby).
@@ -29,6 +29,7 @@ cert_chain:
 post_install_message: 
 authors: 
 - Dizan Vasquez
+- Nikolai Lugovoi
 files: 
 - History.txt
 - Manifest.txt
@@ -37,6 +38,7 @@ files:
 - Rakefile
 - lib/oniguruma.rb
 - ext/oregexp.c
+- ext/extconf.rb
 - test/test_oniguruma.rb
 test_files: 
 - test/test_oniguruma.rb