usamin 7.7.4 → 7.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07195ec7a8e453e36f3620e2e4d73c7fd06cb9253dd05357f41b5719f0b6a21
-  data.tar.gz: 1a37b8c34d7babaacbe20707c819e992f7641b54c445952e8fce96f2dd59690f
+  metadata.gz: 2dc9e7a6a2f8cf8fd04b8bd8063f014dd6b78a04b6727a0d1a60fec9f5dc3bc6
+  data.tar.gz: 8fb71ac883d87559cb9a2d4c993925cf3cff431904e141bf82a652a6f57385c5
 SHA512:
-  metadata.gz: e35c13d1afc08e814f2bcb6f4f93ca03d2d54b7af6a919ddaa531e15b46efcdb47b822a355273395c563fd20a58c24711ec68e4ba0641206d0f5a567e777cec9
-  data.tar.gz: e95b3a78bba63f2a362378c85592f42148e5c220cc632ffb37d00c8d3a03e3eaf91d5617ee3fd492bfe109b8eeb2056733ac5b0433a6a4ced34b7f11c2925e96
+  metadata.gz: 56d2aa592fc15f8647859d793d025e1a78af802ffc868073997d533b1e62c5563e5d3ec26a0fc5b795fc6c34454e36c4a625cf9f524e51744e9bccba567f6fee
+  data.tar.gz: fcfdd4ec9ebf5437a16aa1584a1450b218040072961d7cd8e4aff0a3d1a1a2f89996665b01fb1b9861c193fb9fa9f3f2b56af139168e5eb9fd90d61f9daae355

data/ext/usamin/usamin.cpp

@@ -35,7 +35,7 @@ static inline VALUE get_utf8_str(VALUE str) {
     Check_Type(str, T_STRING);
     int encoding = rb_enc_get_index(str);
     if (encoding == utf8index || rb_enc_compatible(str, utf8value) == utf8)
-        return rb_str_dup(str);
+        return str;
     else
         return rb_str_conv_enc(str, rb_enc_from_index(encoding), utf8);
 }
@@ -52,18 +52,16 @@ static inline bool str_compare(const char* str1, const long len1, const char* st
     return memcmp(str1, str2, len1) == 0;
 }
 
-static inline bool str_compare_xx(VALUE &str1, const rapidjson::Value &str2) {
+static inline bool str_compare_xx(VALUE str1, const rapidjson::Value &str2) {
     bool free_flag = true;
     if (RB_TYPE_P(str1, T_STRING)) {
-        int encoding = rb_enc_get_index(str1);
-        if (encoding == utf8index || rb_enc_compatible(str1, utf8value) == utf8)
-            free_flag = false;
-        else
-            str1 = rb_str_conv_enc(str1, rb_enc_from_index(encoding), utf8);
+        str1 = get_utf8_str(str1);
+        free_flag = false;
     } else if (SYMBOL_P(str1)) {
-        str1 = rb_sym_to_s(str1);
+        str1 = get_utf8_str(rb_sym_to_s(str1));
     } else {
         StringValue(str1);
+        str1 = get_utf8_str(str1);
     }
     bool ret = str_compare(RSTRING_PTR(str1), RSTRING_LEN(str1), str2.GetString(), str2.GetStringLength());
     if (free_flag)
@@ -129,9 +127,7 @@ static inline VALUE make_array(UsaminValue *value) {
 
 static inline rapidjson::ParseResult parse(rapidjson::Document &doc, const VALUE str, bool fast = false) {
     VALUE v = get_utf8_str(str);
-    rapidjson::ParseResult ret = fast ? doc.Parse<kParseFastFlags>(RSTRING_PTR(v), RSTRING_LEN(v)) : doc.Parse(RSTRING_PTR(v), RSTRING_LEN(v));
-    rb_str_free(v);
-    return ret;
+    return fast ? doc.Parse<kParseFastFlags>(RSTRING_PTR(v), RSTRING_LEN(v)) : doc.Parse(RSTRING_PTR(v), RSTRING_LEN(v));
 }
 
 
@@ -275,7 +271,6 @@ template <class Writer> static void write(Writer &writer, const VALUE value) {
             {
                 VALUE v = rb_big2str(value, 10);
                 writer.RawValue(RSTRING_PTR(v), static_cast<unsigned int>(RSTRING_LEN(v)), rapidjson::kNumberType);
-                rb_str_free(v);
             }
             break;
         default:
@@ -290,13 +285,11 @@ template <class Writer> static void write(Writer &writer, const VALUE value) {
 template <class Writer> static inline void write_str(Writer &writer, const VALUE value) {
     VALUE v = get_utf8_str(value);
     writer.String(RSTRING_PTR(v), static_cast<unsigned int>(RSTRING_LEN(v)));
-    rb_str_free(v);
 }
 
 template <class Writer> static inline void write_key_str(Writer &writer, const VALUE value) {
     VALUE v = get_utf8_str(value);
     writer.Key(RSTRING_PTR(v), static_cast<unsigned int>(RSTRING_LEN(v)));
-    rb_str_free(v);
 }
 
 template <class Writer> static inline void write_key_to_s(Writer &writer, const VALUE value) {

data/lib/usamin/version.rb

@@ -1,3 +1,3 @@
 module Usamin
-    VERSION = "7.7.4"
+    VERSION = "7.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usamin
 version: !ruby/object:Gem::Version
-  version: 7.7.4
+  version: 7.7.5
 platform: ruby
 authors:
 - Ishotihadus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler