usamin 7.7.10 → 7.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf99c5b8f00f296106cfb0799a5d241dbf1cc8053e74d252b4e1d00692d760d
-  data.tar.gz: 48c92bfee2edd6f7e39032dbddcc94f0b9343a1fde13d561f99aa50c231bac11
+  metadata.gz: 5c1850442411d90d31a98e9d3286b773852a1e855ba32227b1d266ea2ae2581f
+  data.tar.gz: 4382e4499525e5aa163e023feb62f4e839bc98dd3540a11112ee6b3334d632c1
 SHA512:
-  metadata.gz: 5ec0a132cc068d9cea796e407babcf04dae6323bc45a696c80f49610c78d71e0a218ae0ab20cc4e32a50eda1616a907c8f4c116dae7086eee6bf0378a5efd32d
-  data.tar.gz: 958dfa0b6ffe3bd031ba8ae6b9b83a5542b4a5bc69579677391788a2424c733069871a5e4f5c067eb6f99c6a770a8d15ca1476f52c5a29211cb3069231cf760d
+  metadata.gz: 27d1e300cb0242087202b903ef425ff25d81b1249834111f1302d060e7991e9e665f34f2674a8da5f90647bc9448417141925cd6fad06bdd5783f79fc59bea0f
+  data.tar.gz: 0133a944f187fed3deb2f295fd2e18b9386d52a1f87f3873f58ab37b530de591812f29c422558c35e180b65ebb73ff94d4ca9669dc027c6f47716018538e0004

data/ext/usamin/extconf.rb

@@ -4,6 +4,7 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['CXX'] if ENV['CXX']
 have_library('stdc++')
+have_library('m')
 dir_config('rapidjson')
 append_cppflags('-O3')
 append_cppflags('-Wall')
@@ -20,4 +21,7 @@ if checking_for('whether -march=native is accepted as CPPFLAGS'){try_cppflags('-
 end
 
 $CPPFLAGS << ' -std=c++11'
+
+$CPPFLAGS << ' -DRAPIDJSON_IS_HEAD' if arg_config('--rapidjson-is-head')
+
 create_makefile('usamin/usamin')

data/ext/usamin/generator.cpp

@@ -1,3 +1,4 @@
+#include "rb270_fix.hpp"
 #include <rapidjson/prettywriter.h>
 #include <rapidjson/writer.h>
 #include <ruby.h>
@@ -6,6 +7,8 @@
 #include "rb_usamin_value.hpp"
 #include "rubynized_rapidjson.hpp"
 
+#define WRITER_CONFIGS rapidjson::UTF8<>, rapidjson::UTF8<>, RubyCrtAllocator, rapidjson::kWriteNanAndInfFlag
+
 template <class Writer>
 static inline void write_hash(Writer &, const VALUE);
 template <class Writer>
@@ -152,7 +155,7 @@ static inline void write_usamin(Writer &writer, const VALUE self) {
  */
 VALUE w_generate(const VALUE, const VALUE value) {
     rapidjson::StringBuffer buf;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buf);
+    rapidjson::Writer<rapidjson::StringBuffer, WRITER_CONFIGS> writer(buf);
     write(writer, value);
     return new_utf8_str(buf.GetString(), buf.GetSize());
 }
@@ -174,7 +177,11 @@ VALUE w_pretty_generate(const int argc, const VALUE *argv, const VALUE) {
     VALUE value, options;
     rb_scan_args(argc, argv, "1:", &value, &options);
     rapidjson::StringBuffer buf;
+#if RAPIDJSON_VERSION_CODE(RAPIDJSON_MAJOR_VERSION, RAPIDJSON_MINOR_VERSION, RAPIDJSON_PATCH_VERSION) > RAPIDJSON_VERSION_CODE(1, 1, 0) || defined(RAPIDJSON_IS_HEAD)
+    rapidjson::PrettyWriter<rapidjson::StringBuffer, WRITER_CONFIGS> writer(buf);
+#else
     rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buf);
+#endif
 
     char indent_char = ' ';
     unsigned int indent_count = 2;

data/ext/usamin/parser.cpp

@@ -1,3 +1,4 @@
+#include "rb270_fix.hpp"
 #include "default_parse_flags.hpp"
 #include "parser.hpp"
 #include <rapidjson/reader.h>

data/ext/usamin/rb270_fix.hpp

@@ -0,0 +1,16 @@
+#ifndef RB270_FIX_HPP
+#define RB270_FIX_HPP
+
+#include <cstring>
+#include <ruby/version.h>
+
+#if RUBY_API_VERSION_CODE >= 20700 && defined(__GLIBC__)
+
+namespace std {
+static inline void *ruby_nonempty_memcpy(void *dest, const void *src, size_t n) {
+    return (n ? memcpy(dest, src, n) : dest);
+}
+}  // namespace std
+#endif
+
+#endif

data/ext/usamin/rb_usamin_array.cpp

@@ -1,3 +1,4 @@
+#include "rb270_fix.hpp"
 #include <rapidjson/document.h>
 #include <ruby.h>
 #include "usamin_value.hpp"

data/ext/usamin/rb_usamin_hash.cpp

@@ -1,3 +1,4 @@
+#include "rb270_fix.hpp"
 #include <rapidjson/document.h>
 #include <ruby.h>
 #include <ruby/version.h>

data/ext/usamin/rb_usamin_value.cpp

@@ -1,3 +1,4 @@
+#include "rb270_fix.hpp"
 #include "default_parse_flags.hpp"
 #include <rapidjson/error/en.h>
 #include <rapidjson/reader.h>

data/lib/usamin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Usamin
-  VERSION = '7.7.10'
+  VERSION = '7.7.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usamin
 version: !ruby/object:Gem::Version
-  version: 7.7.10
+  version: 7.7.11
 platform: ruby
 authors:
 - Ishotihadus
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ files:
 - ext/usamin/parser.cpp
 - ext/usamin/parser.hpp
 - ext/usamin/parser_helper.hpp
+- ext/usamin/rb270_fix.hpp
 - ext/usamin/rb_common.cpp
 - ext/usamin/rb_common.hpp
 - ext/usamin/rb_usamin_array.cpp
@@ -110,7 +111,7 @@ homepage: https://github.com/Ishotihadus/usamin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A RapidJSON Wrapper for Ruby
 test_files: []