ruby_mapnik 0.1.2 → 0.1.3

data/Manifest.txt

@@ -91,8 +91,6 @@ ext/ruby_mapnik/_mapnik_font_engine.rb.cpp
 ext/ruby_mapnik/_mapnik_font_engine.rb.h
 ext/ruby_mapnik/_mapnik_geometry.rb.cpp
 ext/ruby_mapnik/_mapnik_geometry.rb.h
-ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.cpp
-ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.h
 ext/ruby_mapnik/_mapnik_layer.rb.cpp
 ext/ruby_mapnik/_mapnik_layer.rb.h
 ext/ruby_mapnik/_mapnik_line_pattern_symbolizer.rb.cpp
@@ -155,7 +153,6 @@ test/test_mapnik_expression.rb
 test/test_mapnik_feature.rb
 test/test_mapnik_font_engine.rb
 test/test_mapnik_geometry.rb
-test/test_mapnik_glyph_symbolizer.rb
 test/test_mapnik_layer.rb
 test/test_mapnik_line_symbolizer.rb
 test/test_mapnik_map.rb

data/README.rdoc

@@ -4,8 +4,9 @@ https://github.com/mapnik/Ruby-Mapnik
 
 == Requirements
 
-* Mapnik 2 (Currently available at http://svn.mapnik.org/trunk) 
-* Rice >=1.4.2
+* Rake
+* Mapnik 2.x (Currently available at https://github.com/mapnik/mapnik)
+* Rice >= 1.4.2
 * rcairo (https://github.com/rcairo/rcairo) (Optional)
 
 == Description
@@ -17,18 +18,28 @@ installed and Mapnik has been compiled with Cairo support.
 
 == Installation
 
+If you have checked out this local repository code build like:
+
+    rake
+
+The above command will compile the bindings and run the tests.
+
+File issues at https://github.com/mapnik/Ruby-Mapnik if you hit any compile errors.
+
+If you wish to install Ruby-Mapnik from the latest tagged release you can do:
+
   gem install ruby_mapnik
 
 Note: on osx the default rake compile will try to build universal, and your
-mapnik install is unlikely built universal. Check the architecture of libmapnik2.dylib like:
+mapnik install is unlikely built universal. Check the architecture of libmapnik.dylib like:
 
-    file /usr/local/lib/libmapnik2.dylib
+    file /usr/local/lib/libmapnik.dylib
 
 On a system where your compiler defaults to 64bit you'll see: 'Mach-O 64-bit dynamically linked shared library x86_64'
 
 So to avoid a linking warning like:
 
-    ld: warning: ignoring file /usr/local/lib/libmapnik2.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
+    ld: warning: ignoring file /usr/local/lib/libmapnik.dylib, file was built for unsupported file format which is not the architecture being linked (i386)
 
 You can pass this before rake compile:
 

data/ext/ruby_mapnik/_mapnik.cpp

@@ -47,7 +47,6 @@ void register_mapnik(){
   register_raster_colorizer(rb_mapnik);
   register_point_symbolizer(rb_mapnik);
   register_polygon_pattern_symbolizer(rb_mapnik);
-  register_glyph_symbolizer(rb_mapnik);
   register_line_pattern_symbolizer(rb_mapnik);
   register_markers_symbolizer(rb_mapnik);
   register_shield_symbolizer(rb_mapnik);

data/ext/ruby_mapnik/_mapnik.h

@@ -57,12 +57,10 @@ SOFTWARE.
 #include "_mapnik_raster_symbolizer.rb.h"
 #include "_mapnik_raster_colorizer.rb.h"
 #include "_mapnik_point_symbolizer.rb.h"
-#include "_mapnik_polygon_pattern_symbolizer.rb.h" 
-#include "_mapnik_glyph_symbolizer.rb.h" 
+#include "_mapnik_polygon_pattern_symbolizer.rb.h"
 #include "_mapnik_line_pattern_symbolizer.rb.h" 
 #include "_mapnik_markers_symbolizer.rb.h" 
-#include "_mapnik_shield_symbolizer.rb.h" 
- 
+#include "_mapnik_shield_symbolizer.rb.h"  
  
 void register_mapnik();
 

data/ext/ruby_mapnik/_mapnik_datasource.rb.cpp

@@ -51,6 +51,11 @@ namespace {
    Rice::Object operator()(const std::string & str) const {
      return to_ruby<std::string>(str);
    }
+
+   Rice::Object operator()(const mapnik::value_null & value) const {
+     return NULL;
+   }
+
   };
 
 

data/ext/ruby_mapnik/_mapnik_expression.rb.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 // Mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/expression_evaluator.hpp>

data/ext/ruby_mapnik/_mapnik_feature.rb.cpp

@@ -21,6 +21,8 @@ SOFTWARE.
  *****************************************************************************/
 #include "_mapnik_feature.rb.h"
 
+#include <boost/make_shared.hpp>
+
 // Rice
 #include <rice/Data_Type.hpp>
 #include <rice/Constructor.hpp>
@@ -30,17 +32,42 @@ SOFTWARE.
 #include <mapnik/wkt/wkt_factory.hpp>
 #include <mapnik/feature.hpp>
 
-void add_geometries_from_wkt(mapnik::Feature * self, std::string wkt){
-  bool result = mapnik::from_wkt(wkt, self->paths());
-  if (!result) throw std::runtime_error("Failed to parse WKT");
+namespace {
+
+  void add_geometries_from_wkt(mapnik::Feature * self, std::string wkt){
+    bool result = mapnik::from_wkt(wkt, self->paths());
+    if (!result) throw std::runtime_error("Failed to parse WKT");
+  }
+
+  class context_holder {
+  public:
+    mapnik::context_ptr ptr;  
+    context_holder(){
+      ptr = boost::make_shared<mapnik::context_type>();
+    }
+
+    int push(std::string const& str){
+      return ptr->push(str);
+    }
+  };
+
+}
+template<>
+mapnik::context_ptr from_ruby<mapnik::context_ptr>(Rice::Object ruby_obj){
+  context_holder ctx = from_ruby<context_holder>(ruby_obj);
+  return ctx.ptr;
 }
 
 void register_feature(Rice::Module rb_mapnik){
+  Rice::Data_Type< context_holder > rb_ccontext = Rice::define_class_under< context_holder >(rb_mapnik, "Context");
+  rb_ccontext.define_constructor(Rice::Constructor< context_holder >());
+  rb_ccontext.define_method("push", &context_holder::push);
+
   /*
     @@Module_var rb_mapnik = Mapnik
   */
   Rice::Data_Type< mapnik::Feature > rb_cfeature = Rice::define_class_under< mapnik::Feature >(rb_mapnik, "Feature");
-  rb_cfeature.define_constructor(Rice::Constructor< mapnik::Feature,int >());
+  rb_cfeature.define_constructor(Rice::Constructor< mapnik::Feature,mapnik::context_ptr,int >());
   rb_cfeature.define_method("id", &mapnik::Feature::id);
   rb_cfeature.define_method("to_s", &mapnik::Feature::to_string);
   rb_cfeature.define_method("number_of_geometries", &mapnik::Feature::num_geometries);

data/ext/ruby_mapnik/_mapnik_geometry.rb.cpp

@@ -71,14 +71,10 @@ void register_geometry(Rice::Module rb_mapnik){
   geometry_enum.define_value("Point",mapnik::Point);
   geometry_enum.define_value("LineString",mapnik::LineString);
   geometry_enum.define_value("Polygon",mapnik::Polygon);
-  geometry_enum.define_value("MultiPoint",mapnik::MultiPoint);
-  geometry_enum.define_value("MultiLineString",mapnik::MultiLineString);
-  geometry_enum.define_value("MultiPolygon",mapnik::MultiPolygon);
   
   Rice::Data_Type< mapnik::geometry_type > rb_cgeometry2d = Rice::define_class_under< mapnik::geometry_type >(rb_mapnik, "Geometry2d");
   rb_cgeometry2d.define_method("envelope", &mapnik::geometry_type::envelope);
   rb_cgeometry2d.define_method("type", &mapnik::geometry_type::type);
-  rb_cgeometry2d.define_method("area", &mapnik::geometry_type::area);
 
   Rice::Data_Type< path_type > rb_cpath = Rice::define_class_under< path_type >(rb_mapnik, "Path");
   rb_cpath.define_singleton_method("from_wkt", &from_wkt_impl, Rice::Arg("wkt"));

data/ext/ruby_mapnik/_mapnik_layer.rb.cpp

@@ -90,36 +90,7 @@ void register_layer(Rice::Module rb_mapnik){
   * @return [nil]
   */
   rb_clayer.define_method("name=", &mapnik::layer::set_name, Rice::Arg("new_name"));
-  
-  /*
-  * Document-method: title
-  * @return [String] The layer's title
-  */
-  rb_clayer.define_method("title", &mapnik::layer::title);
-  
-  /*
-  * Document-method: title=
-  * call-seq:
-  *   title=(new_name)
-  * @param [String]
-  * @return [nil]
-  */
-  rb_clayer.define_method("title=", &mapnik::layer::set_title, Rice::Arg("new_title"));
-  
-  /*
-  * Document-method: abstract
-  * @return [String] the layer's abstract
-  */
-  rb_clayer.define_method("abstract", &mapnik::layer::abstract);
-  
-  /*
-  * Document-method: abstract=
-  * call-seq:
-  *   abstract=(new_abstract)
-  * @param [String]
-  */
-  rb_clayer.define_method("abstract=", &mapnik::layer::set_abstract, Rice::Arg("new_abstract"));
-  
+    
   /*
   * Document-method: srs
   * @return [String] the layer's srs

data/ext/ruby_mapnik/_mapnik_rule.rb.cpp

@@ -41,37 +41,7 @@ void register_rule(Rice::Module rb_mapnik){
   * @return [nil]
   */
   rb_crule.define_method("name=", &mapnik::rule::set_name, Rice::Arg("new_name"));
-  
-  /*
-  * Document-method: title
-  * @return [String]
-  */
-  rb_crule.define_method("title", &mapnik::rule::get_title);
-  
-  /*
-  * Document-method: title=
-  * call-seq:
-  *   title=(new_title)
-  * @param [String]
-  * @return [nil]
-  */
-  rb_crule.define_method("title=", &mapnik::rule::set_title, Rice::Arg("new_title"));
-  
-  /*
-  * Document-method: abstract
-  * @return [String]
-  */
-  rb_crule.define_method("abstract", &mapnik::rule::get_abstract);
-  
-  /*
-  * Document-method: abstract=
-  * call-seq:
-  *   abstract=(new_abstract)
-  * @param [String]
-  * @return [nil]
-  */
-  rb_crule.define_method("abstract=", &mapnik::rule::set_abstract, Rice::Arg("new_abstract"));
-  
+    
   /*
   * Document-method: filter
   * @return [Mapnik::Expression]

data/ext/ruby_mapnik/_mapnik_shield_symbolizer.rb.cpp

@@ -36,8 +36,8 @@ namespace{
   Rice::Object get_shield_displacement(const mapnik::shield_symbolizer& t){
     mapnik::position pos = t.get_shield_displacement();
     Rice::Array out;
-    out.push(boost::get<0>(pos));
-    out.push(boost::get<1>(pos));
+    out.push(pos.first);
+    out.push(pos.second);
     return out;
   }
 

data/ext/ruby_mapnik/_mapnik_symbolizer.rb.cpp

@@ -42,8 +42,6 @@ namespace {
       out = mapnik::symbolizer(from_ruby<mapnik::line_symbolizer>(obj));
     } else if(class_name == "Mapnik::TextSymbolizer"){
       out = mapnik::symbolizer(from_ruby<mapnik::text_symbolizer>(obj));
-    } else if(class_name == "Mapnik::GlyphSymbolizer"){
-      out = mapnik::symbolizer(from_ruby<mapnik::glyph_symbolizer>(obj));
     } else if(class_name == "Mapnik::LinePatternSymbolizer"){
       out = mapnik::symbolizer(from_ruby<mapnik::line_pattern_symbolizer>(obj));
     } else if(class_name == "Mapnik::MarkersSymbolizer"){

data/ext/ruby_mapnik/_mapnik_text_symbolizer.rb.cpp

@@ -28,31 +28,16 @@ SOFTWARE.
 #include <rice/Enum.hpp>
 
 // Mapnik
-#include <mapnik/text_placements.hpp>  
+//#include <mapnik/text_placements.hpp>  
 #include <mapnik/text_symbolizer.hpp>
 
 namespace {
 
-  Rice::Object get_anchor(const mapnik::text_symbolizer& t){
-    mapnik::position pos = t.get_anchor();
-    Rice::Array out;
-    out.push(boost::get<0>(pos));
-    out.push(boost::get<1>(pos));
-    return out;
-  }
-
-  void set_anchor(mapnik::text_symbolizer & t, Rice::Array ary) {
-    double x = from_ruby<double>(ary[0]);
-    double y = from_ruby<double>(ary[1]);
-    
-    t.set_anchor(x, y);
-  }
-
   Rice::Object get_text_displacement(const mapnik::text_symbolizer& t){
     mapnik::position pos = t.get_displacement();
     Rice::Array out;
-    out.push(boost::get<0>(pos));
-    out.push(boost::get<1>(pos));
+    out.push(pos.first);
+    out.push(pos.second);
     return out;
   }
 
@@ -155,20 +140,6 @@ void register_text_symbolizer(Rice::Module rb_mapnik){
   */
   rb_ctext_symbolizer.define_constructor(Rice::Constructor< mapnik::text_symbolizer, mapnik::expression_ptr, std::string, int, mapnik::color >());
   
-  /*
-  * Document-method: anchor
-  * @return [Array] Two element array [x,y]
-  */
-  rb_ctext_symbolizer.define_method("anchor", &get_anchor);
-  
-  /*
-  * Document-method: anchor=
-  * call-seq:
-  *   anchor=(new_anchor)
-  * @param [Array] new_anchor Two element array [x,y]
-  */
-  rb_ctext_symbolizer.define_method("anchor=", &set_anchor);
-
   /*
   * Document-method: allow_overlap?
   * @return [Boolean]
@@ -406,12 +377,6 @@ void register_text_symbolizer(Rice::Module rb_mapnik){
   */ 
   rb_ctext_symbolizer.define_method("minimum_padding=", &mapnik::text_symbolizer::set_minimum_padding);
   
-  /* 
-  * Document-method: name
-  * @return [Mapnik::Expression]
-  */
-  rb_ctext_symbolizer.define_method("name", &mapnik::text_symbolizer::get_name);
-  
   /* 
   * Document-method: name=
   * call-seq:

data/ext/ruby_mapnik/extconf.rb

@@ -32,16 +32,16 @@ end
 
 # Check for mapnik-config
 if %x{which mapnik-config}.length == 0
-  abort("\n***\n mapnik-config is missing!\n Is mapnik2 installed?\n Is mapnik-config in your $PATH?\n***\n\n")
+  abort("\n***\n mapnik-config is missing!\n Is mapnik 2.x installed?\n Is mapnik-config in your $PATH?\n***\n\n")
 end
 
 LIBDIR = Config::CONFIG['libdir']
 INCLUDEDIR = Config::CONFIG['includedir'] 
 
-$LDFLAGS += " -lmapnik2 "
+$LDFLAGS += " " + %x{mapnik-config --libs}.chomp + " "
 
 # force whitespace padding to avoid: https://github.com/mapnik/Ruby-Mapnik/issues/7
-$CFLAGS += " " + %x{mapnik-config --cflags} + " "
+$CFLAGS += " " + %x{mapnik-config --cflags}.chomp + " "
 
 #------------------------------------------------------------------------------#
 # Ruby-Mapnik configuration
@@ -64,6 +64,9 @@ File.open(mapnik_config_file_path, 'w+') do |file|
   file.write(ruby_mapnik_config)
 end
 
+if ENV['CXX']
+    $CXX = ENV['CXX']
+end
 
 if RUBY_PLATFORM =~ /darwin/
     # In order to link the shared library into our bundle with GCC 4.x on OSX, we have to work around a bug:

data/lib/ruby_mapnik.rb

@@ -37,7 +37,7 @@ require "#{path}/ruby_mapnik/mapnik/tile"
 
 
 module Mapnik
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   
   FontEngine.register_fonts(FONT_PATH)
   DatasourceCache.register(INPUT_PLUGIN_PATH)

data/test/test_mapnik_feature.rb

@@ -1,30 +1,26 @@
 require "test_helper"
 
 class TestMapnikFeature < Test::Unit::TestCase
-  
-  def test_presence
-    assert Mapnik::Feature
-  end
-  
+
   def test_should_instantiate
     feature_id = 12
-    assert feature = Mapnik::Feature.new(feature_id)
+    assert feature = Mapnik::Feature.new(Mapnik::Context.new, feature_id)
     assert_equal feature_id, feature.id
-    assert_equal "feature (  id:#{feature_id})", feature.to_s.gsub("\n", '')
+    assert_equal "Feature ( id=#{feature_id})", feature.to_s.gsub("\n", '')
   end
   
   def test_should_return_number_of_geometries
-    assert feature = Mapnik::Feature.new(1)
+    assert feature = Mapnik::Feature.new(Mapnik::Context.new, 1)
     assert_equal 0, feature.number_of_geometries
   end
   
   def test_should_return_its_envelope
-    assert feature = Mapnik::Feature.new(1)
+    assert feature = Mapnik::Feature.new(Mapnik::Context.new, 1)
     assert feature.envelope.kind_of?(Mapnik::Envelope)
   end
   
   def test_should_add_a_geometry
-    feature = Mapnik::Feature.new(1)
+    feature = Mapnik::Feature.new(Mapnik::Context.new, 1)
     assert_equal(0, feature.number_of_geometries)
     feature.add_geometries_from_wkt("POINT(30 10)")
     assert_equal(1, feature.number_of_geometries)

data/test/test_mapnik_geometry.rb

@@ -10,8 +10,6 @@ class TestMapnikGeometry < Test::Unit::TestCase
     assert Mapnik::GeometryType::Point
     assert Mapnik::GeometryType::LineString
     assert Mapnik::GeometryType::Polygon
-    assert Mapnik::GeometryType::MultiPoint
-    assert Mapnik::GeometryType::MultiLineString
   end
   
   def test_should_make_point_from_wkt

data/test/test_mapnik_layer.rb

@@ -29,22 +29,6 @@ class TestMapnikLayer < Test::Unit::TestCase
     assert_equal new_name, layer.name
   end
   
-  def test_should_get_and_set_title
-    layer = build_layer
-    title_before = layer.title
-    new_title = title_before + "BUT DIFFERENT"
-    layer.title = new_title
-    assert_equal new_title, layer.title
-  end
-  
-  def test_should_get_and_set_abstract
-    layer = build_layer
-    abstract_before = layer.abstract
-    new_abstract = abstract_before + "BUT DIFFERENT"
-    layer.abstract = new_abstract
-    assert_equal new_abstract, layer.abstract
-  end
-  
   def test_should_get_and_set_srs
     layer = build_layer
     srs_before = layer.srs

data/test/test_mapnik_rule.rb

@@ -18,25 +18,7 @@ class TestMapnikRule < Test::Unit::TestCase
     rule.name = new_name
     assert_equal new_name, rule.name
   end
-  
-  def test_should_get_and_set_title
-    rule = Mapnik::Rule.new
-    assert_equal("", rule.title)
-    
-    new_title = "New title"
-    rule.title = new_title
-    assert_equal new_title, rule.title
-  end
-  
-  def test_should_get_and_set_abstract
-    rule = Mapnik::Rule.new
-    assert_equal("", rule.abstract)
     
-    new_abstract = "New abstract"
-    rule.abstract = new_abstract
-    assert_equal new_abstract, rule.abstract
-  end
-  
   def test_should_get_and_set_filter
     rule = Mapnik::Rule.new
     expression_string = "([place]='town')"

data/test/test_mapnik_shield_symbolizer.rb

@@ -13,13 +13,6 @@ class TestMapnikShieldSymbolizer < Test::Unit::TestCase
   def test_should_instantiate
     assert @sym
   end
-
-  def test_should_get_and_set_anchor
-    assert @sym.anchor
-    new_vals = [1,2]
-    @sym.anchor = new_vals
-    assert_equal new_vals, @sym.anchor
-  end
   
   def test_should_get_and_set_allow_overlap
     @sym.allow_overlap = true
@@ -142,15 +135,6 @@ class TestMapnikShieldSymbolizer < Test::Unit::TestCase
     assert_equal 1, @sym.minimum_padding
   end
   
-  def test_should_get_and_set_name
-    assert @sym.name.instance_of?(Mapnik::Expression)
-    new_expression_string = "([place]='towns')"
-    assert_not_equal new_expression_string, @sym.name.to_s
-    new_expression = Mapnik::Expression.parse(new_expression_string)
-    @sym.name = new_expression
-    assert_equal new_expression_string, @sym.name.to_s
-  end
-  
   def test_should_get_and_set_opactiy
     assert_equal 1, @sym.opacity
     @sym.opacity = 0
@@ -163,18 +147,6 @@ class TestMapnikShieldSymbolizer < Test::Unit::TestCase
     assert_equal 3, @sym.ratio
   end
   
-  def test_should_get_and_set_text_size
-    assert_equal 12, @sym.size
-    @sym.size = 0
-    assert_equal 0, @sym.size
-  end
-  
-  def test_should_get_and_set_wrap_width
-    assert_equal 0, @sym.wrap_width
-    @sym.wrap_width = 30
-    assert_equal 30, @sym.wrap_width
-  end
-  
   def test_should_get_and_set_wrap_character
     @sym.wrap_character = '|'
     assert_equal '|', @sym.wrap_character
@@ -182,8 +154,6 @@ class TestMapnikShieldSymbolizer < Test::Unit::TestCase
     assert_equal '%', @sym.wrap_character
   end
   
-  
-  
   def test_should_get_and_set_wrap_before
     assert !@sym.wrap_before
     @sym.wrap_before = true

data/test/test_mapnik_text_symbolizer.rb

@@ -36,13 +36,6 @@ class TestMapnikTextSymbolizer < Test::Unit::TestCase
     assert Mapnik::TEXT_TRANSFORM::CAPITALIZE
   end
   
-  def test_should_get_and_set_anchor
-    assert @symbolizer.anchor
-    new_vals = [1,2]
-    @symbolizer.anchor = new_vals
-    assert_equal new_vals, @symbolizer.anchor
-  end
-  
   def test_should_get_and_set_allow_overlap
     @symbolizer.allow_overlap = true
     assert @symbolizer.allow_overlap?
@@ -145,7 +138,6 @@ class TestMapnikTextSymbolizer < Test::Unit::TestCase
     assert_equal 1, @symbolizer.line_spacing
   end
   
-  # TODO: failure here!
   def test_should_get_and_set_max_char_angle_delta
     @symbolizer.max_char_angle_delta = 0.5
     assert_equal 0.5, @symbolizer.max_char_angle_delta
@@ -165,15 +157,6 @@ class TestMapnikTextSymbolizer < Test::Unit::TestCase
     assert_equal 1, @symbolizer.minimum_padding
   end
   
-  def test_should_get_and_set_name
-    assert @symbolizer.name.instance_of?(Mapnik::Expression)
-    new_expression_string = "([place]='towns')"
-    assert_not_equal new_expression_string, @symbolizer.name.to_s
-    new_expression = Mapnik::Expression.parse(new_expression_string)
-    @symbolizer.name = new_expression
-    assert_equal new_expression_string, @symbolizer.name.to_s
-  end
-  
   def test_should_get_and_set_opactiy
     assert_equal 1, @symbolizer.opacity
     @symbolizer.opacity = 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_mapnik
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Elliot Laster
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 -04:00
-default_executable: 
+date: 2012-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rice
@@ -49,20 +48,35 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
+  type: :development
+  version_requirements: *id004
 description: |-
   A set of bindings between Ruby and Mapnik. Supports many of the common uses for 
   Mapnik, and one day, might support all of them. Rendering is available using
@@ -172,8 +186,6 @@ files:
 - ext/ruby_mapnik/_mapnik_font_engine.rb.h
 - ext/ruby_mapnik/_mapnik_geometry.rb.cpp
 - ext/ruby_mapnik/_mapnik_geometry.rb.h
-- ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.cpp
-- ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.h
 - ext/ruby_mapnik/_mapnik_layer.rb.cpp
 - ext/ruby_mapnik/_mapnik_layer.rb.h
 - ext/ruby_mapnik/_mapnik_line_pattern_symbolizer.rb.cpp
@@ -236,7 +248,6 @@ files:
 - test/test_mapnik_feature.rb
 - test/test_mapnik_font_engine.rb
 - test/test_mapnik_geometry.rb
-- test/test_mapnik_glyph_symbolizer.rb
 - test/test_mapnik_layer.rb
 - test/test_mapnik_line_symbolizer.rb
 - test/test_mapnik_map.rb
@@ -257,7 +268,6 @@ files:
 - yard/lib/yard/parser/generic_parser.rb
 - yard/lib/yard_generic.rb
 - .gemtest
-has_rdoc: true
 homepage: https://github.com/mapnik/Ruby-Mapnik
 licenses: []
 
@@ -288,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby_mapnik
-rubygems_version: 1.4.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A set of bindings between Ruby and Mapnik
@@ -303,7 +313,6 @@ test_files:
 - test/test_mapnik_feature.rb
 - test/test_mapnik_font_engine.rb
 - test/test_mapnik_geometry.rb
-- test/test_mapnik_glyph_symbolizer.rb
 - test/test_mapnik_layer.rb
 - test/test_mapnik_line_symbolizer.rb
 - test/test_mapnik_map.rb

data/ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.cpp

@@ -1,250 +0,0 @@
-/*****************************************************************************
-Copyright (C) 2011 Elliot Laster
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the ‘Software’), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
- *****************************************************************************/
-#include "_mapnik_glyph_symbolizer.rb.h"
-
-// Rice
-#include <rice/Data_Type.hpp>
-#include <rice/Constructor.hpp>
-#include <rice/Class.hpp>
-#include <rice/Enum.hpp>
-  
-// Mapnik
-#include <mapnik/glyph_symbolizer.hpp>
-
-namespace {
-  Rice::Object get_displacement(const mapnik::glyph_symbolizer& t){
-    mapnik::position pos = t.get_displacement();
-    Rice::Array out;
-    out.push(boost::get<0>(pos));
-    out.push(boost::get<1>(pos));
-    return out;
-  }
-
-  void set_displacement(mapnik::glyph_symbolizer & t, Rice::Array ary){
-    double x = from_ruby<double>(ary[0]);
-    double y = from_ruby<double>(ary[1]);
-    
-    t.set_displacement(x,y);
-  }
-
-  mapnik::angle_mode_enum get_angle_mode(mapnik::glyph_symbolizer const & self){
-    return self.get_angle_mode();
-  }
-
-  void set_angle_mode(mapnik::glyph_symbolizer & self, mapnik::angle_mode_enum val){
-    self.set_angle_mode(val);
-  }
-}
-
-void register_glyph_symbolizer(Rice::Module rb_mapnik){
-  /*
-    @@Module_var rb_mapnik = Mapnik
-  */
-  Rice::Enum<mapnik::angle_mode_enum> angle_enum = Rice::define_enum<mapnik::angle_mode_enum>("AngleMode", rb_mapnik);
-  angle_enum.define_value("AZIMUTH", mapnik::AZIMUTH);
-  angle_enum.define_value("TRIGONOMETRIC", mapnik::TRIGONOMETRIC);
-  
-
-  Rice::Data_Type< mapnik::glyph_symbolizer > rb_cglyph_symbolizer = Rice::define_class_under< mapnik::glyph_symbolizer >(rb_mapnik, "GlyphSymbolizer");
-  
-  /*
-  * Document-method: new
-  * call-seq:
-  *   new(font_name, expression)
-  * 
-  * @param [String] font_name Name of a font registered with the FontEngine
-  * @param [Mapnik::Expression] expression The value expression
-  *
-  * Returns a new Mapnik::GlyphSymbolizer
-  */
-  rb_cglyph_symbolizer.define_constructor(Rice::Constructor< mapnik::glyph_symbolizer, std::string, mapnik::expression_ptr >());
-  
-  /*
-  * Document-method: face_name
-  * @return [String] the font face name
-  */
-  rb_cglyph_symbolizer.define_method("face_name", &mapnik::glyph_symbolizer::get_face_name);
-  
-   /*
-  * Document-method: face_name=
-  * call-seq:
-  *   face_name=(new_face_name)
-  * @param [String] The new font face name
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("face_name=", &mapnik::glyph_symbolizer::set_face_name);
-  
-   /*
-  * Document-method: char
-  * @return [String]
-  */
-  rb_cglyph_symbolizer.define_method("char", &mapnik::glyph_symbolizer::get_char);
-  
-  /*
-  * Document-method: char=
-  * call-seq:
-  *   char=(new_char)
-  * @param [String]
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("char=", &mapnik::glyph_symbolizer::set_char);
-  
-   /*
-  * Document-method: allow_overlap?
-  * @return [Boolean] Whether or not glyphs should overlap
-  */
-  rb_cglyph_symbolizer.define_method("allow_overlap?", &mapnik::glyph_symbolizer::get_allow_overlap);
-  
-  /*
-  * Document-method: allow_overlap=
-  * call-seq:
-  *  allow_overlap=(new_overlap_value)
-  * @param [Boolean] 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("allow_overlap=", &mapnik::glyph_symbolizer::set_allow_overlap);
-
-  /*
-  * Document-method: displacement?
-  * @return [Array] Two element array of the x-y displacement
-  */
-  rb_cglyph_symbolizer.define_method("displacement", &get_displacement);
-  
-  /*
-  * Document-method: displacement=
-  * call-seq:
-  *  displacement=(new_displacement_values)
-  * @param [Array] array in the format [x,y] 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("displacement=", &set_displacement);
-
-  /*
-  * Document-method: avoid_edges?
-  * @return [Boolean] Whether or not glyphs should avoid edges
-  */
-  rb_cglyph_symbolizer.define_method("avoid_edges?", &mapnik::glyph_symbolizer::get_avoid_edges);
-  
-  /*
-  * Document-method: avoid_edges=
-  * call-seq:
-  *  avoid_edges=(new_value)
-  * @param [Boolean] 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("avoid_edges=", &mapnik::glyph_symbolizer::set_avoid_edges);
-  
-  /*
-  * Document-method: halo_fill
-  * @return [Mapnik::Color] Color of the halo around the text
-  */
-  rb_cglyph_symbolizer.define_method("halo_fill", &mapnik::glyph_symbolizer::get_halo_fill);
-  
-  /*
-  * Document-method: halo_fill=
-  * call-seq:
-  *  halo_fill=(color)
-  * @param [Mapnik::Color] The color of the halo around the text. 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("halo_fill=", &mapnik::glyph_symbolizer::set_halo_fill);
-
-  /*
-  * Document-method: halo_radius
-  * @return [Integer] Thickness of the text halo
-  */
-  rb_cglyph_symbolizer.define_method("halo_radius", &mapnik::glyph_symbolizer::get_halo_radius);
-  
-  /*
-  * Document-method: halo_radius=
-  * call-seq:
-  *  halo_fill=(color)
-  * @param [Integer] The thickness of the text halo 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("halo_radius=", &mapnik::glyph_symbolizer::set_halo_radius);
-  
-  /*
-  * Document-method: size
-  * @return [Mapnik::Expression] Font size of the glyph
-  */
-  rb_cglyph_symbolizer.define_method("size", &mapnik::glyph_symbolizer::get_size);
-  
-  /*
-  * Document-method: size=
-  * call-seq:
-  *  size=(size_expression)
-  * @param [Mapnik::Expression] The new size expression
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("size=", &mapnik::glyph_symbolizer::set_size);
-  
-  /*
-  * Document-method: angle
-  * @return [Mapnik::Expression]
-  */
-  rb_cglyph_symbolizer.define_method("angle", &mapnik::glyph_symbolizer::get_angle);
-  
-  /*
-  * Document-method: angle=
-  * call-seq:
-  *  angle=(angle_expression)
-  * @param [Mapnik::Expression]
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("angle=", &mapnik::glyph_symbolizer::set_angle);
-  
-   /*
-  * Document-method: value
-  * @return [Mapnik::Expression]
-  */
-  rb_cglyph_symbolizer.define_method("value", &mapnik::glyph_symbolizer::get_value);
-  
-  /*
-  * Document-method: value=
-  * call-seq:
-  *  value=(value_expression)
-  * @param [Mapnik::Expression]
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("value=", &mapnik::glyph_symbolizer::set_value);
-  
-
-  rb_cglyph_symbolizer.define_method("angle_mode", &get_angle_mode);
-  rb_cglyph_symbolizer.define_method("angle_mode=", &set_angle_mode);
-  
- /*
-  * Document-method: color
-  * @return [Mapnik::Color] Color of the text
-  */
-  rb_cglyph_symbolizer.define_method("color", &mapnik::glyph_symbolizer::get_color);
-  
-  /*
-  * Document-method: color=
-  * call-seq:
-  *  color=(color)
-  * @param [Mapnik::Color] The color of the text. 
-  * @return [nil]
-  */
-  rb_cglyph_symbolizer.define_method("color=", &mapnik::glyph_symbolizer::set_color);
-
-}

data/ext/ruby_mapnik/_mapnik_glyph_symbolizer.rb.h

@@ -1,32 +0,0 @@
-/*****************************************************************************
-Copyright (C) 2011 Elliot Laster
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the ‘Software’), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
- *****************************************************************************/
-#ifndef PIKA2_MAPNIK_GLYPH_SYMBOLIZER
-#define PIKA2_MAPNIK_GLYPH_SYMBOLIZER
-
-namespace Rice
-{
- class Module; 
-}
-
-void register_glyph_symbolizer(Rice::Module rb_mapnik);
-
-#endif

data/test/test_mapnik_glyph_symbolizer.rb

@@ -1,96 +0,0 @@
-require "test_helper"
-
-class TestMapnikGlyphSymbolizer < Test::Unit::TestCase
-  
-  def setup 
-    expression = Mapnik::Expression.parse("[g]")
-    @sym = Mapnik::GlyphSymbolizer.new("DejaVu Sans Book",expression)
-  end
-  
-  def test_presence
-    assert Mapnik::GlyphSymbolizer
-    assert Mapnik::AngleMode::AZIMUTH
-    assert Mapnik::AngleMode::TRIGONOMETRIC
-  end
-  
-  def test_should_get_and_set_face_name
-    assert_equal 'DejaVu Sans Book', @sym.face_name
-    new_face_name = 'DejaVu Sans'
-    @sym.face_name = new_face_name
-    assert_equal new_face_name, @sym.face_name
-  end
-  
-  def test_should_get_and_set_char
-    assert @sym.char.instance_of?(Mapnik::Expression)
-    @sym.char = Mapnik::Expression.parse("[t]")
-  end
-  
-  def test_should_get_and_set_allow_overlap
-    @sym.allow_overlap = true
-    assert @sym.allow_overlap?
-    @sym.allow_overlap = false
-    assert !@sym.allow_overlap?
-  end
-  
-  def test_should_get_and_set_avoid_edges
-    @sym.avoid_edges = true
-    assert @sym.avoid_edges?
-    @sym.avoid_edges = false
-    assert !@sym.avoid_edges?
-  end
-  
-  def test_should_get_and_set_displacement
-    assert @sym.displacement
-    new_vals = [1,2]
-    @sym.displacement = new_vals
-    assert_equal new_vals, @sym.displacement
-  end
-  
-  def test_should_get_and_set_halo_fill
-    assert @sym.halo_fill.instance_of?(Mapnik::Color)
-    white = Mapnik::Color.new("#fff")
-    @sym.halo_fill = white
-    assert_equal white, @sym.halo_fill
-  end
-  
-  def test_should_get_and_set_halo_radius
-    assert_equal 0, @sym.halo_radius
-    @sym.halo_radius = 1
-    assert_equal 1, @sym.halo_radius
-  end
-  
-  def test_should_get_and_set_size
-    @sym.size = Mapnik::Expression.parse("[12]")
-    assert @sym.size.instance_of?(Mapnik::Expression)
-  end
-  
-  def test_should_get_and_set_angle
-    @sym.angle = Mapnik::Expression.parse("[90]")
-    assert @sym.angle.instance_of?(Mapnik::Expression)
-  end
-  
-  def test_should_get_and_set_angle_mode
-    @sym.angle_mode = Mapnik::AngleMode::AZIMUTH
-    assert_equal Mapnik::AngleMode::AZIMUTH, @sym.angle_mode
-    @sym.angle_mode = Mapnik::AngleMode::TRIGONOMETRIC
-    assert_equal Mapnik::AngleMode::TRIGONOMETRIC, @sym.angle_mode
-  end
-  
-  def test_should_get_and_set_value
-    @sym.value = Mapnik::Expression.parse("[town]")
-    assert @sym.value.instance_of?(Mapnik::Expression)
-  end
-  
-  # FIXME: Need Expression equality?
-  def test_should_get_and_set_color
-     @sym.color = Mapnik::Expression.parse("[90, 90, 90]")
-     assert @sym.angle.instance_of?(Mapnik::Expression)
-  end
-  
-  # TODO: Colorizer support
-  # def test_should_get_and_set_colorizer
-  #   colorizer = Mapnik::RasterColorizer.new
-  #   @sym.colorizer = colorizer
-  # end
-  
-end