simpler-tiles 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d396d185484dd11611fc94b0e31b0422433e646
-  data.tar.gz: 9a45900e7020a43f62f892bc4ef3cc4fb6e4ed79
+  metadata.gz: 2b61f77954101ab8a753016497e1add4289eda62
+  data.tar.gz: de284f7de5e1a8508003946f42d98e6df6a2ca8f
 SHA512:
-  metadata.gz: 9a64071153dfda144f420cedc2f5ae4ca03742cac59b34c4f91c39195ff5485e7e2e1fbcc42286a3b3d1c29b18c34bcf9a7c52ed37717f1e214c612902efb98d
-  data.tar.gz: 0438c79e24270dee7e046564d9b3b4281ce11be7cba7cf9d42bb897f4f565d15d03498c93f6d5af306c53d75d9e71b0de901c31bdacce6bed74f32d52a5e5d29
+  metadata.gz: e1cd8686e83a43ea74d0fd2de2167b99f646296fb63d15a932a389cff36c13c02fbfaa7cec581ed9747ebdd2f8620a0032fc27a9bcfef285e1ac02d61c2a52b8
+  data.tar.gz: 7dcdfec476b4ffbf3459c685f6b8afd9951491b7a13362268fe8abe1eed7eb935982c2582876dfd8e8b298b93683e287dea313a11a8e94e3a0dd753faf4e7abb

data/ext/simpler_tiles/layer.c

@@ -22,10 +22,7 @@ mark_layer(void *layer){
 static void
 layer_free(void *layer){
   simplet_layer_t *lyr = layer;
-  // test if we have been linked in ruby land
-  VALUE refs = (VALUE)simplet_layer_get_user_data(lyr);
-  // if not it is safe to free this layer.
-  if(!refs) simplet_layer_free(lyr);
+  simplet_layer_free(lyr);
 }
 
 
@@ -68,8 +65,9 @@ add_query(VALUE self, VALUE query){
   simplet_query_t *qry;
   Data_Get_Struct(query, simplet_query_t, qry);
   simplet_layer_add_query_directly(layer, qry);
-  VALUE circ_ref = rb_ary_new3(2, self, query);
+  VALUE circ_ref = self;
   simplet_query_set_user_data(qry, (void *)circ_ref);
+  simplet_retain((simplet_retainable_t*) qry);
   return query;
 }
 

data/ext/simpler_tiles/map.c

@@ -222,8 +222,9 @@ add_layer(VALUE self, VALUE layer){
   simplet_layer_t *lyr;
   Data_Get_Struct(layer, simplet_layer_t, lyr);
   simplet_map_add_layer_directly(map, lyr);
-  VALUE circ_ref = rb_ary_new3(2, self, layer);
+  VALUE circ_ref = self;
   simplet_layer_set_user_data(lyr, (void *)circ_ref);
+  simplet_retain((simplet_retainable_t*) lyr);
   return layer;
 }
 

data/ext/simpler_tiles/query.c

@@ -60,8 +60,9 @@ add_style(VALUE self, VALUE style){
   simplet_style_t *style_s;
   Data_Get_Struct(style, simplet_style_t, style_s);
   simplet_query_add_style_directly(query, style_s);
-  VALUE circ_ref = rb_ary_new3(2, self, style);
+  VALUE circ_ref = self;
   simplet_style_set_user_data(style_s, (void *)circ_ref);
+  simplet_retain((simplet_retainable_t*) style_s);
   return style;
 }
 

data/ext/simpler_tiles/style.c

@@ -21,10 +21,7 @@ mark_style(void *style){
 static void
 style_free(void *style){
   simplet_style_t *stl = style;
-  // test if we have been linked in ruby land
-  VALUE refs = (VALUE)simplet_style_get_user_data(stl);
-  // if not it is safe to free this style.
-  if(!refs) simplet_style_free(stl);
+  simplet_style_free(stl);
 }
 
 static VALUE

data/lib/simpler_tiles/version.rb

@@ -1,4 +1,4 @@
 module SimplerTiles
   # The version of the library
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/test_simpler_tiles.rb

@@ -23,4 +23,36 @@ class TestSimplerTiles < Test::Unit::TestCase
       assert data.length
     end
   end
+
+
+  should "not crash with memory errors" do
+    GC.disable
+    t = 100.times.map do
+      Thread.new do
+        map = SimplerTiles::Map.new do |m|
+          m.slippy 3, 6, 4
+          m.layer "#{File.dirname(__FILE__)}/../data/tl_2010_us_state10.shp" do |l|
+            l.query "SELECT * from 'tl_2010_us_state10'" do |q|
+              q.styles 'fill' => "#061F3799",
+                  'line-join' => "round",
+                   'line-cap' => "square",
+                   'seamless' => "true"
+            end
+          end
+        end
+
+        assert map.valid?
+        map.to_png do |data|
+          assert data
+          File.open "#{File.dirname(__FILE__)}/out.png", "wb" do |f|
+            f.write data
+          end
+          assert data.length
+        end
+      end
+    end
+    t.map(&:join)
+  end
+  GC.enable
+  GC.start
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpler-tiles
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeff Larson