tupalo-kdtree 0.2.2 → 0.2.3

data/ext/kdtree.c

@@ -78,7 +78,7 @@ static void kdtree_free(struct kdtree_data *kdtreep)
     }
 }
 
-static void read_all(struct rb_io_t *fptr, char *buf, int len)
+static void read_all(rb_io_t *fptr, char *buf, int len)
 {
     while (len > 0) {
         int n = rb_io_fread(buf, len, rb_io_stdio_file (fptr));
@@ -125,15 +125,14 @@ static VALUE kdtree_initialize(VALUE kdtree, VALUE arg)
         for (i = 0; i < RARRAY_LEN(points); ++i) {
             struct kdtree_node *n = kdtreep->nodes + i;
             
-            VALUE ptr = RARRAY_PTR(points)[i];
+            VALUE ptr = rb_ary_entry(points, i);
             VALUE v = rb_check_array_type(ptr);
             if (NIL_P(v) || RARRAY_LEN(v) != 3) {
                 continue;
             }
-            VALUE *a = RARRAY_PTR(ptr);
-            n->x = NUM2DBL(a[0]);
-            n->y = NUM2DBL(a[1]);        
-            n->id = NUM2INT(a[2]);
+            n->x = NUM2DBL(rb_ary_entry(v, 0));
+            n->y = NUM2DBL(rb_ary_entry(v, 1));
+            n->id = NUM2INT(rb_ary_entry(v, 2));
         }
 
         // now build the tree
@@ -144,7 +143,8 @@ static VALUE kdtree_initialize(VALUE kdtree, VALUE arg)
             rb_funcall2(io, rb_intern("binmode"), 0, 0);
         }
 
-        struct rb_io_t *fptr = RFILE(rb_io_taint_check(io))->fptr;
+        rb_io_t *fptr;
+        GetOpenFile(rb_io_taint_check(io), fptr);
         rb_io_check_readable(fptr);
 
         // check magic

data/test/test.rb

@@ -1,4 +1,4 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/../ext/kdtree.o"
+require "#{File.expand_path(File.dirname(__FILE__))}/../ext/kdtree.so"
 require "test/unit"
 require "tempfile"
 

metadata

@@ -1,66 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tupalo-kdtree
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Adam Doppelt
 - Andreas Fuchs
+- evanphx
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-23 00:00:00 +01:00
-default_executable: 
+date: 2010-11-23 00:00:00.000000000Z
 dependencies: []
-
 description: Tupalo-kdtree is a thread-safe fork of the kdtree Gem by Adam Doppelt.
 email: developers@tupalo.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-files: 
+files:
 - LICENSE
 - ext/extconf.rb
 - ext/kdtree.c
 - test/test.rb
-has_rdoc: true
 homepage: http://github.com/consti/tupalo-kdtree
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 2
 summary: Tupalo-kdtree is a thread-safe fork of the kdtree Gem by Adam Doppelt.
-test_files: 
+test_files:
 - test/test.rb