ffi-radix_tree 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 24b341505b1ae9d77943d26730537193ce58cabe2877add54663f86436e7c0ee
-  data.tar.gz: 37d2b07791ed42c53e3ccad80e32fb3522bda0fd65d7a8a917a0576b7b6ced71
+SHA1:
+  metadata.gz: c2547ed89d9cbedb9bd340a86785aa16f0becd3c
+  data.tar.gz: 737b4483c593146c8c9fef84330f9ed5eac149ee
 SHA512:
-  metadata.gz: 5244fc5c7d0828e4cc4907575dbca6b65265f8b35b02127d8bfb709dd057cadcd34a7ed5574d8ed23efe58b6b54f07e15b53a348f21413292f08a837579dcea3
-  data.tar.gz: 3d19a13ba263c5a147fa61be948db117adbf51582cfd3d9a368b27bc1f356ec34d62e37ea9cd08e54c7936d088ea8e448dbdd1086aacf9f525f63ec636116f11
+  metadata.gz: 79474879d50035f089b2a04b60db2dee547e9aabf4aeffa43c33b430156bac7004e55da050e35bb71cda97eede7bcda077c9ca4a53dbc66809d040a06c04d277
+  data.tar.gz: becb72bae362661101c75aed79d53c42f9d698c19116593b0180971026ba8e59eebcb712d8c65ea7e4e5ffbd71a9de6ef6dcf46b2a22141cc2e64288fdafddb9

data/Rakefile

@@ -9,11 +9,12 @@ namespace :radixtree do
   end
 end
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
+Rake::TestTask.new(:spec) do |t|
+  t.libs << "spec"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.pattern = "spec/**/*_spec.rb"
+  t.verbose = true
 end
-Rake::Task[:test].prerequisites << "radixtree:compile"
+Rake::Task[:spec].prerequisites << "radixtree:compile"
 
-task :default => :test
+task :default => :spec

data/ffi-radix_tree.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/ffi/radix_tree.rb

@@ -74,7 +74,7 @@ module FFI
 
     attach_function :create, [], :pointer
     attach_function :destroy, [:pointer], :void
-    attach_function :erase, [:string], :void
+    attach_function :erase, [:pointer, :string], :void
     attach_function :fetch, [:pointer, :string, :pointer], :pointer
     attach_function :insert, [:pointer, :string, :pointer, :size_t], :void
     attach_function :longest_prefix, [:pointer, :string], :string
@@ -102,43 +102,56 @@ module FFI
       end
 
       def push(key, value)
+        push_response = nil
         @first_character_present[key[0]] = true
         storage_data = ::MessagePack.pack(value)
         bytesize = storage_data.bytesize
-        memory_buffer = ::FFI::MemoryPointer.new(:char, bytesize, true)
-        memory_buffer.put_bytes(0, storage_data)
-        ::FFI::RadixTree.insert(@ptr, key, memory_buffer, bytesize)
+
+        ::FFI::MemoryPointer.new(:char, bytesize, true) do |memory_buffer|
+          memory_buffer.put_bytes(0, storage_data)
+          push_response = ::FFI::RadixTree.insert(@ptr, key, memory_buffer, bytesize)
+        end
+
+        push_response
       end
 
       def get(key)
         return nil unless @first_character_present[key[0]]
-        byte_length = ::FFI::MemoryPointer.new(:int)
-        byte_pointer = ::FFI::RadixTree.fetch(@ptr, key, byte_length)
-        bytesize = byte_length.read_int
-        return nil if bytesize <= 0
-        ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+        byte_pointer = get_response = nil
+
+        ::FFI::MemoryPointer.new(:int) do |byte_length|
+          byte_pointer = ::FFI::RadixTree.fetch(@ptr, key, byte_length)
+          bytesize = byte_length.read_int
+          get_response = ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize)) if bytesize && bytesize > 0
+        end
+
+        get_response
       ensure
-        ::FFI::RadixTree.match_free(byte_pointer) unless byte_pointer.nil?
+        ::FFI::RadixTree.match_free(byte_pointer) if byte_pointer
       end
 
       def longest_prefix(string)
         return nil unless @first_character_present[string[0]]
         value, p_out = ::FFI::RadixTree.longest_prefix(@ptr, string)
-        value.force_encoding("UTF-8") unless value.nil?
+        value.force_encoding("UTF-8") if value
         value
       ensure
-        ::FFI::RadixTree.match_free(p_out) unless p_out.nil?
+        ::FFI::RadixTree.match_free(p_out) if p_out
       end
 
       def longest_prefix_value(string)
         return nil unless @first_character_present[string[0]]
-        byte_length = ::FFI::MemoryPointer.new(:int)
-        byte_pointer = ::FFI::RadixTree.longest_prefix_value(@ptr, string, byte_length)
-        bytesize = byte_length.read_int
-        return nil if bytesize <= 0
-        ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+        byte_pointer = get_response = nil
+
+        ::FFI::MemoryPointer.new(:int) do |byte_length|
+          byte_pointer = ::FFI::RadixTree.longest_prefix_value(@ptr, string, byte_length)
+          bytesize = byte_length.read_int
+          get_response = ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize)) if bytesize && bytesize > 0
+        end
+
+        get_response
       ensure
-        ::FFI::RadixTree.match_free(byte_pointer) unless byte_pointer.nil?
+        ::FFI::RadixTree.match_free(byte_pointer) if byte_pointer
       end
     end
   end

data/lib/ffi/radix_tree/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module RadixTree
-    VERSION = "0.1.6"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,80 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: ffi-radix_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: msgpack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: ffi
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -110,7 +138,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.11
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.13
+signing_key: 
 specification_version: 4
 summary: radix tree implementation in c++ with FFI bindings
 test_files: []