splitclient-rb 7.1.3 → 7.1.4.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb9ee66f1cbcd3f816de01f0cce1ce15210f2e78dd43cd0f57472b5badebc5c
-  data.tar.gz: ddfc9ae6fcd30abfe665943bdd4dbd04f9914ca8551495b119f936f93169413c
+  metadata.gz: 2fcb3fddcc5093742cf0d4a33f94e4ba53b019d8bbb1abde84aa98798546ac96
+  data.tar.gz: 7e2db0aa2e80f08b3e63353c4b060024c1bc208d09c749550562ef800df764c2
 SHA512:
-  metadata.gz: 15d7c826bc12734023cb34b41759065c6aa4d275049e0cfe6ae7acaa1666f883b7c8a48d897d3d72f872779bf3f9fc47e16184be9d6f25ee0a1f204ec8ac0132
-  data.tar.gz: 1e7ba5967e53707a0750dc665926387a91fe32e2a9683abfc11f4f42f635fb0ede23645006cc7ae9e814f9cc66364e1dc2ec49d9dc59f237e91a3356d8094ea2
+  metadata.gz: c414179366ed679d7b1cbd0f79872e4e14000c438bdd069ce232a414719416e54e736fe6fa609fd8e10add56aa1e70dfa592bb102c4417a3343cb121a2a5ade1
+  data.tar.gz: de8a2ccb538991fe46f77fd6e06230bcfafc50abf21d8e3727eae690844e085b2ae086765ac7f6251bef534331d3fe322a4244b1c68931a04023317d861c726f

data/Rakefile

@@ -11,19 +11,14 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
 
 task spec: :compile
-case RUBY_PLATFORM
-when 'java'
+
+if RUBY_PLATFORM == 'java'
   require 'rake/javaextensiontask'
   Rake::JavaExtensionTask.new 'murmurhash' do |ext|
     ext.lib_dir = 'lib/murmurhash'
     ext.target_version = '1.7'
     ext.source_version = '1.7'
   end
-else
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new 'murmurhash' do |ext|
-    ext.lib_dir = 'lib/murmurhash'
-  end
 end
 
 if !ENV['APPRAISAL_INITIALIZED']

data/lib/splitclient-rb/engine/evaluator/splitter.rb

@@ -1,3 +1,7 @@
+unless defined?(JRUBY_VERSION)
+  require 'digest/murmurhash'
+end
+
 module SplitIoClient
   # Misc class in charge of providing hash functions and
   # determination of treatment based on concept of buckets
@@ -9,7 +13,7 @@ module SplitIoClient
       when 'java' 
         Proc.new { |key, seed| Java::MurmurHash3.murmurhash3_x86_32(key, seed) }
       else
-        Proc.new { |key, seed| Digest::MurmurHashMRI3_x86_32.rawdigest(key, [seed].pack('L')) }
+        Proc.new { |key, seed| Digest::MurmurHash3_x86_32.rawdigest(key, [seed].pack('L')) }
       end
     end
     

data/lib/splitclient-rb/engine/parser/evaluator.rb

@@ -1,3 +1,7 @@
+unless defined?(JRUBY_VERSION)
+  require 'digest/murmurhash'
+end
+
 module SplitIoClient
   module Engine
     module Parser

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.3'
+  VERSION = '7.1.4.pre.rc5'
 end

data/splitclient-rb.gemspec

@@ -26,13 +26,7 @@ Gem::Specification.new do |spec|
          lib/murmurhash/murmurhash.jar]
     )
   else
-    spec.files.concat(
-      %w[ext/murmurhash/3_x86_32.c
-         ext/murmurhash/extconf.rb
-         ext/murmurhash/murmurhash.c
-         ext/murmurhash/murmurhash.h]
-    )
-    spec.extensions = ['ext/murmurhash/extconf.rb']
+    spec.add_runtime_dependency 'digest-murmurhash', '>= 1.1.1'
   end
 
   spec.add_development_dependency 'allocation_stats'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4.pre.rc5
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: digest-murmurhash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: allocation_stats
   requirement: !ruby/object:Gem::Requirement
@@ -308,8 +322,7 @@ description: Ruby client for using split SDK.
 email:
 - pato@split.io
 executables: []
-extensions:
-- ext/murmurhash/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
@@ -324,10 +337,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ext/murmurhash/3_x86_32.c
-- ext/murmurhash/extconf.rb
-- ext/murmurhash/murmurhash.c
-- ext/murmurhash/murmurhash.h
 - gemfiles/faraday_after_0.13.gemfile
 - gemfiles/faraday_before_0.13.gemfile
 - lib/murmurhash/base.rb
@@ -448,9 +457,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

data/ext/murmurhash/3_x86_32.c

@@ -1,88 +0,0 @@
-/*
- * MurmurHash3_x86_32 (C) Austin Appleby
- */
-
-#include "murmurhash.h"
-
-uint32_t
-murmur_hash_process3_x86_32(const char * key, uint32_t len, uint32_t seed)
-{
-  const uint8_t * data = (const uint8_t*)key;
-  const int nblocks = len / 4;
-  int i;
-
-  uint32_t h1 = seed;
-
-  const uint32_t c1 = 0xcc9e2d51;
-  const uint32_t c2 = 0x1b873593;
-
-  //----------
-  // body
-
-  const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
-
-  for(i = -nblocks; i; i++)
-  {
-    uint32_t k1 = getblock32(blocks,i);
-
-    k1 *= c1;
-    k1 = ROTL32(k1,15);
-    k1 *= c2;
-
-    h1 ^= k1;
-    h1 = ROTL32(h1,13);
-    h1 = h1*5+0xe6546b64;
-  }
-
-  //----------
-  // tail
-
-  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
-
-  uint32_t k1 = 0;
-
-  switch(len & 3)
-  {
-  case 3: k1 ^= tail[2] << 16;
-  case 2: k1 ^= tail[1] << 8;
-  case 1: k1 ^= tail[0];
-          k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
-  };
-
-  //----------
-  // finalization
-
-  h1 ^= len;
-
-  h1 = fmix32(h1);
-
-  return h1;
-}
-
-VALUE
-murmur3_x86_32_finish(VALUE self)
-{
-  uint8_t digest[4];
-  uint32_t h;
-
-  h = _murmur_finish32(self, murmur_hash_process3_x86_32);
-  assign_by_endian_32(digest, h);
-  return rb_str_new((const char*) digest, 4);
-}
-
-VALUE
-murmur3_x86_32_s_digest(int argc, VALUE *argv, VALUE klass)
-{
-  uint8_t digest[4];
-  uint32_t h;
-
-  h = _murmur_s_digest32(argc, argv, klass, murmur_hash_process3_x86_32);
-  assign_by_endian_32(digest, h);
-  return rb_str_new((const char*) digest, 4);
-}
-
-VALUE
-murmur3_x86_32_s_rawdigest(int argc, VALUE *argv, VALUE klass)
-{
-  return ULL2NUM(_murmur_s_digest32(argc, argv, klass, murmur_hash_process3_x86_32));
-}

data/ext/murmurhash/extconf.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require 'mkmf'
-
-create_makefile('murmurhash/murmurhash')

data/ext/murmurhash/murmurhash.c

@@ -1,251 +0,0 @@
-#include "murmurhash.h"
-
-ID id_DEFAULT_SEED;
-ID iv_seed;
-ID iv_buffer;
-
-
-inline uint32_t rotl32 ( uint32_t x, int8_t r )
-{
-  return (x << r) | (x >> (32 - r));
-}
-inline uint64_t rotl64 ( uint64_t x, int8_t r )
-{
-  return (x << r) | (x >> (64 - r));
-}
-
-FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
-{
-  return p[i];
-}
-
-FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
-{
-  return p[i];
-}
-
-FORCE_INLINE uint32_t fmix32 ( uint32_t h )
-{
-  h ^= h >> 16;
-  h *= 0x85ebca6b;
-  h ^= h >> 13;
-  h *= 0xc2b2ae35;
-  h ^= h >> 16;
-
-  return h;
-}
-
-FORCE_INLINE uint64_t fmix64 ( uint64_t k )
-{
-  k ^= k >> 33;
-  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
-  k ^= k >> 33;
-  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
-  k ^= k >> 33;
-
-  return k;
-}
-
-void
-assign_by_endian_32(uint8_t *digest, uint32_t h)
-{
-  if (BIGENDIAN_P()) {
-    digest[0] = h >> 24;
-    digest[1] = h >> 16;
-    digest[2] = h >> 8;
-    digest[3] = h;
-  }
-  else {
-    digest[3] = h >> 24;
-    digest[2] = h >> 16;
-    digest[1] = h >> 8;
-    digest[0] = h;
-  }
-}
-
-void
-assign_by_endian_64(uint8_t *digest, uint64_t h)
-{
-  if (BIGENDIAN_P()) {
-    digest[0] = h >> 56;
-    digest[1] = h >> 48;
-    digest[2] = h >> 40;
-    digest[3] = h >> 32;
-    digest[4] = h >> 24;
-    digest[5] = h >> 16;
-    digest[6] = h >> 8;
-    digest[7] = h;
-  }
-  else {
-    digest[7] = h >> 56;
-    digest[6] = h >> 48;
-    digest[5] = h >> 40;
-    digest[4] = h >> 32;
-    digest[3] = h >> 24;
-    digest[2] = h >> 16;
-    digest[1] = h >> 8;
-    digest[0] = h;
-  }
-}
-
-void
-assign_by_endian_128(uint8_t *digest, void *out)
-{
-  int i;
-
-  if (BIGENDIAN_P()) {
-    for (i = 0; i < 4; i++) {
-      digest[(i*4)  ] = ((uint32_t*)out)[i] >> 24;
-      digest[(i*4)+1] = ((uint32_t*)out)[i] >> 16;
-      digest[(i*4)+2] = ((uint32_t*)out)[i] >> 8;
-      digest[(i*4)+3] = ((uint32_t*)out)[i];
-    }
-  }
-  else {
-    for (i = 0; i < 4; i++) {
-      digest[16-(i*4)-1] = ((uint32_t*)out)[i] >> 24;
-      digest[16-(i*4)-2] = ((uint32_t*)out)[i] >> 16;
-      digest[16-(i*4)-3] = ((uint32_t*)out)[i] >> 8;
-      digest[16-(i*4)-4] = ((uint32_t*)out)[i];
-    }
-  }
-}
-
-static uint32_t
-rstring2uint32_t(VALUE str)
-{
-  long len = RSTRING_LEN(str);
-  if (UINT32_MAX < len) {
-    rb_raise(rb_eRangeError, "String length=%ld will overflow from long to uint32_t", len);
-  }
-  return (uint32_t)len;
-}
-
-uint32_t
-_murmur_finish32(VALUE self, uint32_t (*process)(const char*, uint32_t, uint32_t))
-{
-  const char *seed = RSTRING_PTR(rb_ivar_get(self, iv_seed));
-  VALUE buffer = rb_ivar_get(self, iv_buffer);
-  return process(RSTRING_PTR(buffer), rstring2uint32_t(buffer), *(uint32_t*)seed);
-}
-
-uint64_t
-_murmur_finish64(VALUE self, uint64_t (*process)(const char*, uint32_t, uint64_t))
-{
-  const char *seed = RSTRING_PTR(rb_ivar_get(self, iv_seed));
-  VALUE buffer = rb_ivar_get(self, iv_buffer);
-  return process(RSTRING_PTR(buffer), rstring2uint32_t(buffer), *(uint64_t*)seed);
-}
-
-void
-_murmur_finish128(VALUE self, void *out, void (*process)(const char*, uint32_t, uint32_t, void*))
-{
-  const char *seed = RSTRING_PTR(rb_ivar_get(self, iv_seed));
-  VALUE buffer = rb_ivar_get(self, iv_buffer);
-  process(RSTRING_PTR(buffer), rstring2uint32_t(buffer), *(uint32_t*)seed, out);
-}
-
-uint32_t
-_murmur_s_digest32(int argc, VALUE *argv, VALUE klass, uint32_t (*process)(const char *, uint32_t, uint32_t))
-{
-  VALUE str;
-  const char *seed;
-
-  if (argc < 1)
-    rb_raise(rb_eArgError, "no data given");
-
-  str = *argv;
-
-  StringValue(str);
-
-  if (1 < argc) {
-    StringValue(argv[1]);
-    if (RSTRING_LEN(argv[1]) != 4) {
-      rb_raise(rb_eArgError, "seed string should be 4 length");
-    }
-    seed = RSTRING_PTR(argv[1]);
-  } else {
-    seed = RSTRING_PTR(rb_const_get(klass, id_DEFAULT_SEED));
-  }
-
-  return process(RSTRING_PTR(str), rstring2uint32_t(str), *(uint32_t*)seed);
-}
-
-uint64_t
-_murmur_s_digest64(int argc, VALUE *argv, VALUE klass, uint64_t (*process)(const char *, uint32_t, uint64_t))
-{
-  VALUE str;
-  const char *seed;
-
-  if (argc < 1)
-    rb_raise(rb_eArgError, "no data given");
-
-  str = *argv;
-
-  StringValue(str);
-
-  if (1 < argc) {
-    StringValue(argv[1]);
-    if (RSTRING_LEN(argv[1]) != 8) {
-      rb_raise(rb_eArgError, "seed string should be 8 length");
-    }
-    seed = RSTRING_PTR(argv[1]);
-  } else {
-    seed = RSTRING_PTR(rb_const_get(klass, id_DEFAULT_SEED));
-  }
-
-  return process(RSTRING_PTR(str), rstring2uint32_t(str), *(uint64_t*)seed);
-}
-
-void
-_murmur_s_digest128(int argc, VALUE *argv, VALUE klass, void *out, void (*process)(const char *, uint32_t, uint32_t, void *))
-{
-  VALUE str;
-  const char *seed;
-  int seed_length = 4;
-
-  if (argc < 1)
-    rb_raise(rb_eArgError, "no data given");
-
-  str = *argv;
-
-  StringValue(str);
-
-  if (1 < argc) {
-    StringValue(argv[1]);
-    if (RSTRING_LEN(argv[1]) != seed_length) {
-      rb_raise(rb_eArgError, "seed string should be %d length", seed_length);
-    }
-    seed = RSTRING_PTR(argv[1]);
-  } else {
-    seed = RSTRING_PTR(rb_const_get(klass, id_DEFAULT_SEED));
-  }
-
-  process(RSTRING_PTR(str), rstring2uint32_t(str), *(uint32_t*)seed, out);
-}
-
-
-void
-Init_murmurhash(void)
-{
-  VALUE cDigest_MurmurHash1,
-        cDigest_MurmurHash2,
-        cDigest_MurmurHash2A,
-        cDigest_MurmurHash64A,
-        cDigest_MurmurHash64B,
-        cDigest_MurmurHashNeutral2,
-        cDigest_MurmurHashAligned2,
-        cDigest_MurmurHash3_x86_32,
-        cDigest_MurmurHash3_x86_128,
-        cDigest_MurmurHash3_x64_128;
-
-  id_DEFAULT_SEED = rb_intern("DEFAULT_SEED");
-  iv_seed = rb_intern("@seed");
-  iv_buffer = rb_intern("@buffer");
-
-
-  cDigest_MurmurHash3_x86_32 = rb_path2class("Digest::MurmurHashMRI3_x86_32");
-  rb_define_singleton_method(cDigest_MurmurHash3_x86_32, "digest", murmur3_x86_32_s_digest, -1);
-  rb_define_singleton_method(cDigest_MurmurHash3_x86_32, "rawdigest", murmur3_x86_32_s_rawdigest, -1);
-  rb_define_private_method(cDigest_MurmurHash3_x86_32, "finish", murmur3_x86_32_finish, 0);
-}

data/ext/murmurhash/murmurhash.h

@@ -1,94 +0,0 @@
-#ifndef MURMURHASH_INCLUDED
-#  define MURMURHASH_INCLUDED
-
-#include "ruby.h"
-
-// Microsoft Visual Studio
-
-#if defined(_MSC_VER)
-  #define FORCE_INLINE    __forceinline
-  #include <stdlib.h>
-  #define ROTL32(x,y)     _rotl(x,y)
-  #define ROTL64(x,y)     _rotl64(x,y)
-  #define BIG_CONSTANT(x) (x)
-#else   // defined(_MSC_VER)
-  #define FORCE_INLINE inline __attribute__((always_inline))
-  #define ROTL32(x,y)     rotl32(x,y)
-  #define ROTL64(x,y)     rotl64(x,y)
-  #define BIG_CONSTANT(x) (x##LLU)
-#endif // !defined(_MSC_VER)
-
-#ifdef DYNAMIC_ENDIAN
-  /* for universal binary of NEXTSTEP and MacOS X */
-  /* useless since autoconf 2.63? */
-  static int
-  is_bigendian(void)
-  {
-    static int init = 0;
-    static int endian_value;
-    char *p;
-
-    if (init) return endian_value;
-    init = 1;
-    p = (char*)&init;
-    return endian_value = p[0] ? 0 : 1;
-  }
-#  define BIGENDIAN_P() (is_bigendian())
-#elif defined(WORDS_BIGENDIAN)
-#  define BIGENDIAN_P() 1
-#else
-#  define BIGENDIAN_P() 0
-#endif
-
-#define MURMURHASH_MAGIC 0x5bd1e995
-#define MURMURHASH_MAGIC64A BIG_CONSTANT(0xc6a4a7935bd1e995)
-
-void assign_by_endian_32(uint8_t *digest, uint32_t h);
-void assign_by_endian_64(uint8_t *digest, uint64_t h);
-void assign_by_endian_128(uint8_t*, void*);
-
-uint32_t rotl32(uint32_t, int8_t);
-uint64_t rotl64(uint64_t, int8_t);
-uint32_t getblock32(const uint32_t*, int);
-uint64_t getblock64(const uint64_t*, int);
-uint32_t fmix32(uint32_t);
-uint64_t fmix64(uint64_t);
-uint32_t _murmur_finish32(VALUE, uint32_t (*)(const char*, uint32_t, uint32_t));
-uint64_t _murmur_finish64(VALUE, uint64_t (*)(const char*, uint32_t, uint64_t));
-void _murmur_finish128(VALUE, void*, void (*)(const char*, uint32_t, uint32_t, void*));
-uint32_t _murmur_s_digest32(int, VALUE*, VALUE, uint32_t (*)(const char*, uint32_t, uint32_t));
-uint64_t _murmur_s_digest64(int, VALUE*, VALUE, uint64_t (*)(const char*, uint32_t, uint64_t));
-void _murmur_s_digest128(int, VALUE*, VALUE, void*, void (*)(const char*, uint32_t, uint32_t, void*));
-
-VALUE murmur1_finish(VALUE);
-VALUE murmur1_s_digest(int, VALUE*, VALUE);
-VALUE murmur1_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur2_finish(VALUE);
-VALUE murmur2_s_digest(int, VALUE*, VALUE);
-VALUE murmur2_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur2a_finish(VALUE);
-VALUE murmur2a_s_digest(int, VALUE*, VALUE);
-VALUE murmur2a_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur64a_finish(VALUE);
-VALUE murmur64a_s_digest(int, VALUE*, VALUE);
-VALUE murmur64a_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur64b_finish(VALUE);
-VALUE murmur64b_s_digest(int, VALUE*, VALUE);
-VALUE murmur64b_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur_neutral2_finish(VALUE);
-VALUE murmur_neutral2_s_digest(int, VALUE*, VALUE);
-VALUE murmur_neutral2_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur_aligned2_finish(VALUE);
-VALUE murmur_aligned2_s_digest(int, VALUE*, VALUE);
-VALUE murmur_aligned2_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur3_x86_32_finish(VALUE);
-VALUE murmur3_x86_32_s_digest(int, VALUE*, VALUE);
-VALUE murmur3_x86_32_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur3_x86_128_finish(VALUE);
-VALUE murmur3_x86_128_s_digest(int, VALUE*, VALUE);
-VALUE murmur3_x86_128_s_rawdigest(int, VALUE*, VALUE);
-VALUE murmur3_x64_128_finish(VALUE);
-VALUE murmur3_x64_128_s_digest(int, VALUE*, VALUE);
-VALUE murmur3_x64_128_s_rawdigest(int, VALUE*, VALUE);
-
-#endif /* ifndef MURMURHASH_INCLUDED */