curl_escape 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8390d31939a8de3b2c4c1bb52d1d77898c8c0f7
-  data.tar.gz: c16f6b8f2a78bc496e5634b175aad69ddb85ba8a
+  metadata.gz: 55be49ada64c12d1e7d0bbd158f564503728a235
+  data.tar.gz: 9017ed915571561a448339e296634ed9b5c8c824
 SHA512:
-  metadata.gz: ceb049e7c505ca7c76be84001d0407bc087eef8c0ce368980d909b535fe382b6fe6928dc924565dc3ab0c302b4976bbb8e13a9943be6b5c874d40d35da7c1477
-  data.tar.gz: 892b19c1a63591f33bb3d54d8591ee774f1f70da0ae4455f1058f4da39a2b9d4cc9fc883b55d9cadc3f1b4e3fb305fccc12d0ed19853c05e0a5a49e6795a0923
+  metadata.gz: 721f4544d8503376390464694b7e98b8184249e63e4975c8ce322285f6c150db4c0e8bbe0b0ce3c43948358f5340667919d6b81a70d24c87c75588eaff62eba8
+  data.tar.gz: 7031c858e2c48907ef19fcb7bf487f801dd586a44c82a60ef187d46848df4802b031eb9b2c30fbdb33a8e8be10e1a075ffc8e84ff9916243cdf323b0e5d85ef4

data/ext/curl_escape/curl_escape.c

@@ -3,47 +3,66 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
 
+char *alloc_output_buffer(char *cOutput);
+
 VALUE ruby_curl_escape(VALUE self, VALUE str) {
-  int cnt;
+  int cnt, pos;
+  char c;
+  char *cStr, *cOutput, *buf;
+  char escaped_tilde[3] = "%7E";
   VALUE output;
+  rb_encoding *enc;
 
   static CURL *curl;
   if (!curl) {
     curl = curl_easy_init();
   }
 
-  char *cStr = StringValueCStr(str);
-  char *cOutput = curl_easy_escape(curl, cStr, strlen(cStr));
-
-  int pos = 0;
-  char buf[strlen(cOutput) * 3];
+  cStr = StringValueCStr(str);
+  cOutput = curl_easy_escape(curl, cStr, strlen(cStr));
 
+  pos = 0;
+  buf = alloc_output_buffer(cOutput);
   if (cOutput) {
-    for (cnt = 0; *(cOutput + cnt) != '\0'; cnt++) {
-      if (strncmp(cOutput + cnt, "%20", 3) == 0) {
+    for (cnt = 0; (c = *(cOutput + cnt)) != '\0'; cnt++) {
+      if (c == '~') {
+        memcpy(buf + pos, escaped_tilde, 3);
+        pos += 2;
+      } else if (c != '%') {
+        buf[pos] = c;
+      } else if (strncmp(cOutput + cnt, "%20", 3) == 0) {
         buf[pos] = '+';
         cnt += 2;
-      } else if (*(cOutput + cnt) == '~') {
-        buf[pos] = '%';
-        buf[pos+1] = '7';
-        buf[pos+2] = 'E';
-        pos += 2;
       } else {
-        buf[pos] = *(cOutput + cnt);
+        buf[pos] = c;
       }
       pos++;
     }
-    buf[pos++] = '\0';
+    buf[pos] = '\0';
 
-    rb_encoding* enc = rb_enc_get(str);
+    enc = rb_enc_get(str);
     output = rb_enc_str_new_cstr(buf, 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.2"
+  VERSION = "0.1.3"
 end

metadata

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