carto_json 0.0.6 → 0.0.7

data/lib/carto_json/circle.rb

@@ -5,9 +5,10 @@ module CartoJson
     attr_accessor :radius
 
     def radius=(r)
+      r = r.to_f
+      # raise InvalidRadiusError, 'radius must be a number'   unless (r.is_a?(Integer) || r.is_a?(Float))
       raise InvalidRadiusError, 'radius cannot be negative' if r < 0
       raise InvalidRadiusError, 'radius cannot be blank'    if r.nil?
-      raise InvalidRadiusError, 'radius must be a number'   unless (r.is_a?(Integer) || r.is_a?(Float))
       raise InvalidRadiusError, 'radius cannot be zero'     if r == 0
       @radius = r
     end
@@ -22,11 +23,9 @@ module CartoJson
 
     def to_hash
       {:type    => self.class.type,
-       :center  => {
-         LAT   => send(LAT),
-         LNG   => send(LNG)
-        },
-        :radius => radius
+       LAT   => send(LAT),
+       LNG   => send(LNG),
+      :radius => radius
       }
     end
   end

data/lib/carto_json/errors.rb

@@ -4,5 +4,13 @@ module CartoJson
   class InputError                < Error; end
   class InsufficientPointsError   < Error; end
   class InvalidRadiusError        < Error; end
-  class InvalidTypeError          < Error; end
+
+  class InvalidTypeError          < Error
+    attr_reader :type
+
+    def initialize(type, message)
+      @type = type.to_sym
+      super message
+    end
+  end
 end

data/lib/carto_json/line_string.rb

@@ -25,7 +25,7 @@ module CartoJson
     end
 
     def to_wkt
-      "#{type.to_s.upcase} ((#{@points.dup.push(@points.first).collect {|p| "#{p.send(LNG)} #{p.send(LAT)}"}.join(', ')}))"
+      "#{type.to_s.upcase} (#{@points.dup.collect {|p| "#{p.send(LNG)} #{p.send(LAT)}"}.join(', ')})"
     end
 
     protected

data/lib/carto_json/parser.rb

@@ -46,10 +46,13 @@ module CartoJson
       end
 
       unless TYPES.include? element[:type].to_sym
-        raise InvalidTypeError, "unsupported type: \"#{element[:type]}\", supported types: #{TYPES.join(', ')}"
+        raise InvalidTypeError.new(element[:type].to_sym,
+                                   "unsupported type: \"#{element[:type]}\", supported types: #{TYPES.join(', ')}")
       end
+      
+      class_name = element[:type] == 'linestring' ? 'LineString' : element[:type].capitalize
 
-      CartoJson.const_get(element[:type].capitalize).parse element
+      CartoJson.const_get(class_name).parse element
     end
   end
 end

data/lib/carto_json/polygon.rb

@@ -1,7 +1,11 @@
 module CartoJson
   class Polygon < LineString
     type :polygon
-    
+
+    def to_wkt
+      "#{type.to_s.upcase} ((#{@points.dup.push(@points.first).collect {|p| "#{p.send(LNG)} #{p.send(LAT)}"}.join(', ')}))"
+    end
+
     protected
 
     def validate

data/lib/carto_json/rectangle.rb

@@ -0,0 +1,14 @@
+module CartoJson
+  class Rectangle
+    def initialize(opts={})
+      raise "sw and ne coordinates are required" unless opts[:sw] && opts[:ne]
+      @sw = opts[:sw].to_f
+      @ne = opts[:ne].to_f
+      raise "sw and ne coordinates cannot be equal" if @sw == @ne
+    end
+
+    def to_wkt
+      
+    end
+  end
+end

data/lib/carto_json/version.rb

@@ -1,3 +1,3 @@
 module CartoJson
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/carto_json/wkt_parser.rb

@@ -26,7 +26,7 @@ module CartoJson
         Point.new xy_to_points(@input.match(/point \((.+)\)/i).captures.first).first
       else
         raise NotImplementedError, 'multi types are not implemented yet' if MULTI_TYPES.include? type.downcase
-        raise Input Error, "invalid type: #{type}"
+        raise InvalidTypeError, type, "invalid type: #{type}"
       end
     end
 

data/lib/carto_json.rb

@@ -1,5 +1,5 @@
 module CartoJson
-  PRIMITIVE_TYPES = [:point, :linestring, :polygon, :rectangle]
+  PRIMITIVE_TYPES = [:circle, :point, :linestring, :polygon, :rectangle]
   MULTI_TYPES     = [:multipoint, :multilinestring, :multipolygon]
   TYPES           = PRIMITIVE_TYPES+MULTI_TYPES
 
@@ -26,6 +26,7 @@ require 'carto_json/point'
 require 'carto_json/circle'
 require 'carto_json/line_string'
 require 'carto_json/polygon'
+require 'carto_json/rectangle'
 require 'carto_json/wkt_parser'
 require 'carto_json/version'
 require 'multi_json'

data/spec/circle_spec.rb

@@ -16,8 +16,8 @@ describe CartoJson::Circle do
 
     hash = MultiJson.decode(circle.to_json, :symbolize_keys => true)
 
-    hash[:center][LAT].must_equal @args[LAT]
-    hash[:center][LNG].must_equal @args[LNG]
+    hash[LAT].must_equal @args[LAT]
+    hash[LNG].must_equal @args[LNG]
     hash[:radius].must_equal @args[:radius]
   end
 

data/spec/line_string_spec.rb

@@ -21,7 +21,7 @@ describe LineString do
     hash[:points].first[LAT].must_equal @args[:points].first[LAT]
     hash[:points].first[LNG].must_equal @args[:points].first[LNG]
 
-    ls.to_wkt.must_equal "LINESTRING ((#{ls.points.dup.push(ls.points.first).collect {|p| "#{p.send(LNG)} #{p.send(LAT)}"}.join(', ')}))"
+    ls.to_wkt.must_equal "LINESTRING (#{ls.points.dup.collect {|p| "#{p.send(LNG)} #{p.send(LAT)}"}.join(', ')})"
   end
 
   it 'should fail if less than three points' do

data/spec/rectangle_spec.rb

@@ -0,0 +1,9 @@
+require File.join File.dirname(__FILE__), 'env.rb'
+
+include CartoJson
+
+describe CartoJson::Rectangle do
+  before do
+
+  end
+end

data/spec/wkt_parser_spec.rb

@@ -25,4 +25,12 @@ describe CartoJson::WKTParser do
     ls.points.first.must_equal Point.new(LAT => 1, LNG => 2)
     ls.points.last.must_equal Point.new(LAT => 3, LNG => 4)
   end
+  
+  it 'works with linestring' do
+    ls = WKTParser.parse "LINESTRING (2 1, 4 3)"
+    ls.class.must_equal LineString
+    ls.type.must_equal :linestring
+    ls.points.first.must_equal Point.new(LAT => 1, LNG => 2)
+    ls.points.last.must_equal Point.new(LAT => 3, LNG => 4)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carto_json
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70336033905880 !ruby/object:Gem::Requirement
+  requirement: &70323933072040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336033905880
+  version_requirements: *70323933072040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70336033905460 !ruby/object:Gem::Requirement
+  requirement: &70323933071620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336033905460
+  version_requirements: *70323933071620
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70336033905040 !ruby/object:Gem::Requirement
+  requirement: &70323933071200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336033905040
+  version_requirements: *70323933071200
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70336033904620 !ruby/object:Gem::Requirement
+  requirement: &70323933070780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336033904620
+  version_requirements: *70323933070780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70336033904200 !ruby/object:Gem::Requirement
+  requirement: &70323933070360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336033904200
+  version_requirements: *70323933070360
 description: Helpers for the CartoJSON specification
 email:
 - kyledrake@gmail.com
@@ -87,6 +87,7 @@ files:
 - lib/carto_json/parser.rb
 - lib/carto_json/point.rb
 - lib/carto_json/polygon.rb
+- lib/carto_json/rectangle.rb
 - lib/carto_json/shape.rb
 - lib/carto_json/utils.rb
 - lib/carto_json/version.rb
@@ -98,6 +99,7 @@ files:
 - spec/parser_spec.rb
 - spec/point_spec.rb
 - spec/polygon_spec.rb
+- spec/rectangle_spec.rb
 - spec/wkt_parser_spec.rb
 homepage: ''
 licenses: []
@@ -131,5 +133,6 @@ test_files:
 - spec/parser_spec.rb
 - spec/point_spec.rb
 - spec/polygon_spec.rb
+- spec/rectangle_spec.rb
 - spec/wkt_parser_spec.rb
 has_rdoc: