cloudmade 0.1.4 → 0.2.0

data/.travis.yml

@@ -0,0 +1 @@
+rvm: 1.9.2

data/README.md

@@ -1,4 +1,5 @@
 # CloudMade
+[![Build Status](https://secure.travis-ci.org/klaustopher/cloudmade.png?branch=master)](http://travis-ci.org/klaustopher/cloudmade)
 ---
 
 This is a ruby Gem to use the amazing API for [Cloudmade](http://www.cloudmade.com). They bring you cool services powered by [OpenStreetMaps](http://www.openstreetmaps.org). Check out their website.
@@ -10,7 +11,7 @@ In the future I will update this Gem to use the version v2 of the API. I just :h
 
 ## Usage
 Add the Gem to your Gemfile:
-  gem 'cloudmade', '0.1.2'
+  gem 'cloudmade', '0.1.4'
 
 Run the bundle command to update your Gemspec and you're ready to roll
 
@@ -40,7 +41,7 @@ At the end I will attach the original documentation. Have fun:
 
 CloudMadeAPI is a Ruby API for CloudMade's online services: Geocoding, Routing and Tiles.
 
-API documentation is available http://cloudmade.com/developers/docs/
+API documentation is available http://developers.cloudmade.com/projects/show/geocoding-http-api
 
 Install
 =======

data/Rakefile

@@ -3,6 +3,7 @@ require "bundler/gem_tasks"
 require 'rake'
 require 'rake/testtask'
 
+task :default => [:test_units]
 task :test => [:test_units]
 
 desc "Run unit tests"

data/lib/cloudmade/geocoding.rb

@@ -106,7 +106,11 @@ module CloudMade
     end
 
     def to_s
-      results.join(',') if results != nil
+      results.join(',') if results.any?
+    end
+    
+    def to_wkt
+      results.map { |result| result.to_wkt unless result.geometry.nil? }.compact
     end
   end
 
@@ -140,5 +144,9 @@ module CloudMade
     def to_s
       self.geometry.to_s
     end
+    
+    def to_wkt
+      self.geometry.to_wkt
+    end
   end
 end

data/lib/cloudmade/geometry.rb

@@ -28,6 +28,11 @@ module CloudMade
         when 'multipolygon' then return MultiPolygon.new(data['coordinates'])
         end
       end
+    
+    end
+    
+    def wkt_helper
+      raise 'Not implemented'
     end
   end
 
@@ -59,6 +64,14 @@ module CloudMade
     def to_latlon
       "#{@lat},#{@lon}"
     end
+    
+    def to_wkt
+      "POINT (#{wkt_helper})"
+    end
+        
+    def wkt_helper
+      "#{@lat} #{@lon}"
+    end
   end
 
   class Line < Geometry
@@ -71,6 +84,14 @@ module CloudMade
     def to_s
       "Line(#{@points.join(',')})"
     end
+    
+    def to_wkt
+      "LINESTRING #{wkt_helper}"
+    end
+    
+    def wkt_helper
+      "(#{@points.map{ |point| point.wkt_helper }.join(', ')})"
+    end
   end
 
 
@@ -84,6 +105,14 @@ module CloudMade
     def to_s
       "MultiLine(#{@lines.join(',')})"
     end
+    
+    def to_wkt
+      "MULTILINESTRING (#{wkt_helper})"
+    end
+        
+    def wkt_helper
+      @lines.map(&:wkt_helper).join(', ')
+    end
   end
 
   class Polygon < Geometry
@@ -98,6 +127,15 @@ module CloudMade
     def to_s
       "Polygon(#{@border_line} - (#{@holes.join(',')}))"
     end
+    
+    def to_wkt
+      "POLYGON (#{wkt_helper})"
+    end
+
+    def wkt_helper
+      holes = @holes.map(&:wkt_helper).join(', ') if @holes.any?
+      [@border_line.wkt_helper, holes].compact.join(', ')
+    end
   end
 
   class MultiPolygon < Geometry
@@ -110,6 +148,14 @@ module CloudMade
     def to_s
       "MultiPolygon(#{@polygons.join(',')})"
     end
+    
+    def to_wkt
+      "MULTIPOLYGON (#{wkt_helper})"
+    end
+    
+    def wkt_helper
+      @polygons.map { |polygon| "(#{polygon.wkt_helper})"}.join(', ')
+    end
   end
 
   class BBox < Geometry

data/lib/cloudmade/version.rb

@@ -1,3 +1,3 @@
 module Cloudmade
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/test/test_geometry.rb

@@ -29,6 +29,11 @@ class PointTest < Test::Unit::TestCase #:nodoc: all
     point = CloudMade::Point.new(1, 2)
     assert_equal point.to_latlon, '1,2'
   end
+  
+  def test_to_wkt
+    point = CloudMade::Point.new(1, 2)
+    assert_equal point.to_wkt, 'POINT (1 2)'
+  end
 end
 
 class LineTest < Test::Unit::TestCase #:nodoc: all
@@ -44,37 +49,63 @@ class LineTest < Test::Unit::TestCase #:nodoc: all
     line = CloudMade::Line.new([[1.1, 2.0], [0.1, 2.1], [0.5, 3.1], [3.1, 4.1]])
     assert_equal line.points.length, 4
   end
+  
+  def test_to_wkt
+    line = CloudMade::Line.new([[1.1, 2.0], [0.1, 2.1]])
+    assert_equal line.to_wkt, 'LINESTRING (1.1 2.0, 0.1 2.1)'
+  end
 end
 
 class MultiLineTest < Test::Unit::TestCase #:nodoc: all
-  def test_initialization
+  def multiline
     coords = [[[0.2, 35.2], [4.3, 45.1], [5.7, 11.2]], [[1.1, 33.2], [5.3, 22.2]]]
-    ml = CloudMade::MultiLine.new(coords)
-    assert_equal ml.lines.size, 2
-    assert_equal ml.lines[0].points.length, 3
-    assert_equal ml.lines[1].points.length, 2
-    assert_equal ml.lines[1].points[0].lon, 33.2
+    CloudMade::MultiLine.new(coords)
+  end
+  
+  def test_initialization
+    assert_equal multiline.lines.size, 2
+    assert_equal multiline.lines[0].points.length, 3
+    assert_equal multiline.lines[1].points.length, 2
+    assert_equal multiline.lines[1].points[0].lon, 33.2
+  end
+  
+  def test_to_wkt
+    assert_equal multiline.to_wkt, "MULTILINESTRING ((0.2 35.2, 4.3 45.1, 5.7 11.2), (1.1 33.2, 5.3 22.2))"
   end
 end
 
 class PolygonTest < Test::Unit::TestCase #:nodoc: all
-  def test_initialization
+  def polygon
     coords = [[[0.2, 35.2], [4.3, 45.1], [5.7, 11.2]], [[1.1, 33.2], [5.3, 22.2]]]
-    polygon = CloudMade::Polygon.new(coords)
+    CloudMade::Polygon.new(coords)    
+  end
+  
+  def test_initialization
     assert polygon.border_line != nil
     assert_equal polygon.border_line.points.size, 3
     assert polygon.holes != nil
     assert_equal polygon.holes.size, 1
   end
+  
+  def test_to_wkt
+    assert_equal polygon.to_wkt, 'POLYGON ((0.2 35.2, 4.3 45.1, 5.7 11.2), (1.1 33.2, 5.3 22.2))'
+  end
 end
 
 class MultiPolygonTest < Test::Unit::TestCase #:nodoc: all
-  def test_initialization
+  def multipolygon
     coords = [[[[0.2, 35.2], [4.3, 45.1]]], [[[1.1, 33.2], [5.3, 22.2]]]]
-    mp = CloudMade::MultiPolygon.new(coords)
-    assert_equal mp.polygons.size, 2
-    assert_equal mp.polygons[0].holes.size, 0
-    assert_equal mp.polygons[1].holes.size, 0
+    CloudMade::MultiPolygon.new(coords)
+  end
+  
+  def test_initialization
+    assert_equal multipolygon.polygons.size, 2
+    assert_equal multipolygon.polygons[0].holes.size, 0
+    assert_equal multipolygon.polygons[1].holes.size, 0
+  end
+  
+  def test_to_wkt
+    assert_equal multipolygon.to_wkt, 'MULTIPOLYGON (((0.2 35.2, 4.3 45.1)), ((1.1 33.2, 5.3 22.2)))'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudmade
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -55,6 +55,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -91,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2555345038746054796
+      hash: -613793366863801681
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2555345038746054796
+      hash: -613793366863801681
 requirements: []
 rubyforge_project: cloudmade
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: CloudMade Ruby API