ffi-radix_tree 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244a7a454320674c40f5adb8cb897980b9d73286
-  data.tar.gz: 28840c6a4d0678bfafce07badeab64f428090bf6
+  metadata.gz: 0b481cbe2fe92e746154ef5d7f640eaa360b2ad1
+  data.tar.gz: 2c31d231c98984ea3ac623c673fea32f3d9f49e3
 SHA512:
-  metadata.gz: 72340475d6bf28b58071b96534a0f23f44ed912240fd15ca2ed87917e7a128fb897903143cadf3567fd553849b6cade64c743705eb930d22c01e612e7e0b8c3d
-  data.tar.gz: 905d9ef2f2732aaf5a1e1d2c08a4dd51fa4c604b87980fe515dbc0928c06ddbbb87829626777595889ccdaaf1092ac2cac6469e7bc025cfb7a5c8859674b24f0
+  metadata.gz: 1569a95cd03b4dee2136b26175e83a3732572b7aaf30af692169d0831f4748fb103603de25414160b54f0a56b59c5b194e75d8ae819cdf58d3c032a5869a4c16
+  data.tar.gz: bdc72d457259f6fb473f0690974fefbc10fb36ff121cfc6dd75c2ae8de517caf86e27ff7107af7d028244053b2ac514c856e22d296ed06794d634815e4096c6d

data/.gitignore

@@ -1,5 +1,6 @@
 *.ruby-*
 *.so
+*.dylib
 *.o
 CMakeCache.txt
 /vendor/radixtree/CMakeFiles

data/lib/ffi/radix_tree.rb

@@ -86,11 +86,20 @@ module FFI
       DESTROY_METHOD = ::FFI::RadixTree.method(:destroy)
       FREE_METHOD = ::FFI::RadixTree.method(:match_free)
 
+      def self.destroy!(tree)
+        tree.destroy! unless tree.nil?
+      end
+
       def initialize
         @ptr = ::FFI::AutoPointer.new(::FFI::RadixTree.create, DESTROY_METHOD)
         @first_character_present = {}
       end
 
+      def destroy!
+        ::FFI::RadixTree.destroy(@ptr) unless @ptr.nil?
+        @ptr = nil
+      end
+
       def has_key?(key)
         ::FFI::RadixTree.has_key(@ptr, key)
       end
@@ -111,6 +120,8 @@ module FFI
         bytesize = byte_length.read_int
         return nil if bytesize <= 0
         ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+      ensure
+        ::FFI::RadixTree.match_free(byte_pointer) unless byte_pointer.nil?
       end
 
       def longest_prefix(string)
@@ -119,6 +130,8 @@ module FFI
         p_out = ::FFI::AutoPointer.new(p_out, FREE_METHOD) unless p_out.nil?
         value.force_encoding("UTF-8") unless value.nil?
         value
+      ensure
+        ::FFI::RadixTree.match_free(p_out) unless p_out.nil?
       end
 
       def longest_prefix_value(string)
@@ -128,6 +141,8 @@ module FFI
         bytesize = byte_length.read_int
         return nil if bytesize <= 0
         ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+      ensure
+        ::FFI::RadixTree.match_free(byte_pointer) unless byte_pointer.nil?
       end
     end
   end

data/lib/ffi/radix_tree/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module RadixTree
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/vendor/radixtree/ffi_radix_tree.cpp

@@ -34,6 +34,7 @@ bool has_key(radix_tree<std::string, std::vector<char>>* map_pointer, const char
 void match_free(const char* match) {
   if (match != NULL) {
     delete[] match;
+    match = NULL;
   }
 }
 
@@ -97,5 +98,6 @@ void insert(radix_tree<std::string, std::vector<char>>* map_pointer, const char*
 
 void destroy(radix_tree<std::string, std::vector<char>>* map_pointer) {
   delete map_pointer;
+  map_pointer = NULL;
 }
 EXTERN_C_END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-radix_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: radix tree implementation in c++ with FFI bindings