rgeo-geojson 0.2.1 → 0.2.2

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.2.2 / 2012-01-09
+
+* Fixed Feature#property(:symbol). (Reported by Andy Allan.)
+* Added an "rgeo-geojson.rb" wrapper so bundler's auto-require will work without modification. (Reported by Mauricio Pasquier Juan.)
+
 === 0.2.1 / 2011-04-11
 
 * The gem version is now accessible via an api.

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.2.8 or later.
+* rgeo 0.3.3 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.
@@ -75,7 +75,7 @@ Development of \RGeo is sponsored by GeoPage, Inc. (http://www.geopage.com).
 
 === License
 
-Copyright 2010-2011 Daniel Azuma
+Copyright 2010-2012 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rgeo-geojson.rb

@@ -0,0 +1,36 @@
+# -----------------------------------------------------------------------------
+#
+# GeoJSON implementation for RGeo
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+require 'rgeo/geo_json'

data/lib/rgeo/geo_json.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # GeoJSON implementation for RGeo
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,20 +39,20 @@ require 'rgeo'
 
 
 # RGeo is a spatial data library for Ruby, provided by the "rgeo" gem.
-# 
+#
 # The optional RGeo::GeoJSON module provides a set of tools for GeoJSON
 # encoding and decoding.
 
 module RGeo
-  
-  
+
+
   # This is a namespace for a set of tools that provide GeoJSON encoding.
   # See http://geojson.org/ for more information about this specification.
-  
+
   module GeoJSON
   end
-  
-  
+
+
 end
 
 

data/lib/rgeo/geo_json/coder.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # GeoJSON encoder object
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,28 +35,28 @@
 
 
 module RGeo
-  
+
   module GeoJSON
-    
-    
+
+
     # This object encapsulates encoding and decoding settings (principally
     # the RGeo::Feature::Factory and the RGeo::GeoJSON::EntityFactory to
     # be used) so that you can encode and decode without specifying those
     # settings every time.
-    
+
     class Coder
-      
-      
+
+
       @@json_available = nil
       @@yajl_available = nil
       @@activesupport_available = nil
-      
-      
+
+
       # Create a new coder settings object. The geo factory is passed as
       # a required argument.
-      # 
+      #
       # Options include:
-      # 
+      #
       # <tt>:geo_factory</tt>::
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
@@ -77,7 +77,7 @@ module RGeo
       #   library in Ruby 1.9, but requires the "json" gem in Ruby 1.8.
       #   If a parser is not specified, then the decode method will not
       #   accept a String or IO object; it will require a Hash.
-      
+
       def initialize(opts_={})
         @geo_factory = opts_[:geo_factory] || ::RGeo::Cartesian.preferred_factory
         @entity_factory = opts_[:entity_factory] || EntityFactory.instance
@@ -134,18 +134,18 @@ module RGeo
         @num_coordinates += 1 if @geo_factory.property(:has_z_coordinate)
         @num_coordinates += 1 if @geo_factory.property(:has_m_coordinate)
       end
-      
-      
+
+
       # Encode the given object as GeoJSON. The object may be one of the
       # geometry objects specified in RGeo::Feature, or an appropriate
       # GeoJSON wrapper entity supported by this coder's entity factory.
-      # 
+      #
       # This method returns a JSON object (i.e. a hash). In order to
       # generate a string suitable for transmitting to a service, you
       # 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.
-      
+
       def encode(object_)
         if @entity_factory.is_feature_collection?(object_)
           {
@@ -158,12 +158,12 @@ module RGeo
           _encode_geometry(object_)
         end
       end
-      
-      
+
+
       # Decode an object from GeoJSON. The input may be a JSON hash, a
       # String, or an IO object from which to read the JSON string.
       # If an error occurs, nil is returned.
-      
+
       def decode(input_)
         if input_.kind_of?(::IO)
           input_ = input_.read rescue nil
@@ -191,23 +191,23 @@ module RGeo
           _decode_geometry(input_)
         end
       end
-      
-      
+
+
       # Returns the RGeo::Feature::Factory used to generate geometry objects.
-      
+
       def geo_factory
         @geo_factory
       end
-      
-      
+
+
       # Returns the RGeo::GeoJSON::EntityFactory used to generate GeoJSON
       # wrapper entities.
-      
+
       def entity_factory
         @entity_factory
       end
-      
-      
+
+
       def _encode_feature(object_)  # :nodoc:
         json_ = {
           'type' => 'Feature',
@@ -218,8 +218,8 @@ module RGeo
         json_['id'] = id_ if id_
         json_
       end
-      
-      
+
+
       def _encode_geometry(object_, point_encoder_=nil)  # :nodoc:
         unless point_encoder_
           if object_.factory.property(:has_z_coordinate)
@@ -276,8 +276,8 @@ module RGeo
           nil
         end
       end
-      
-      
+
+
       def _decode_feature(input_)  # :nodoc:
         geometry_ = input_['geometry']
         if geometry_
@@ -286,8 +286,8 @@ module RGeo
         end
         @entity_factory.feature(geometry_, input_['id'], input_['properties'])
       end
-      
-      
+
+
       def _decode_geometry(input_)  # :nodoc:
         case input_['type']
         when 'GeometryCollection'
@@ -308,8 +308,8 @@ module RGeo
           nil
         end
       end
-      
-      
+
+
       def _decode_geometry_collection(input_)  # :nodoc:
         geometries_ = input_['geometries']
         geometries_ = [] unless geometries_.kind_of?(::Array)
@@ -320,14 +320,14 @@ module RGeo
         end
         @geo_factory.collection(decoded_geometries_)
       end
-      
-      
+
+
       def _decode_point_coords(point_coords_)  # :nodoc:
         return nil unless point_coords_.kind_of?(::Array)
         @geo_factory.point(*(point_coords_[0...@num_coordinates].map{ |c_| c_.to_f })) rescue nil
       end
-      
-      
+
+
       def _decode_line_string_coords(line_coords_)  # :nodoc:
         return nil unless line_coords_.kind_of?(::Array)
         points_ = []
@@ -337,8 +337,8 @@ module RGeo
         end
         @geo_factory.line_string(points_)
       end
-      
-      
+
+
       def _decode_polygon_coords(poly_coords_)  # :nodoc:
         return nil unless poly_coords_.kind_of?(::Array)
         rings_ = []
@@ -358,8 +358,8 @@ module RGeo
           @geo_factory.polygon(rings_[0], rings_[1..-1])
         end
       end
-      
-      
+
+
       def _decode_multi_point_coords(multi_point_coords_)  # :nodoc:
         return nil unless multi_point_coords_.kind_of?(::Array)
         points_ = []
@@ -369,8 +369,8 @@ module RGeo
         end
         @geo_factory.multi_point(points_)
       end
-      
-      
+
+
       def _decode_multi_line_string_coords(multi_line_coords_)  # :nodoc:
         return nil unless multi_line_coords_.kind_of?(::Array)
         lines_ = []
@@ -380,8 +380,8 @@ module RGeo
         end
         @geo_factory.multi_line_string(lines_)
       end
-      
-      
+
+
       def _decode_multi_polygon_coords(multi_polygon_coords_)  # :nodoc:
         return nil unless multi_polygon_coords_.kind_of?(::Array)
         polygons_ = []
@@ -391,11 +391,11 @@ module RGeo
         end
         @geo_factory.multi_polygon(polygons_)
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geo_json/entities.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # GeoJSON standard entities
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,267 +35,270 @@
 
 
 module RGeo
-  
+
   module GeoJSON
-    
-    
+
+
     # This is a GeoJSON wrapper entity that corresponds to the GeoJSON
     # "Feature" type. It is an immutable type.
-    # 
+    #
     # This is the default implementation that is generated by
     # RGeo::GeoJSON::EntityFactory. You may replace this implementation
     # by writing your own entity factory. Note that an alternate Feature
     # implementation need not subclass or even duck-type this class.
     # the entity factory mediates all interaction between the GeoJSON
     # engine and features.
-    
+
     class Feature
-      
-      
+
+
       # Create a feature wrapping the given geometry, with the given ID
       # and properties.
-      
+
       def initialize(geometry_, id_=nil, properties_={})
         @geometry = geometry_
         @id = id_
-        @properties = properties_.dup
+        @properties = {}
+        properties_.each do |k_, v_|
+          @properties[k_.to_s] = v_
+        end
       end
-      
-      
+
+
       def inspect  # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)} id=#{@id.inspect} geom=#{@geometry ? @geometry.as_text.inspect : 'nil'}>"
       end
-      
+
       def to_s  # :nodoc:
         inspect
       end
-      
+
       def hash  # :nodoc:
         @geometry.hash + @id.hash + @properties.hash
       end
-      
-      
+
+
       # Two features are equal if their geometries, IDs, and properties
       # are all equal.
       # This method uses the eql? method to test geometry equality, which
       # may behave differently than the == operator.
-      
+
       def eql?(rhs_)
         rhs_.kind_of?(Feature) && @geometry.eql?(rhs_.geometry) && @id.eql?(rhs_.feature_id) && @properties.eql?(rhs_.instance_variable_get(:@properties))
       end
-      
-      
+
+
       # Two features are equal if their geometries, IDs, and properties
       # are all equal.
       # This method uses the == operator to test geometry equality, which
       # may behave differently than the eql? method.
-      
+
       def ==(rhs_)
         rhs_.kind_of?(Feature) && @geometry == rhs_.geometry && @id == rhs_.feature_id && @properties == rhs_.instance_variable_get(:@properties)
       end
-      
-      
+
+
       # Returns the geometry contained in this feature, which may be nil.
-      
+
       def geometry
         @geometry
       end
-      
-      
+
+
       # Returns the ID for this feature, which may be nil.
-      
+
       def feature_id
         @id
       end
-      
-      
+
+
       # Returns a copy of the properties for this feature.
-      
+
       def properties
         @properties.dup
       end
-      
-      
+
+
       # Gets the value of the given named property.
       # Returns nil if the given property is not found.
-      
+
       def property(key_)
         @properties[key_.to_s]
       end
       alias_method :[], :property
-      
-      
+
+
       # Gets an array of the known property keys in this feature.
-      
+
       def keys
         @properties.keys
       end
-      
-      
+
+
     end
-    
-    
+
+
     # This is a GeoJSON wrapper entity that corresponds to the GeoJSON
     # "FeatureCollection" type. It is an immutable type.
-    # 
+    #
     # This is the default implementation that is generated by
     # RGeo::GeoJSON::EntityFactory. You may replace this implementation
     # by writing your own entity factory. Note that an alternate
     # FeatureCollection implementation need not subclass or even
     # duck-type this class. The entity factory mediates all interaction
     # between the GeoJSON engine and feature collections.
-    
+
     class FeatureCollection
-      
+
       include ::Enumerable
-      
-      
+
+
       # Create a new FeatureCollection with the given features, which must
       # be provided as an Enumerable.
-      
+
       def initialize(features_=[])
         @features = []
         features_.each{ |f_| @features << f_ if f_.kind_of?(Feature) }
       end
-      
-      
+
+
       def inspect  # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)}>"
       end
-      
+
       def to_s  # :nodoc:
         inspect
       end
-      
+
       def hash  # :nodoc:
         @features.hash
       end
-      
-      
+
+
       # Two feature collections are equal if they contain the same
       # features in the same order.
       # This methods uses the eql? method to test geometry equality, which
       # may behave differently than the == operator.
-      
+
       def eql?(rhs_)
         rhs_.kind_of?(FeatureCollection) && @features.eql?(rhs_.instance_variable_get(:@features))
       end
-      
-      
+
+
       # Two feature collections are equal if they contain the same
       # features in the same order.
       # This methods uses the == operator to test geometry equality, which
       # may behave differently than the eql? method.
-      
+
       def ==(rhs_)
         rhs_.kind_of?(FeatureCollection) && @features == rhs_.instance_variable_get(:@features)
       end
-      
-      
+
+
       # Iterates or returns an iterator for the features.
-      
+
       def each(&block_)
         @features.each(&block_)
       end
-      
-      
+
+
       # Returns the number of features contained in this collection.
-      
+
       def size
         @features.size
       end
-      
-      
+
+
       # Access a feature by index.
-      
+
       def [](index_)
         @features[index_]
       end
-      
-      
+
+
     end
-    
-    
+
+
     # This is the default entity factory. It creates objects of type
     # RGeo::GeoJSON::Feature and RGeo::GeoJSON::FeatureCollection.
     # You may create your own entity factory by duck-typing this class.
-    
+
     class EntityFactory
-      
-      
+
+
       # Create and return a new feature, given geometry, ID, and
       # properties hash. Note that, per the GeoJSON spec, geometry and/or
       # properties may be nil.
-      
+
       def feature(geometry_, id_=nil, properties_=nil)
         Feature.new(geometry_, id_, properties_ || {})
       end
-      
-      
+
+
       # Create and return a new feature collection, given an enumerable
       # of feature objects.
-      
+
       def feature_collection(features_=[])
         FeatureCollection.new(features_)
       end
-      
-      
+
+
       # Returns true if the given object is a feature created by this
       # entity factory.
-      
+
       def is_feature?(object_)
         object_.kind_of?(Feature)
       end
-      
-      
+
+
       # Returns true if the given object is a feature collection created
       # by this entity factory.
-      
+
       def is_feature_collection?(object_)
         object_.kind_of?(FeatureCollection)
       end
-      
-      
+
+
       # Run Enumerable#map on the features contained in the given feature
       # collection.
-      
+
       def map_feature_collection(object_, &block_)
         object_.map(&block_)
       end
-      
-      
+
+
       # Returns the geometry associated with the given feature.
-      
+
       def get_feature_geometry(object_)
         object_.geometry
       end
-      
-      
+
+
       # Returns the ID of the given feature, or nil for no ID.
-      
+
       def get_feature_id(object_)
         object_.feature_id
       end
-      
-      
+
+
       # Returns the properties of the given feature as a hash. Editing
       # this hash does not change the state of the feature.
-      
+
       def get_feature_properties(object_)
         object_.properties
       end
-      
-      
+
+
       # Return the singleton instance of EntityFactory.
-      
+
       def self.instance
         @instance ||= self.new
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geo_json/interface.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # GeoJSON toplevel interface
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,34 +35,34 @@
 
 
 module RGeo
-  
+
   module GeoJSON
-    
+
     class << self
-      
-      
+
+
       # High-level convenience routine for encoding an object as GeoJSON.
       # Pass the object, which may one of the geometry objects specified
       # in RGeo::Feature, or an appropriate GeoJSON wrapper entity such
       # as RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
-      # 
+      #
       # The only option supported is <tt>:entity_factory</tt>, which lets
       # you override the types of GeoJSON entities supported. See
       # RGeo::GeoJSON::EntityFactory for more information. By default,
       # encode supports objects of type RGeo::GeoJSON::Feature and
       # RGeo::GeoJSON::FeatureCollection.
-      
+
       def encode(object_, opts_={})
         Coder.new(opts_).encode(object_)
       end
-      
-      
+
+
       # High-level convenience routine for decoding an object from GeoJSON.
       # The input may be a JSON hash, a String, or an IO object from which
       # to read the JSON string.
-      # 
+      #
       # Options include:
-      # 
+      #
       # <tt>:geo_factory</tt>::
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
@@ -83,19 +83,19 @@ module RGeo
       #   library in Ruby 1.9, but requires the "json" gem in Ruby 1.8.
       #   If a parser is not specified, then the decode method will not
       #   accept a String or IO object; it will require a Hash.
-      
+
       def decode(input_, opts_={})
         Coder.new(opts_).decode(input_)
       end
-      
-      
+
+
       # Creates and returns a coder object of type RGeo::GeoJSON::Coder
       # that encapsulates encoding and decoding settings (principally the
       # RGeo::Feature::Factory and the RGeo::GeoJSON::EntityFactory to be
       # used).
-      # 
+      #
       # The geo factory is a required argument. Other options include:
-      # 
+      #
       # <tt>:geo_factory</tt>::
       #   Specifies the geo factory to use to create geometry objects.
       #   Defaults to the preferred cartesian factory.
@@ -116,14 +116,14 @@ module RGeo
       #   library in Ruby 1.9, but requires the "json" gem in Ruby 1.8.
       #   If a parser is not specified, then the decode method will not
       #   accept a String or IO object; it will require a Hash.
-      
+
       def coder(opts_={})
         Coder.new(opts_)
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end

data/lib/rgeo/geo_json/version.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Version of rgeo-geojson
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,16 +41,16 @@ end
 
 
 module RGeo
-  
+
   module GeoJSON
-    
+
     # Current version of RGeo::GeoJSON as a frozen string
     VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../Version').strip.freeze
-    
+
     # Current version of RGeo::GeoJSON as a Versionomy object, if the
     # Versionomy gem is available; otherwise equal to VERSION_STRING.
     VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
-    
+
   end
-  
+
 end

data/test/tc_basic.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for basic GeoJSON usage
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,10 +41,10 @@ require 'rgeo/geo_json'
 module RGeo
   module GeoJSON
     module Tests  # :nodoc:
-      
+
       class TestGeoJSON < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @geo_factory = ::RGeo::Cartesian.simple_factory(:srid => 4326)
           @geo_factory_z = ::RGeo::Cartesian.simple_factory(:srid => 4326, :has_z_coordinate => true)
@@ -52,13 +52,13 @@ module RGeo
           @geo_factory_zm = ::RGeo::Cartesian.simple_factory(:srid => 4326, :has_z_coordinate => true, :has_m_coordinate => true)
           @entity_factory = ::RGeo::GeoJSON::EntityFactory.instance
         end
-        
-        
+
+
         def test_has_version
           assert_not_nil(::RGeo::GeoJSON::VERSION)
         end
-        
-        
+
+
         def test_point
           object_ = @geo_factory.point(10, 20)
           json_ = {
@@ -68,8 +68,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_point_z
           object_ = @geo_factory_z.point(10, 20, -1)
           json_ = {
@@ -79,8 +79,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory_z).eql?(object_))
         end
-        
-        
+
+
         def test_point_m
           object_ = @geo_factory_m.point(10, 20, -1)
           json_ = {
@@ -90,8 +90,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory_m).eql?(object_))
         end
-        
-        
+
+
         def test_point_zm
           object_ = @geo_factory_zm.point(10, 20, -1, -2)
           json_ = {
@@ -101,8 +101,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory_zm).eql?(object_))
         end
-        
-        
+
+
         def test_line_string
           object_ = @geo_factory.line_string([@geo_factory.point(10, 20), @geo_factory.point(12, 22), @geo_factory.point(-3, 24)])
           json_ = {
@@ -112,8 +112,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_polygon
           object_ = @geo_factory.polygon(@geo_factory.linear_ring([@geo_factory.point(10, 20), @geo_factory.point(12, 22), @geo_factory.point(-3, 24), @geo_factory.point(10, 20)]))
           json_ = {
@@ -123,8 +123,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_polygon_complex
           object_ = @geo_factory.polygon(@geo_factory.linear_ring([@geo_factory.point(0, 0), @geo_factory.point(10, 0), @geo_factory.point(10, 10), @geo_factory.point(0, 10), @geo_factory.point(0, 0)]), [@geo_factory.linear_ring([@geo_factory.point(4, 4), @geo_factory.point(6, 5), @geo_factory.point(4, 6), @geo_factory.point(4, 4)])])
           json_ = {
@@ -134,8 +134,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_multi_point
           object_ = @geo_factory.multi_point([@geo_factory.point(10, 20), @geo_factory.point(12, 22), @geo_factory.point(-3, 24)])
           json_ = {
@@ -145,8 +145,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_multi_line_string
           object_ = @geo_factory.multi_line_string([@geo_factory.line_string([@geo_factory.point(10, 20), @geo_factory.point(12, 22), @geo_factory.point(-3, 24)]), @geo_factory.line_string([@geo_factory.point(1, 2), @geo_factory.point(3, 4)])])
           json_ = {
@@ -156,8 +156,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_multi_polygon
           object_ = @geo_factory.multi_polygon([@geo_factory.polygon(@geo_factory.linear_ring([@geo_factory.point(0, 0), @geo_factory.point(10, 0), @geo_factory.point(10, 10), @geo_factory.point(0, 10), @geo_factory.point(0, 0)]), [@geo_factory.linear_ring([@geo_factory.point(4, 4), @geo_factory.point(6, 5), @geo_factory.point(4, 6), @geo_factory.point(4, 4)])]), @geo_factory.polygon(@geo_factory.linear_ring([@geo_factory.point(-10,-10), @geo_factory.point(-15, -10), @geo_factory.point(-10, -15), @geo_factory.point(-10, -10)]))])
           json_ = {
@@ -167,8 +167,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_geometry_collection
           object_ = @geo_factory.collection([@geo_factory.point(10, 20), @geo_factory.collection([@geo_factory.point(12, 22), @geo_factory.point(-3, 24)])])
           json_ = {
@@ -196,8 +196,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_feature
           object_ = @entity_factory.feature(@geo_factory.point(10, 20))
           json_ = {
@@ -211,8 +211,8 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
         def test_feature_nulls
           json_ = {
             'type' => 'Feature',
@@ -224,8 +224,8 @@ module RGeo
           assert_nil(obj_.geometry)
           assert_equal({}, obj_.properties)
         end
-        
-        
+
+
         def test_feature_complex
           object_ = @entity_factory.feature(@geo_factory.point(10, 20), 2, {'prop1' => 'foo', 'prop2' => 'bar'})
           json_ = {
@@ -240,8 +240,26 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
+        def test_feature_with_symbol_prop_keys
+          object_ = @entity_factory.feature(@geo_factory.point(10, 20), 2, {:prop1 => 'foo', 'prop2' => 'bar'})
+          json_ = {
+            'type' => 'Feature',
+            'geometry' => {
+              'type' => 'Point',
+              'coordinates' => [10.0, 20.0],
+            },
+            'id' => 2,
+            'properties' => {'prop1' => 'foo', 'prop2' => 'bar'},
+          }
+          assert_equal('foo', object_.property('prop1'))
+          assert_equal('bar', object_.property(:prop2))
+          assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
+          assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
+        end
+
+
         def test_feature_collection
           object_ = @entity_factory.feature_collection([@entity_factory.feature(@geo_factory.point(10, 20)), @entity_factory.feature(@geo_factory.point(11, 22)), @entity_factory.feature(@geo_factory.point(10, 20), 8)])
           json_ = {
@@ -277,10 +295,10 @@ module RGeo
           assert_equal(json_, ::RGeo::GeoJSON.encode(object_))
           assert(::RGeo::GeoJSON.decode(json_, :geo_factory => @geo_factory).eql?(object_))
         end
-        
-        
+
+
       end
-    
+
     end
   end
 end

metadata

@@ -1,73 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rgeo-geojson
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rgeo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160272120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
   type: :runtime
-  version_requirements: *id001
-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 format.
+  prerelease: false
+  version_requirements: *2160272120
+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
+  format.
 email: dazuma@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - README.rdoc
-files: 
+files:
 - lib/rgeo/geo_json/coder.rb
 - lib/rgeo/geo_json/entities.rb
 - lib/rgeo/geo_json/interface.rb
 - lib/rgeo/geo_json/version.rb
 - lib/rgeo/geo_json.rb
+- lib/rgeo-geojson.rb
 - test/tc_basic.rb
 - History.rdoc
 - README.rdoc
 - Version
 homepage: http://virtuoso.rubyforge.org/rgeo-geojson
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: virtuoso
-rubygems_version: 1.7.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing GeoJSON encoding and decoding.
-test_files: 
+test_files:
 - test/tc_basic.rb