curl_escape 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55be49ada64c12d1e7d0bbd158f564503728a235
-  data.tar.gz: 9017ed915571561a448339e296634ed9b5c8c824
+  metadata.gz: 608c203ad1eb50f307905ac89d5a2b8ace3477c2
+  data.tar.gz: 242ff7d0f8a8c5e564065e99416f83f7bd7d15ad
 SHA512:
-  metadata.gz: 721f4544d8503376390464694b7e98b8184249e63e4975c8ce322285f6c150db4c0e8bbe0b0ce3c43948358f5340667919d6b81a70d24c87c75588eaff62eba8
-  data.tar.gz: 7031c858e2c48907ef19fcb7bf487f801dd586a44c82a60ef187d46848df4802b031eb9b2c30fbdb33a8e8be10e1a075ffc8e84ff9916243cdf323b0e5d85ef4
+  metadata.gz: e7a7225a5e790764589e7878b87b5517311b85d6275e9d0bf2b283df8291c4c1380654f97e3d36a77b5c55b160deef2a4d6e31ef8618dca405714dce4ede93ba
+  data.tar.gz: e7f941949d0cf7f345e19a773029e79daa65047cbe61c0aadafbc5121aed7956a5823cac101eea8295ad75e1b747c96ae75684c632b1f776a9902dd62549c98d

data/bench.rb

@@ -6,13 +6,13 @@ require_relative './lib/curl_escape'
 
 Benchmark.ips do |x|
   x.config(time: 15, warmup: 5)
-  x.report("cgi_escape") { CGI.escape("'Stop!' said Fred") }
-  x.report("curl_escape") { CurlEscape.escape("'Stop!' said Fred") }
+  x.report("cgi_escape")  {        CGI.escape("'Stop!' said~Fred") }
+  x.report("curl_escape") { CurlEscape.escape("'Stop!' said~Fred") }
   x.compare!
 end
 
-p CGI.escape("'Stop!' said~Fred foo~~hoge")
-p CurlEscape.escape("'Stop!' said~Fred foo~~hoge")
+p        CGI.escape("'~Stop!' said~Fred foo~~~hoge")
+p CurlEscape.escape("'~Stop!' said~Fred foo~~~hoge")
 
-p CGI.escape("'日本語あいうえお")
+p        CGI.escape("'日本語あいうえお")
 p CurlEscape.escape("'日本語あいうえお")

data/ext/curl_escape/curl_escape.c

@@ -3,12 +3,12 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
 
-char *alloc_output_buffer(char *cOutput);
+#define EXPAND_SIZE 40
 
-VALUE ruby_curl_escape(VALUE self, VALUE str) {
-  int cnt, pos;
+static VALUE ruby_curl_escape(VALUE self, VALUE str) {
+  int n, pos, len;
   char c;
-  char *cStr, *cOutput, *buf;
+  char *cStr, *cOutput;
   char escaped_tilde[3] = "%7E";
   VALUE output;
   rb_encoding *enc;
@@ -22,47 +22,45 @@ VALUE ruby_curl_escape(VALUE self, VALUE str) {
   cOutput = curl_easy_escape(curl, cStr, strlen(cStr));
 
   pos = 0;
-  buf = alloc_output_buffer(cOutput);
   if (cOutput) {
-    for (cnt = 0; (c = *(cOutput + cnt)) != '\0'; cnt++) {
+    for (n = 0; (c = *(cOutput + n)) != '\0'; n++) {
       if (c == '~') {
-        memcpy(buf + pos, escaped_tilde, 3);
-        pos += 2;
+        if (n - pos >= 2) {
+          memcpy(cOutput + pos, escaped_tilde, 3);
+          pos += 2;
+        } else {
+          cOutput = realloc(cOutput, strlen(cOutput) + EXPAND_SIZE);
+          len = strlen(cOutput + n);
+          memmove(cOutput + n + EXPAND_SIZE, cOutput + n, len + 1);
+          n += EXPAND_SIZE;
+          memcpy(cOutput + pos, escaped_tilde, 3);
+          pos += 2;
+        }
       } else if (c != '%') {
-        buf[pos] = c;
-      } else if (strncmp(cOutput + cnt, "%20", 3) == 0) {
-        buf[pos] = '+';
-        cnt += 2;
+        if (pos != n) {
+          *(cOutput + pos) = c;
+        }
+      } else if (strncmp(cOutput + n, "%20", 3) == 0) {
+        *(cOutput + pos) = '+';
+        n += 2;
       } else {
-        buf[pos] = c;
+        if (pos != n) {
+          *(cOutput + pos) = c;
+        }
       }
       pos++;
     }
-    buf[pos] = '\0';
+    *(cOutput + pos) = '\0';
 
     enc = rb_enc_get(str);
-    output = rb_enc_str_new_cstr(buf, enc);
+    output = rb_enc_str_new_cstr(cOutput, enc);
     curl_free(cOutput);
-    free(buf);
     return output;
   } else {
     return Qnil;
   }
 }
 
-char *alloc_output_buffer(char *cOutput) {
-  int i, tilde_cnt;
-  char *buf;
-  tilde_cnt = 0;
-  for (i = 0; *(cOutput + i) != '\0'; i++) {
-    if (*(cOutput + i) == '~') {
-      tilde_cnt++;
-    }
-  }
-  buf = (char *)malloc(i + tilde_cnt * 2);
-  return buf;
-}
-
 void Init_curl_escape(void) {
   VALUE module = rb_define_module("CurlEscape");
   rb_define_singleton_method(module, "escape", ruby_curl_escape, 1);

data/lib/curl_escape/version.rb

@@ -1,3 +1,3 @@
 module CurlEscape
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curl_escape
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler