sparsam 0.2.7 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 418d5b778804d87629bffaa38ae70420ce0c1d54
-  data.tar.gz: 97e472841bbf213dfad5e161228bdea9ec2e2baa
+SHA256:
+  metadata.gz: c759ead3b6f09dd4e6b1e1754dc0443ea782e37fd717617d4069e5952605bc85
+  data.tar.gz: 3734e8cfa8796efdcfe78a702a536672bf88e5e442fdedb1e59b60602b34daaa
 SHA512:
-  metadata.gz: 823b230987338ee70f778a1c1dd92818acf6d1719175ae0f365b3514eb0ebcdb203993442b9688b1e3e63fc81ddc809d6ce51747b23f46d3c5b62818e2a0ef86
-  data.tar.gz: f11c539cedebcad0ac100fa27a0cd267f2b50b97d652800537413ba13009d4bf723c872874c6c43f0d77fcdf609ac8ec340caf091c0855735f76fd1f0fb8a6b8
+  metadata.gz: 9eec207eba73e7fdb9a53edf2de172f34d640cfc15d484804204b929ecdc4caf223eb76a01be496487734ca1af54760fc1e7ad9cf4622e27183e4c4db24fa323
+  data.tar.gz: 27a9faadcf29db90b72d14a1b775c10ac9004a31f98562f1906c771a8f923124f1290feef5df5e2e8aefc39912ccaedc2b783b8461573eab71b2afc9770d6f4a

data/ext/extconf.rb

@@ -7,12 +7,70 @@ if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   $CPPFLAGS += $CXXFLAGS
 end
 
+brew = find_executable('brew')
+
+# Automatically use homebrew to discover thrift package if it is
+# available and not disabled via --disable-homebrew.
+use_homebrew = enable_config('homebrew', brew)
+
+if use_homebrew
+  $stderr.puts "Using #{brew} to locate thrift and boost packages"
+  $stderr.puts '(disable Homebrew integration via --disable-homebrew)'
+
+  thrift_package = with_config('homebrew-thrift-package', 'thrift@0.9')
+  $stderr.puts "looking for Homebrew thrift package '#{thrift_package}'"
+  $stderr.puts '(change Homebrew thrift package name via --with-homebrew-thrift-package=<package>)'
+
+  thrift_prefix = `#{brew} --prefix #{thrift_package}`.strip
+
+  unless File.exists?(thrift_prefix)
+    $stderr.puts "#{thrift_prefix} does not exist"
+    $stderr.puts "To resolve, `brew install #{thrift_package}` or pass"
+    $stderr.puts '--with-homebrew-thrift-package=<package> to this build to specify'
+    $stderr.puts 'an alternative thrift package to build against. e.g.:'
+    $stderr.puts
+    $stderr.puts '  $ bundle config --global build.sparsam --with-homebrew-thrift-package=mythrift'
+
+    raise "Homebrew package #{thrift_package} not installed"
+  end
+
+  $stderr.puts "using Homebrew thrift at #{thrift_prefix}"
+  $CFLAGS << " -I#{thrift_prefix}/include"
+  $CXXFLAGS << " -I#{thrift_prefix}/include"
+  $CPPFLAGS << " -I#{thrift_prefix}/include"
+  $LDFLAGS << " -L#{thrift_prefix}/lib"
+
+  # Also add boost to the includes search path if it is installed.
+  boost_package = with_config('homebrew-boost-package', 'boost')
+  $stderr.puts "looking for Homebrew boost package '#{boost_package}'"
+  $stderr.puts '(change Homebrew boost package name via --with-homebrew-boost-package=<package>)'
+
+  boost_prefix = `#{brew} --prefix #{boost_package}`.strip
+
+  if File.exists?(boost_prefix)
+    $stderr.puts("using Homebrew boost at #{boost_prefix}")
+    $CFLAGS << " -I#{boost_prefix}/include"
+    $CXXFLAGS << " -I#{boost_prefix}/include"
+    $CPPFLAGS << " -I#{boost_prefix}/include"
+  else
+    $stderr.puts 'Homebrew boost not found; assuming boost is in default search paths'
+  end
+end
+
 have_func("strlcpy", "string.h")
-have_library("thrift")
+
+unless have_library("thrift")
+  raise 'thrift library not found; aborting since compile would fail'
+end
+
 libs = ['-lthrift']
 
 libs.each do |lib|
   $LOCAL_LIBS << "#{lib} "
 end
 
+# Ideally we'd validate boost as well. But boost is header only and
+# mkmf's have_header() doesn't work with C++ headers.
+# https://bugs.ruby-lang.org/issues/4924
+
 create_makefile 'sparsam_native'

data/ext/serializer.cpp

@@ -1,7 +1,5 @@
-extern "C" {
 #include <ruby.h>
 #include <ruby/intern.h>
-}
 #include <ruby/encoding.h>
 #include <stdio.h>
 #include <thrift/protocol/TBinaryProtocol.h>
@@ -51,6 +49,8 @@ VALUE SetClass;
 KlassFieldsCache klassCache;  // consider the memory leaked.
 std::unordered_set<VALUE> unions;
 
+#define SPARSAM_CHECK_TYPE(x, t, outer_struct, field_sym) if (!(RB_TYPE_P(x, t))) { raise_type_mismatch(outer_struct, field_sym, t, x); }
+
 void *serializer_create() { return (void *)(new ThriftSerializer()); }
 
 void serializer_free(void *data) {
@@ -185,12 +185,6 @@ static inline long raise_type_mismatch_as_value(VALUE outer_struct,
   return 0;
 }
 
-static inline void Sparsam_Check_Type(VALUE x, int t, VALUE outer_struct,
-                                      VALUE field_sym) {
-  if (!(RB_TYPE_P(x, t))) {
-    raise_type_mismatch(outer_struct, field_sym, t, x);
-  }
-}
 
 static inline VALUE make_ruby_bool(bool val) { return val ? Qtrue : Qfalse; }
 
@@ -513,7 +507,7 @@ void ThriftSerializer::writeAny(TType ttype, FieldInfo *field_info,
     HANDLE_TYPE(BYTE, Byte, CONVERT_FIXNUM(byte_convert, protocol::T_BYTE))
 
     case protocol::T_STRING: {
-      Sparsam_Check_Type(actual, T_STRING, outer_struct, field_sym);
+      SPARSAM_CHECK_TYPE(actual, T_STRING, outer_struct, field_sym);
 
       string data = string(StringValuePtr(actual), RSTRING_LEN(actual));
       if (field_info->isBinaryString) {
@@ -525,7 +519,7 @@ void ThriftSerializer::writeAny(TType ttype, FieldInfo *field_info,
     }
 
     case protocol::T_LIST: {
-      Sparsam_Check_Type(actual, T_ARRAY, outer_struct, field_sym);
+      SPARSAM_CHECK_TYPE(actual, T_ARRAY, outer_struct, field_sym);
 
       long length = RARRAY_LEN(actual);
       TType elem = field_info->elementType->ftype;
@@ -556,7 +550,7 @@ void ThriftSerializer::writeAny(TType ttype, FieldInfo *field_info,
     }
 
     case protocol::T_MAP: {
-      Sparsam_Check_Type(actual, T_HASH, outer_struct, field_sym);
+      SPARSAM_CHECK_TYPE(actual, T_HASH, outer_struct, field_sym);
 
       TType keyTType = field_info->keyType->ftype,
             valueTType = field_info->elementType->ftype;

data/lib/sparsam/struct.rb

@@ -16,6 +16,8 @@ module Sparsam
         reader = name_to_accessors(info[:name]).reader
         return false unless send(reader) == other.send(reader)
       end
+
+      true
     end
     alias_method :eql?, :==
   end

data/spec/gen-ruby/user_types.rb

@@ -13,6 +13,7 @@ module Magic
   Blue = 3
   Green = 4
   VALUE_MAP = {0 => "Black", 1 => "White", 2 => "Red", 3 => "Blue", 4 => "Green"}
+  INVERTED_VALUE_MAP = {"Black" => 0, "White" => 1, "Red" => 2, "Blue" => 3, "Green" => 4}
   VALID_VALUES = Set.new([Black, White, Red, Blue, Green]).freeze
 end
 

data/spec/sparsam_spec.rb

@@ -546,4 +546,76 @@ describe 'Sparsam' do
       end
     end
   end
+
+  describe 'generated enum types' do
+    let(:enum_module) { Magic }
+
+    it 'includes thrift constants as top level module constants' do
+      enum_module.const_defined?(:Black).should == true
+      enum_module.const_defined?(:White).should == true
+      enum_module.const_defined?(:Red).should == true
+      enum_module.const_defined?(:Blue).should == true
+      enum_module.const_defined?(:Green).should == true
+
+      enum_module.const_get(:Black).should == 0
+      enum_module.const_get(:White).should == 1
+      enum_module.const_get(:Red).should == 2
+      enum_module.const_get(:Blue).should == 3
+      enum_module.const_get(:Green).should == 4
+    end
+
+    it 'contains a VALUE_MAP constant that maps from int value to string' do
+      enum_module.const_defined?(:VALUE_MAP).should == true
+
+      value_map = enum_module.const_get(:VALUE_MAP)
+
+      value_map.should eql({
+        0 => 'Black',
+        1 => 'White',
+        2 => 'Red',
+        3 => 'Blue',
+        4 => 'Green',
+      })
+
+      value_map[enum_module.const_get(:Black)].should == 'Black'
+      value_map[enum_module.const_get(:White)].should == 'White'
+      value_map[enum_module.const_get(:Red)].should == 'Red'
+      value_map[enum_module.const_get(:Blue)].should == 'Blue'
+      value_map[enum_module.const_get(:Green)].should == 'Green'
+    end
+
+    it 'contains an INVERTED_VALUE_MAP constant that maps from name to int value' do
+      enum_module.const_defined?(:INVERTED_VALUE_MAP).should == true
+
+      inverted_value_map = enum_module.const_get(:INVERTED_VALUE_MAP)
+
+      inverted_value_map.should eql({
+        'Black' => 0,
+        'White' => 1,
+        'Red' => 2,
+        'Blue' => 3,
+        'Green' => 4,
+      })
+
+      inverted_value_map['Black'].should == enum_module.const_get(:Black)
+      inverted_value_map['White'].should == enum_module.const_get(:White)
+      inverted_value_map['Red'].should == enum_module.const_get(:Red)
+      inverted_value_map['Blue'].should == enum_module.const_get(:Blue)
+      inverted_value_map['Green'].should == enum_module.const_get(:Green)
+    end
+
+    it 'contains a VALID_VALUES constant that is a set of all enum values' do
+      enum_module.const_defined?(:VALID_VALUES).should == true
+
+      valid_values = enum_module.const_get(:VALID_VALUES)
+
+      valid_values.should be_a(Set)
+      valid_values.should include(enum_module.const_get(:Black))
+      valid_values.should include(enum_module.const_get(:White))
+      valid_values.should include(enum_module.const_get(:Red))
+      valid_values.should include(enum_module.const_get(:Blue))
+      valid_values.should include(enum_module.const_get(:Green))
+      valid_values.length.should == 5
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparsam
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.10
 platform: ruby
 authors:
 - Airbnb Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: thrift
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Apache Thrift