ffi-radix_tree 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b552a559de9350d73c2c847b2aa4f0157fed12a8
-  data.tar.gz: f25f0dc4ad08766c3f805b8f75cba8c6fbda5a3d
+  metadata.gz: d36fd469f2823e6b56e5d8a4dab8ff7f9cd133f3
+  data.tar.gz: 5cfcb3ed80dc6b731c95e16270fe48a1f7558e1c
 SHA512:
-  metadata.gz: 63fc44026e11a67bdef49b7c7fd2c1fe3c5c1a34ef7ae3ae26823c52d77a0b278b43e506114dda67baf10f7cfb160e855c5bcef05005102e320ff3ae2395e9eb
-  data.tar.gz: 8facbab3ba214d8c382f2c176d6284c9743de7d34e1368e558ed550fa8e4d2b06c988bd29cef5cf01e3286287b9398628a913707284d8f6652960f647ebb8ebf
+  metadata.gz: e08601eee9895a0a27bbaad76f44f51dc8f1dfd7f0768b23611734e34950a7edae76d45892a5e8316d4369614b4e32f5aca5ab591da0c326cecaaa828f2c0978
+  data.tar.gz: 80435e020cd98216c0699db2559b4b75d63925d70f2d1f1e8c603b4a7539349d446e3ff3305c53d917cfcdd83f60f77f5ce4392f3967a11ed041bb9b75da5e48

data/lib/ffi/radix_tree.rb

@@ -15,7 +15,7 @@ module FFI
     begin
       # bias the library discovery to a path inside the gem first, then
       # to the usual system paths
-      gem_base = ::File.join(::File.dirname(__FILE__), '..', '..', '..')
+      gem_base = ::File.join(::File.dirname(__FILE__), '..', '..')
       inside_gem = ::File.join(gem_base, 'ext')
       local_path = ::FFI::Platform::IS_WINDOWS ? ENV['PATH'].split(';') : ENV['PATH'].split(':')
       env_path = [ ENV['RADIX_TREE_LIB_PATH'] ].compact
@@ -46,7 +46,7 @@ module FFI
            '/usr/local/lib', '/opt/local/lib', homebrew_path, '/usr/lib64'
           ]
         else
-          [::File.join(gem_base, "vendor/radixtree/build/src")]
+          [::File.join(gem_base, "vendor/radixtree")]
         end
 
       RADIX_TREE_LIB_PATHS = radixtree_lib_paths.
@@ -81,49 +81,49 @@ module FFI
     attach_function :longest_prefix_value, [:pointer, :string, :pointer], :pointer
     attach_function :match_free, [:pointer], :void
     attach_function :has_key, [:pointer, :string], :bool
-  end
 
-  class Tree
-    DESTROY_METHOD = ::RadixTree.method(:destroy)
-    FREE_METHOD = ::RadixTree.method(:match_free)
+    class Tree
+      DESTROY_METHOD = ::FFI::RadixTree.method(:destroy)
+      FREE_METHOD = ::FFI::RadixTree.method(:match_free)
 
-    def initialize
-      @ptr = ::FFI::AutoPointer.new(::FFI::RadixTree.create, DESTROY_METHOD)
-    end
+      def initialize
+        @ptr = ::FFI::AutoPointer.new(::FFI::RadixTree.create, DESTROY_METHOD)
+      end
 
-    def has_key?(key)
-      ::FFI::RadixTree.has_key(@ptr, key)
-    end
+      def has_key?(key)
+        ::FFI::RadixTree.has_key(@ptr, key)
+      end
 
-    def push(key, value)
-      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)
-    end
+      def push(key, value)
+        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)
+      end
 
-    def get(key)
-      byte_length = ::FFI::MemoryPointer.new(:int)
-      byte_pointer = ::FFI::AutoPointer.new(::FFI::RadixTree.fetch(@ptr, key, byte_length), FREE_METHOD)
-      bytesize = byte_length.read_int
-      return nil if bytesize <= 0
-      ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
-    end
+      def get(key)
+        byte_length = ::FFI::MemoryPointer.new(:int)
+        byte_pointer = ::FFI::AutoPointer.new(::FFI::RadixTree.fetch(@ptr, key, byte_length), FREE_METHOD)
+        bytesize = byte_length.read_int
+        return nil if bytesize <= 0
+        ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+      end
 
-    def longest_prefix(string)
-      value, p_out = ::FFI::RadixTree.longest_prefix(@ptr, string)
-      p_out = ::FFI::AutoPointer.new(p_out, FREE_METHOD) unless p_out.nil?
-      value.force_encoding("UTF-8") unless value.nil?
-      value
-    end
+      def longest_prefix(string)
+        value, p_out = ::FFI::RadixTree.longest_prefix(@ptr, string)
+        p_out = ::FFI::AutoPointer.new(p_out, FREE_METHOD) unless p_out.nil?
+        value.force_encoding("UTF-8") unless value.nil?
+        value
+      end
 
-    def longest_prefix_value(string)
-      byte_length = ::FFI::MemoryPointer.new(:int)
-      byte_pointer = ::FFI::AutoPointer.new(::FFI::RadixTree.longest_prefix_value(@ptr, string, byte_length), FREE_METHOD)
-      bytesize = byte_length.read_int
-      return nil if bytesize <= 0
-      ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+      def longest_prefix_value(string)
+        byte_length = ::FFI::MemoryPointer.new(:int)
+        byte_pointer = ::FFI::AutoPointer.new(::FFI::RadixTree.longest_prefix_value(@ptr, string, byte_length), FREE_METHOD)
+        bytesize = byte_length.read_int
+        return nil if bytesize <= 0
+        ::MessagePack.unpack(byte_pointer.get_bytes(0, bytesize))
+      end
     end
   end
 end

data/lib/ffi/radix_tree/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module RadixTree
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-radix_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brandon Dewitt