rgeo 0.1.20 → 0.1.21

data/lib/rgeo/feature/factory_generator.rb

@@ -101,6 +101,14 @@ module RGeo
       end
       
       
+      # Return a new FactoryGenerator that always returns the given
+      # factory.
+      
+      def self.single(factory_)
+        ::Proc.new{ |c_| factory_ }
+      end
+      
+      
       # Return a new FactoryGenerator that calls the given delegate, but
       # modifies the configuration passed to it. You can provide defaults
       # for configuration values not explicitly specified, and you can

data/lib/rgeo/geography/factory.rb

@@ -185,14 +185,14 @@ module RGeo
       # See ::RGeo::Feature::Factory#parse_wkt
       
       def parse_wkt(str_)
-        WKRep::WKTParser.new(:default_factory => self).parse(str_)
+        WKRep::WKTParser.new(self).parse(str_)
       end
       
       
       # See ::RGeo::Feature::Factory#parse_wkb
       
       def parse_wkb(str_)
-        WKRep::WKBParser.new(:default_factory => self).parse(str_)
+        WKRep::WKBParser.new(self).parse(str_)
       end
       
       

data/lib/rgeo/geography/interface.rb

@@ -101,7 +101,7 @@ module RGeo
       #   to 4326, indicating the WGS84 crs, but note that that value
       #   implies an ellipsoidal datum, not a spherical datum.
       
-      def spherical(opts_={})
+      def spherical_factory(opts_={})
         Geography::Factory.new('Spherical', :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate], :proj4 => opts_[:proj4] || '+proj=longlat +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +no_defs', :srid => opts_[:srid] || 4055)
       end
       
@@ -172,7 +172,7 @@ module RGeo
       #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
       #   most support one or the other.
       
-      def simple_mercator(opts_={})
+      def simple_mercator_factory(opts_={})
         factory_ = Geography::Factory.new('Projected', :proj4 => '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid => 4326, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
         projector_ = Geography::SimpleMercatorProjector.new(factory_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
         factory_._set_projector(projector_)
@@ -237,7 +237,7 @@ module RGeo
       # <tt>:support_m_coordinate</tt>::
       #   Support <tt>m_coordinate</tt>. Default is false.
       
-      def projected(opts_={})
+      def projected_factory(opts_={})
         unless CoordSys::Proj4.supported?
           raise Error::UnsupportedCapability, "Proj4 is not supported because the proj4 library was not found at install time."
         end

data/lib/rgeo/geos/zm_factory.rb

@@ -126,14 +126,14 @@ module RGeo
       # See ::RGeo::Feature::Factory#parse_wkt
       
       def parse_wkt(str_)
-        WKRep::WKTParser.new(:default_factory => self).parse(str_)
+        WKRep::WKTParser.new(self).parse(str_)
       end
       
       
       # See ::RGeo::Feature::Factory#parse_wkb
       
       def parse_wkb(str_)
-        WKRep::WKBParser.new(:default_factory => self).parse(str_)
+        WKRep::WKBParser.new(self).parse(str_)
       end
       
       

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -49,21 +49,15 @@ module RGeo
     # 
     # === Configuration options
     # 
-    # The following options are recognized. These can be passed to the
-    # constructor, or set on the object afterwards.
+    # You must provide each parser with an RGeo::Feature::FactoryGenerator.
+    # It should understand the configuration options <tt>:srid</tt>,
+    # <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
+    # You may also pass a specific RGeo::Feature::Factory, or nil to
+    # specify the default Cartesian FactoryGenerator.
+    # 
+    # The following additional options are recognized. These can be passed
+    # to the constructor, or set on the object afterwards.
     # 
-    # <tt>:default_factory</tt>::
-    #   The default factory for parsed geometries, used when no factory
-    #   generator is provided. If no default is provided either, the
-    #   default cartesian factory will be used as the default.
-    # <tt>:factory_generator</tt>::
-    #   A factory generator that should return a factory based on the
-    #   srid and dimension settings in the input. The factory generator
-    #   should understand the configuration options <tt>:srid</tt>,
-    #   <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
-    #   See RGeo::Feature::FactoryGenerator for more information.
-    #   If no generator is provided, the <tt>:default_factory</tt> is
-    #   used.
     # <tt>:support_ewkb</tt>::
     #   Activate support for PostGIS EWKB type codes, which use high
     #   order bits in the type code to signal the presence of Z, M, and
@@ -76,6 +70,9 @@ module RGeo
     # <tt>:ignore_extra_bytes</tt>::
     #   If true, extra bytes at the end of the data are ignored. If
     #   false (the default), extra bytes will trigger a parse error.
+    # <tt>:default_srid</tt>::
+    #   A SRID to pass to the factory generator if no SRID is present in
+    #   the input. Defaults to nil (i.e. don't specify a SRID).
     
     class WKBParser
       
@@ -83,34 +80,38 @@ module RGeo
       # Create and configure a WKB parser. See the WKBParser
       # documentation for the options that can be passed.
       
-      def initialize(opts_={})
-        @default_factory = opts_[:default_factory] || Cartesian.preferred_factory
-        @factory_generator = opts_[:factory_generator]
+      def initialize(factory_generator_=nil, opts_={})
+        self.factory_generator = factory_generator_
         @support_ewkb = opts_[:support_ewkb] ? true : false
         @support_wkb12 = opts_[:support_wkb12] ? true : false
         @ignore_extra_bytes = opts_[:ignore_extra_bytes] ? true : false
+        @default_srid = opts_[:default_srid]
       end
       
       
-      # Returns the default factory. See WKBParser for details.
-      def default_factory
-        @default_factory
-      end
-      
-      # Sets the default factory. See WKBParser for details.
-      def default_factory=(value_)
-        @default_factory = value_ || Cartesian.preferred_factory
-      end
-      
-      # Returns the factory generator, or nil if there is none.
-      # See WKBParser for details.
+      # Returns the factory generator. See WKBParser for details.
       def factory_generator
         @factory_generator
       end
       
+      # If this parser was given an exact factory, returns it; otherwise
+      # returns nil.
+      def exact_factory
+        @exact_factory
+      end
+      
       # Sets the factory_generator. See WKBParser for details.
       def factory_generator=(value_)
-        @factory_generator = value_
+        if value_.kind_of?(Feature::Factory::Instance)
+          @factory_generator = Feature::FactoryGenerator.single(value_)
+          @exact_factory = value_
+        elsif value_.respond_to?(:call)
+          @factory_generator = value_
+          @exact_factory = nil
+        else
+          @factory_generator = Cartesian.method(:preferred_factory)
+          @exact_factory = nil
+        end
       end
       
       # Sets the factory_generator to the given block.
@@ -167,7 +168,7 @@ module RGeo
         @cur_has_m = nil
         @cur_srid = nil
         @cur_dims = 2
-        @cur_factory = @default_factory
+        @cur_factory = nil
         begin
           _start_scanner(data_)
           obj_ = _parse_object(false)
@@ -189,7 +190,7 @@ module RGeo
         type_code_ = _get_integer(little_endian_)
         has_z_ = false
         has_m_ = false
-        srid_ = nil
+        srid_ = contained_ ? nil : @default_srid
         if @support_ewkb
           has_z_ ||= type_code_ & 0x80000000 != 0
           has_m_ ||= type_code_ & 0x40000000 != 0
@@ -218,10 +219,8 @@ module RGeo
           @cur_has_z = has_z_
           @cur_has_m = has_m_
           @cur_dims = 2 + (@cur_has_z ? 1 : 0) + (@cur_has_m ? 1 : 0)
-          @cur_srid = srid_.to_i
-          if @factory_generator
-            @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => has_z_, :support_m_coordinate => has_m_)
-          end
+          @cur_srid = srid_
+          @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => has_z_, :support_m_coordinate => has_m_)
           if @cur_has_z && !@cur_factory.has_capability?(:z_coordinate)
             raise Error::ParseError, "Data has Z coordinates but the factory doesn't have z_coordinate capability"
           end

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -52,21 +52,15 @@ module RGeo
     # 
     # === Configuration options
     # 
-    # The following options are recognized. These can be passed to the
-    # constructor, or set on the object afterwards.
+    # You must provide each parser with an RGeo::Feature::FactoryGenerator.
+    # It should understand the configuration options <tt>:srid</tt>,
+    # <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
+    # You may also pass a specific RGeo::Feature::Factory, or nil to
+    # specify the default Cartesian FactoryGenerator.
+    # 
+    # The following additional options are recognized. These can be passed
+    # to the constructor, or set on the object afterwards.
     # 
-    # <tt>:default_factory</tt>::
-    #   The default factory for parsed geometries, used when no factory
-    #   generator is provided. If no default is provided either, the
-    #   default cartesian factory will be used as the default.
-    # <tt>:factory_generator</tt>::
-    #   A factory generator that should return a factory based on the
-    #   srid and dimension settings in the input. The factory generator
-    #   should understand the configuration options <tt>:srid</tt>,
-    #   <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
-    #   See RGeo::Feature::FactoryGenerator for more information.
-    #   If no generator is provided, the <tt>:default_factory</tt> is
-    #   used.
     # <tt>:support_ewkt</tt>::
     #   Activate support for PostGIS EWKT type tags, which appends an "M"
     #   to tags to indicate the presence of M but not Z, and also
@@ -83,6 +77,9 @@ module RGeo
     # <tt>:ignore_extra_tokens</tt>::
     #   If true, extra tokens at the end of the data are ignored. If
     #   false (the default), extra tokens will trigger a parse error.
+    # <tt>:default_srid</tt>::
+    #   A SRID to pass to the factory generator if no SRID is present in
+    #   the input. Defaults to nil (i.e. don't specify a SRID).
     
     class WKTParser
       
@@ -90,41 +87,45 @@ module RGeo
       # Create and configure a WKT parser. See the WKTParser
       # documentation for the options that can be passed.
       
-      def initialize(opts_={})
-        @default_factory = opts_[:default_factory] || Cartesian.preferred_factory
-        @factory_generator = opts_[:factory_generator]
+      def initialize(factory_generator_=nil, opts_={})
+        self.factory_generator = factory_generator_
         @support_ewkt = opts_[:support_ewkt] ? true : false
         @support_wkt12 = opts_[:support_wkt12] ? true : false
         @strict_wkt11 = @support_ewkt || @support_wkt12 ? false : opts_[:strict_wkt11] ? true : false
         @ignore_extra_tokens = opts_[:ignore_extra_tokens] ? true : false
+        @default_srid = opts_[:default_srid]
       end
       
       
-      # Returns the default factory. See WKTParser for details.
-      def default_factory
-        @default_factory
-      end
-      
-      # Sets the default factory. See WKTParser for details.
-      def default_factory=(value_)
-        @default_factory = value_ || Cartesian.preferred_factory
-      end
-      
-      # Returns the factory generator, or nil if there is none.
-      # See WKTParser for details.
+      # Returns the factory generator. See WKTParser for details.
       def factory_generator
         @factory_generator
       end
       
+      # If this parser was given an exact factory, returns it; otherwise
+      # returns nil.
+      def exact_factory
+        @exact_factory
+      end
+      
       # Sets the factory_generator. See WKTParser for details.
       def factory_generator=(value_)
-        @factory_generator = value_
+        if value_.kind_of?(Feature::Factory::Instance)
+          @factory_generator = Feature::FactoryGenerator.single(value_)
+          @exact_factory = value_
+        elsif value_.respond_to?(:call)
+          @factory_generator = value_
+          @exact_factory = nil
+        else
+          @factory_generator = Cartesian.method(:preferred_factory)
+          @exact_factory = nil
+        end
       end
       
       # Sets the factory_generator to the given block.
       # See WKTParser for details.
       def to_generate_factory(&block_)
-        @factory_generator = block_
+        self.factory_generator = block_
       end
       
       # Returns true if this parser supports EWKT.
@@ -176,14 +177,14 @@ module RGeo
       
       def parse(str_)
         str_ = str_.downcase
-        @cur_factory = @factory_generator ? nil : @default_factory
+        @cur_factory = @exact_factory
         if @cur_factory
           @cur_factory_support_z = @cur_factory.has_capability?(:z_coordinate) ? true : false
           @cur_factory_support_m = @cur_factory.has_capability?(:m_coordinate) ? true : false
         end
         @cur_expect_z = nil
         @cur_expect_m = nil
-        @cur_srid = nil
+        @cur_srid = @default_srid
         if @support_ewkt && str_ =~ /^srid=(\d+);/i
           str_ = $'
           @cur_srid = $1.to_i
@@ -213,10 +214,7 @@ module RGeo
       
       def _ensure_factory  # :nodoc:
         unless @cur_factory
-          if @factory_generator
-            @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => @cur_expect_z, :support_m_coordinate => @cur_expect_m)
-          end
-          @cur_factory ||= @default_factory
+          @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => @cur_expect_z, :support_m_coordinate => @cur_expect_m)
           @cur_factory_support_z = @cur_factory.has_capability?(:z_coordinate) ? true : false
           @cur_factory_support_m = @cur_factory.has_capability?(:m_coordinate) ? true : false
           _check_factory_support unless @cur_expect_z.nil?
@@ -362,7 +360,7 @@ module RGeo
       def _parse_polygon  # :nodoc:
         inner_rings_ = []
         if @cur_token == 'empty'
-          outer_ring_ = @cur_factory.linear_ring([])
+          outer_ring_ = _ensure_factory.linear_ring([])
         else
           _expect_token_type(:begin)
           _next_token

data/test/active_record/common_setup_methods.rb

@@ -0,0 +1,129 @@
+# -----------------------------------------------------------------------------
+# 
+# Common setup methods for ActiveRecord adapter tests
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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'
+require 'yaml'
+require 'active_record'
+require 'logger'
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ActiveRecord  # :nodoc:
+      
+      
+      if ::File.exists?(::File.dirname(__FILE__)+'/database.yml')
+        
+        TESTS_AVAILABLE = true
+        
+        ALL_DATABASES_CONFIG = ::YAML.load_file(::File.dirname(__FILE__)+'/database.yml')
+        
+        
+        module CommonSetupMethods  # :nodoc:
+          
+          @class_num = 0
+          
+          
+          def self.included(klass_)
+            database_config_ = ALL_DATABASES_CONFIG[klass_.const_get(:ADAPTER_NAME)]
+            database_config_.symbolize_keys!
+            if klass_.respond_to?(:before_open_database)
+              klass_.before_open_database(:config => database_config_)
+            end
+            klass_.const_set(:DATABASE_CONFIG, database_config_)
+            ar_class_ = CommonSetupMethods.new_class(database_config_)
+            klass_.const_set(:DEFAULT_AR_CLASS, ar_class_)
+            if klass_.respond_to?(:initialize_database)
+              klass_.initialize_database(:ar_class => ar_class_, :connection => ar_class_.connection)
+            end
+          end
+          
+          
+          def self.new_class(param_)
+            base_ = param_.kind_of?(::Class) ? param_ : ::ActiveRecord::Base
+            config_ = param_.kind_of?(::Hash) ? param_ : nil
+            klass_ = ::Class.new(base_)
+            @class_num += 1
+            self.const_set("Klass#{@class_num}".to_sym, klass_)
+            klass_.class_eval do
+              establish_connection(config_) if config_
+              set_table_name(:spatial_test)
+            end
+            klass_
+          end
+          
+          
+          def setup
+            @factory = ::RGeo::Cartesian.preferred_factory(:srid => 4326)
+            @geographic_factory = ::RGeo::Geography.spherical_factory(:srid => 4326)
+            cleanup_tables
+          end
+          
+          
+          def teardown
+            cleanup_tables
+          end
+          
+          
+          def cleanup_tables
+            klass_ = self.class.const_get(:DEFAULT_AR_CLASS)
+            if klass_.connection.tables.include?('spatial_test')
+              klass_.connection.drop_table(:spatial_test)
+            end
+          end
+          
+          
+          def create_ar_class(opts_={})
+            @ar_class = CommonSetupMethods.new_class(self.class.const_get(:DEFAULT_AR_CLASS))
+          end
+          
+          
+        end
+        
+        
+      else
+        
+        TESTS_AVAILABLE = false
+        
+        puts "WARNING: database.yml not found. Skipping ActiveRecord tests."
+        puts "         See tests/active_record/readme.txt for more info."
+        
+      end
+      
+      
+    end
+  end
+end