rgeo-geojson 0.2.2 → 0.2.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.2.3 / 2012-03-17
+
+* Returns nil from the encode method if nil is passed in. (Suggestion by Pete Deffendol.)
+
 === 0.2.2 / 2012-01-09
 
 * Fixed Feature#property(:symbol). (Reported by Andy Allan.)

data/README.rdoc

@@ -38,7 +38,7 @@ Example:
 RGeo::GeoJSON has the following requirements:
 
 * Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
-* rgeo 0.3.3 or later.
+* rgeo 0.3.7 or later.
 * If you are using Ruby 1.8, you should install the "json" gem to support
   parsing JSON strings. Ruby 1.9 has JSON support in its standard library
   and does not require the gem.
@@ -71,7 +71,7 @@ Contact the author at dazuma at gmail dot com.
 
 \RGeo is written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development of \RGeo is sponsored by GeoPage, Inc. (http://www.geopage.com).
+Development is supported by Pirq. (http://www.pirq.com).
 
 === License
 

data/Version

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rgeo/geo_json/coder.rb

@@ -57,16 +57,16 @@ module RGeo
       #
       # Options include:
       #
-      # <tt>:geo_factory</tt>::
+      # [<tt>:geo_factory</tt>]
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
-      # <tt>:entity_factory</tt>::
+      # [<tt>:entity_factory</tt>]
       #   Specifies an entity factory, which lets you override the types
       #   of GeoJSON entities that are created. It defaults to the default
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # <tt>:json_parser</tt>::
+      # [<tt>:json_parser</tt>]
       #   Specifies a JSON parser to use when decoding a String or IO
       #   object. The value may be a Proc object taking the string as the
       #   sole argument and returning the JSON hash, or it may be one of
@@ -145,6 +145,8 @@ module RGeo
       # will need to JSON-encode it. This is usually accomplished by
       # calling <tt>to_json</tt> on the hash object, if you have the
       # appropriate JSON library installed.
+      #
+      # Returns nil if nil is passed in as the object.
 
       def encode(object_)
         if @entity_factory.is_feature_collection?(object_)
@@ -154,6 +156,8 @@ module RGeo
           }
         elsif @entity_factory.is_feature?(object_)
           _encode_feature(object_)
+        elsif object_.nil?
+          nil
         else
           _encode_geometry(object_)
         end

data/lib/rgeo/geo_json/interface.rb

@@ -63,16 +63,16 @@ module RGeo
       #
       # Options include:
       #
-      # <tt>:geo_factory</tt>::
+      # [<tt>:geo_factory</tt>]
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
-      # <tt>:entity_factory</tt>::
+      # [<tt>:entity_factory</tt>]
       #   Specifies an entity factory, which lets you override the types
       #   of GeoJSON entities that are created. It defaults to the default
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # <tt>:json_parser</tt>::
+      # [<tt>:json_parser</tt>]
       #   Specifies a JSON parser to use when decoding a String or IO
       #   object. The value may be a Proc object taking the string as the
       #   sole argument and returning the JSON hash, or it may be one of
@@ -96,16 +96,16 @@ module RGeo
       #
       # The geo factory is a required argument. Other options include:
       #
-      # <tt>:geo_factory</tt>::
+      # [<tt>:geo_factory</tt>]
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
-      # <tt>:entity_factory</tt>::
+      # [<tt>:entity_factory</tt>]
       #   Specifies an entity factory, which lets you override the types
       #   of GeoJSON entities that are created. It defaults to the default
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # <tt>:json_parser</tt>::
+      # [<tt>:json_parser</tt>]
       #   Specifies a JSON parser to use when decoding a String or IO
       #   object. The value may be a Proc object taking the string as the
       #   sole argument and returning the JSON hash, or it may be one of

data/test/tc_basic.rb

@@ -59,6 +59,12 @@ module RGeo
         end
 
 
+        def test_nil
+          assert_nil(::RGeo::GeoJSON.encode(nil))
+          assert_nil(::RGeo::GeoJSON.decode(nil, :geo_factory => @geo_factory))
+        end
+
+
         def test_point
           object_ = @geo_factory.point(10, 20)
           json_ = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-geojson
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &2160272120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *2160272120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.7
 description: RGeo is a geospatial data library for Ruby. RGeo::GeoJSON is an optional
   RGeo module providing GeoJSON encoding and decoding services. This module can be
   used to communicate with location-based web services that understand the GeoJSON
@@ -63,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.12
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing GeoJSON encoding and decoding.