ar-postgis 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f98e01b84021d93b38379d634fe8cd1487f1aa
-  data.tar.gz: 4481b6e93272c9c9a94040b520de1c401bc98f5a
+  metadata.gz: bc965a00fa849a283ba134658b89e27b0f2ad410
+  data.tar.gz: 0944b98aab579e3c0daa8e30f58e87019191a666
 SHA512:
-  metadata.gz: e83a78c8ef67b34f642b4a18bd7afd5b77a5e1729e429334e2d1e5b3ce4d77ad83920239b786f94877d6486ba1c077d4980c2742b2330e60a56295c3a12c0942
-  data.tar.gz: 862aab26d4f807aa77e72f157f2a94c18659dbd047b72253149369ef2178ae892fdf4964ca397360fe90bebef517ab15a7177b12cb3dcbf83d57adea2b3b553b
+  metadata.gz: 4bd693e58711cadc4758efb4f003d72897904a38ca1a649303b5f7b7717ebe08cf9168dd994ec44b7d217165320df0b2ccea1b873a0e5cbea45f76e70538152a
+  data.tar.gz: 8ce9ffee24d1eca217f7a350d329915aac797627faf54ae1cc4edf45042c18171610b6b71243ec4a332c373adaabc8e5d405e7a26c8d66c651092c818232a607

data/Documentation.rdoc

@@ -6,7 +6,7 @@ This document provides basic how-to information that should help get you started
 * How to set up and configure spatial columns and tables.
 * How to read, write, and query spatial data.
 
-This document is part of the distribution for the activerecord-postgis-adapter gem. For more information, please visit http://dazuma.github.com/activerecord-postgis-adapter.
+This document is part of the distribution for the ar-postgis gem. For more information, please visit http://dazuma.github.com/activerecord-postgis-adapter.
 
 == Installation and Configuration
 
@@ -25,13 +25,13 @@ However, older software versions can make for a more involved setup process, so
 
 This section covers starting a new Rails application from scratch. If you need to add geospatial capabilities to an existing Rails application (i.e. you need to convert a non-spatial database to a spatial database), see the section on "Upgrading a Database With Spatial Features" below.
 
-To create a new Rails application using activerecord-postgis-adapter, start by using the postgresql adapter.
+To create a new Rails application using ar-postgis, start by using the postgresql adapter.
 
   rails new my_app --database=postgresql
 
-Next, add the activerecord-postgis-adapter gem to the Gemfile as follows:
+Next, add the ar-postgis gem to the Gemfile as follows:
 
-  gem 'activerecord-postgis-adapter'
+  gem 'ar-postgis'
 
 We also recommend including the "squeel" gem, which comes in very useful for writing spatial queries. Then run <code>bundle install</code> to complete your bundle.
 
@@ -55,7 +55,7 @@ For more information, see the PostGIS documentation, or any relevant documentati
 
 If you have an existing Rails app and an existing database that uses Postgres, and you want to add geospatial features, you should follow these steps.
 
-First, add the activerecord-postgis-adapter gem to the Gemfile, and update your bundle by running <code>bundle install</code>.
+First, add the ar-postgis gem to the Gemfile, and update your bundle by running <code>bundle install</code>.
 
 Next, modify your <code>config/database.yml</code> file to invoke the postgis adapter, as described above. At minimum, you will need to change the <code>adapter</code> field from "postgresql" to "postgis".
 
@@ -119,7 +119,7 @@ A spatial database is one that includes a set of data types, functions, tables,
 
 PostGIS is a plugin for PostgreSQL that provides definitions for the objects you need to add to a database to enable geospatial capabilities.
 
-When you create your Rails database as described above in the section on installation and configuration, activerecord-postgis-adapter automatically invokes PostGIS to add the appropriate definitions to your database. You can determine whether your database includes the correct definitions by attempting to invoke the POSTGIS_VERSION function:
+When you create your Rails database as described above in the section on installation and configuration, ar-postgis automatically invokes PostGIS to add the appropriate definitions to your database. You can determine whether your database includes the correct definitions by attempting to invoke the POSTGIS_VERSION function:
 
   SELECT POSTGIS_VERSION();   # succeeds if PostGIS objects are present.
 
@@ -129,7 +129,7 @@ Standard spatial databases also include a table called <code>spatial_ref_sys</co
 
 To store spatial data, you must create a column with a spatial type. PostGIS provides a variety of spatial types, including point, linestring, polygon, and different kinds of collections. These types are defined in a standard produced by the Open Geospatial Consortium. Furthermore, you can specify options indicating the coordinate system and number of coordinates for the values you are storing.
 
-The activerecord-postgis-adapter extends \ActiveRecord's migration syntax to support these spatial types. The following example creates four spatial columns in a table:
+The ar-postgis extends \ActiveRecord's migration syntax to support these spatial types. The following example creates four spatial columns in a table:
 
   create_table :my_spatial_table do |t|
     t.column :shape1, :geometry
@@ -147,7 +147,7 @@ The fourth column, "lonlat", has the <code>point</code> type, and accepts only P
 
 The fifth column, "lonlatheight", is a geographic (longitude/latitude) point that also includes a third "z" coordinate that can be used to store height information.
 
-The following are the data types understood by PostGIS and exposed by activerecord-postgis-adapter:
+The following are the data types understood by PostGIS and exposed by ar-postgis:
 
 * <tt>:geometry</tt> -- Any geometric type
 * <tt>:point</tt> -- Point data
@@ -173,7 +173,7 @@ The adapter also extends the \ActiveRecord migration syntax for creating spatial
 
 === Configuring the \ActiveRecord class
 
-\ActiveRecord's usefulness stems from the way it automatically configures classes based on the database structure and schema. If a column in the database has an integer type, \ActiveRecord automatically casts the data to a Ruby Integer. In the same way, the activerecord-postgis-adapter automatically casts spatial data to a corresponding RGeo data type.
+\ActiveRecord's usefulness stems from the way it automatically configures classes based on the database structure and schema. If a column in the database has an integer type, \ActiveRecord automatically casts the data to a Ruby Integer. In the same way, the ar-postgis automatically casts spatial data to a corresponding RGeo data type.
 
 However, RGeo offers more "flexibility" in its type system than can be interpreted solely from analyzing the database column. For example, you can configure RGeo objects to exhibit certain behaviors related to their serialization, validation, coordinate system, or computation. These settings are embodied in the RGeo "factory" associated with the object.
 
@@ -198,7 +198,7 @@ Here are some examples, given the spatial table defined above:
     
   end
 
-The <code>rgeo_factory_generator</code> attribute and <code>set_rgeo_factory_for_column</code> method are actually implemented (and documented) in the "rgeo-activerecord" gem, which is a dependency of the activerecord-postgis-adapter.
+The <code>rgeo_factory_generator</code> attribute and <code>set_rgeo_factory_for_column</code> method are actually implemented (and documented) in the "rgeo-activerecord" gem, which is a dependency of the ar-postgis.
 
 === Schema Dump and Reload
 
@@ -206,7 +206,7 @@ The presence of geospatial data in a database causes some issues with \ActiveRec
 
 Because of this, we recommend the following.
 
-* Install the PostGIS definitions in a separate schema called "postgis" (as described in the recommended installation procedure above). The activerecord-postgis-adapter will ignore a schema called "postgis" when dumping the schema, thus omitting the clutter.
+* Install the PostGIS definitions in a separate schema called "postgis" (as described in the recommended installation procedure above). The ar-postgis will ignore a schema called "postgis" when dumping the schema, thus omitting the clutter.
 
 * Set the \ActiveRecord schema format to <code>:ruby</code>, _not_ <code>:sql</code>. The former emits higher level commands that can be interpreted correctly to reproduce the schema. The latter, however, emits low level SQL, which loses information such as the fact that AddGeometryColumn() was originally used to generate a column. Executing a <code>:sql</code> format schema dump will _not_ correctly reproduce the schema.
 
@@ -231,7 +231,7 @@ The RGeo factory for the value is determined by how you configured the \ActiveRe
 
   factory = p.factory                # returns a spherical factory
 
-You can set a spatial attribute by providing an RGeo geometry object, or by providing the WKT string representation of the geometry. If a string is provided, the activerecord-postgis-adapter will attempt to parse it as WKT and set the value accordingly.
+You can set a spatial attribute by providing an RGeo geometry object, or by providing the WKT string representation of the geometry. If a string is provided, the ar-postgis will attempt to parse it as WKT and set the value accordingly.
 
   record.lonlat = 'POINT(-122, 47)'  # sets the value to the given point
 
@@ -239,7 +239,7 @@ If the WKT parsing fails, the value currently will be silently set to nil. In th
 
   record.lonlat = 'POINT(x)'         # sets the value to nil
 
-If you set the value to an RGeo object, the factory needs to match the factory for the attribute. If the factories do not match, activerecord-postgis-adapter will attempt to cast the value to the correct factory.
+If you set the value to an RGeo object, the factory needs to match the factory for the attribute. If the factories do not match, ar-postgis will attempt to cast the value to the correct factory.
 
   p2 = factory.point(-122, 47)       # p2 is a point in a spherical factory
   record.lonlat = p2                 # sets the value to the given point
@@ -289,4 +289,4 @@ Note that bounding box queries make sense only in a projected coordinate system;
 
 == License
 
-https://github.com/neighborland/activerecord-postgis-adapter/LICENSE.txt
+https://github.com/ar-postgis/ar-postgis/LICENSE.txt

data/History.rdoc

@@ -1,147 +1,10 @@
 === 0.7.0
 
+* Rename gem to ar-postgis
 * Require ruby 2.0
-* Require ActiveRecord 4.0
+* Require ActiveRecord 4.1
 * Drop JRuby support
 
-=== 0.6.5 / 2013-06-24
+=== activerecord-postgis-adapter
 
-* Fixed stoopid syntax errors in rake db:gis:setup tass. (Pull requests by rhodrid and jdurand)
-
-=== 0.6.4 / 2013-05-28
-
-* Fixed a crash with array conversions in Rails 4. (Contributed by Christopher Bull)
-* The gis setup task was broken in any Rails other than 3.2.x. Fixed (I think). (Reports by Rupert de Guzman and slbug)
-* Raise a more useful exception for the (as yet) unsupported combination of Rails 4 and JRuby.
-
-=== 0.6.3 / 2013-05-04
-
-* Several fixes for compatibility with changes to Rails 4.0.0 rc1. (Reports by slbug and Victor Costan)
-* Rails 3 rake tasks properly set PGUSER when appropriate. (Pull request by Mitin Pavel)
-* Fixed a nil exception on some Rails 4 migrations. (Pull request by ivanfoong and Victor Costan)
-
-=== 0.6.2 / 2013-03-08
-
-* The PostGIS setup now properly connects as the superuser. (Reported by Adam Trilling)
-* Fix database setup rake tasks under jruby/jdbc adapter. (Pull request by Nick Muerdter)
-* Drop table no longer tries to modify the geometry_columns view under PostGIS 2.0.
-* The Rakefile is now compatible with RubyGems 2.0.
-
-=== 0.6.1 / 2013-02-28
-
-* Fixed some gem loading issues.
-
-=== 0.6.0 / 2013-02-28
-
-* Experimental support for the recently released Rails 4.0 beta.
-* Documentation improvements.
-
-=== 0.5.1 / 2013-02-04
-
-* Database creation properly treats geometry_columns as a view when setting owner. (Pull request by hendrikstier)
-* Provide rake db:gis:setup task. (Pull request by Cody Russell)
-* Modifications for compatibility with postgres_ext. (Pull request by legendetm)
-* SpatialTableDefinition properly subclasses the Postgres-specific table definition class, if available. (Pull request by Joe Noon)
-* Database creation script no longer fails if the username includes weird characters. (Contributed by Toms Mikoss)
-* Updates for compatibility with jdbc-postgres 9.2.1002.1
-
-=== 0.5.0 / 2012-12-12
-
-Thanks to the many who have submitted pull requests. A bunch of them are in this release. Special thanks to Nick Muerdter, who succeeded in porting the adapter to work with the JDBC Postgres adapter in JRuby, and also got Travis up and running for the project.
-
-* Add JRuby compatibility with the activerecord-jdbcpostgresql-adapter gem. (Pull request by Nick Muerdter)
-* Allow WKT to be to be specified as a string-like object rather than having to be a String. (Pull request by Bryan Larsen)
-* Ignore postgis_topology tables 'layer' and 'topology' in rake db:schema:dump. (Pull request by Greg Phillips)
-* Create schemas specified in schema_search_path only if they don't exist. (Pull request by legendetm)
-* Force the postgis_topology extension be created in the topology schema. (Pull request by Dimitri Roche)
-* Specifically set the ownership of the postgis related tables to the regular user. (Pull request by corneverbruggen)
-* The gemspec no longer includes the timestamp in the version, so that bundler can pull from github. (Reported by corneverbruggen)
-* Update tests for PostGIS 2.0 compatibility.
-* Travis-CI integration. (Pull request by Nick Muerdter)
-* Add a missing srid in the Readme. (Pull request by gouthamvel)
-* Readme clarifies that BoundingBox objects can be used in a query only for projected coordinate systems. (Reported by Tee Parham)
-* Update URLs to point to new website.
-
-=== 0.4.3 / 2012-04-13
-
-* Rake tasks failed on Rails 3.0.x because of an issue with rgeo-activerecord pre-0.4.5. Now we require the fixed version.
-
-=== 0.4.2 / 2012-04-12
-
-* Support the db:structure:load rake task in recent versions of Rails.
-* Support installing PostGIS via the PostgreSQL extension mechanism (requires at least PostGIS 2.0 and PostgreSQL 9.1).
-* Support bounding boxes in queries (useful for "window" queries such as finding objects to display in a map region).
-* Fix some issues determine the correct default value for spatial columns.
-
-=== 0.4.1 / 2012-02-22
-
-* Some compatibility fixes for Rails 3.2. (Reported by Ryan Williams with implementation help from Radek Paviensky.)
-* Now requires rgeo-activerecord 0.4.3.
-
-=== 0.4.0 / 2011-08-15
-
-* Various fixes for Rails 3.1 compatibility.
-* Now requires rgeo-activerecord 0.4.0.
-* INCOMPATIBLE CHANGE: simple queries (e.g. MyClass.where(:latlon => my_point)) use an objective rather than spatial equality test. Earlier versions transformed this form to use st_equals, but now if you need to test for spatial equality, you'll need to call st_equals explicitly. I'm still evaluating which direction we want to go with this in the future, but we may be stuck with the current behavior because the hack required to transform these queries to use spatial equality was egregious and broke in Rails 3.1 with no clear workaround.
-
-=== 0.3.6 / 2011-06-21
-
-* Require latest rgeo-activerecord to get some fixes.
-* Note PostgreSQL 9 requirement in the README. (Reported by Samuel Cochran)
-* Now doesn't throw exceptions if an RGeo cast fails when setting an attribute.
-
-=== 0.3.5 / 2011-04-12
-
-* The .gemspec was missing the databases.rake file. Fixed.
-
-=== 0.3.4 / 2011-04-11
-
-* A .gemspec file is now available for gem building and bundler git integration.
-
-=== 0.3.3 / 2011-02-28
-
-* INCOMPATIBLE CHANGE: the default SRID for non-geography columns is now -1, rather than 4326. (Geography columns still default to 4326.)
-* It is now possible to create a spatial column without a corresponding entry in the geometry_columns table, and the adapter now handles this case properly. (Reported by Pirmin Kalberer)
-* Now requires rgeo-activerecord 0.3.1 (which brings a critical fix involving declaring multiple spatial columns in a migration).
-
-=== 0.3.2 / 2011-02-11
-
-* You can now specify a separate "database creation" superuser role so your normal PostgreSQL login role doesn't need superuser privileges when running database creation tasks.
-* Database creation tasks automatically create all schemas listed in the schema search path.
-
-=== 0.3.1 / 2011-02-01
-
-* Fixed a syntax error that prevented the adapter from loading on Ruby 1.8. Whoops. (Reported by miguelperez)
-
-=== 0.3.0 / 2011-01-26
-
-* Reworked type and constraint handling, which should result in a large number of bug fixes, especially related to schema dumps.
-* Experimental support for complex spatial queries. (Requires Arel 2.1, which is expected to be released with Rails 3.1.)
-* The path to the Railtie is now different (see the README), though a compatibility wrapper has been left in the old location.
-* Getting index information from the ActiveRecord class now properly recognizes spatial-ness.
-* Reorganized the code a bit for better clarity.
-
-=== 0.2.3 / 2011-01-06
-
-* Many of ActiveRecord's rake tasks weren't working because they need to know about every adapter explicitly. I hesitate to call this "fixed" since I see it as a problem in ActiveRecord, but we now at least have a workaround so the rake tasks will run properly. (Reported by Tad Thorley.)
-* Dumping schema.rb now omits the PostGIS internal tables.
-* Added a new configuration parameter pointing to the script directory, for rake db:create.
-* If the "postgis" schema is included in the schema search path, it is used as a container for the PostGIS internal definitions when running rake db:create. Furthermore, that schema is omitted when dumping the structure.sql. This should eliminate all the PostGIS internal cruft from SQL structure dumps, and also eliminate the errors that would appear when rebuilding a test database because the PostGIS internals would get applied twice.
-
-=== 0.2.2 / 2010-12-27
-
-* Support for basic spatial equality queries. e.g. constructs such as:
-    MyClass.where(:geom_column => factory.point(1, 2))
-    MyClass.where(:geom_column => 'POINT(1 2)')
-* Fixed an exception when adding spatial columns where the column name is specified as a symbol.
-
-=== 0.2.1 / 2010-12-15
-
-* Provides meta-information to RGeo 0.2.2 or later to support access to PostGIS's spatial reference system table.
-
-=== 0.2.0 / 2010-12-07
-
-* Initial public alpha release. Spun activerecord-postgis-adapter off from the core rgeo gem.
-* You can now set the factory for a specific column by name.
-
-For earlier history, see the History file for the rgeo gem.
+see https://github.com/dazuma/activerecord-postgis-adapter for previous history

data/README.rdoc

@@ -1,22 +1,29 @@
 == PostGIS \ActiveRecord Adapter
 
-The activerecord-postgis-adapter is a plugin that provides access to features of the PostGIS geospatial database from \ActiveRecord. Technically, it extends the standard postgresql adapter to provide support for the spatial data types and features added by the PostGIS extension. It uses the {RGeo}[http://github.com/dazuma/rgeo] library to represent spatial data in Ruby.
+The ar-postgis gem provides access to features of the PostGIS geospatial database from \ActiveRecord.
+Technically, it extends the standard postgresql adapter to provide support for the spatial data types and features
+added by the PostGIS extension. It uses the {RGeo}[http://github.com/dazuma/rgeo] library to represent spatial data
+in Ruby.
 
 Original project: https://github.com/dazuma/activerecord-postgis-adapter/
 
-== About the PostGIS Adapter
-
-This is a brief summary covering how to use activerecord-postgis-adapter. For full documentation, see Documentation.rdoc.
+For full documentation, see Documentation.rdoc.
 
 === Features
 
-The adapter provides three basic capabilities.
+The adapter provides three basic capabilities:
 
-First, it provides *spatial migrations*. It extends the \ActiveRecord migration syntax to support creating spatially-typed columns and spatial indexes. You can control the various PostGIS-provided attributes such as srid, dimension, and geographic vs geometric math.
+First, it provides *spatial migrations*. It extends the \ActiveRecord migration syntax to support creating
+spatially-typed columns and spatial indexes. You can control the various PostGIS-provided attributes such as srid,
+dimension, and geographic vs geometric math.
 
-Second, it recognizes spatial types and casts them properly to RGeo geometry objects. The adapter can configure these objects automatically based on the srid and dimension in the database table, or you can tell it to convert the data to a different form. You can also set attribute data using WKT format.
+Second, it recognizes spatial types and casts them properly to RGeo geometry objects. The adapter can configure these
+objects automatically based on the srid and dimension in the database table, or you can tell it to convert the data to
+a different form. You can also set attribute data using WKT format.
 
-Third, it lets you include simple spatial data in queries. WKT format data and RGeo objects can be embedded in where clauses. If you include the Squeel gem, the adapter also supports advanced queries utilizing the standard SQL spatial function set.
+Third, it lets you include simple spatial data in queries. WKT format data and RGeo objects can be embedded in where
+clauses. If you include the Squeel gem, the adapter also supports advanced queries utilizing the standard SQL spatial
+function set.
 
 === Requirements
 
@@ -24,25 +31,27 @@ The adapter has the following requirements.
 
 * Ruby 2.0.0 or later.
 * PostgreSQL 9.0 or later.
-* PostGIS 2.0, or later.
+* PostGIS 2.0 or later.
 * ActiveRecord 4.0.2 or later.
-* rgeo and rgeo-activerecord.
-
-=== Installation and Configuration
+* rgeo and rgeo-ar.
 
-To install this adapter in a Rails application, add it to your Gemfile:
+=== Install
 
-  gem 'activerecord-postgis-adapter'
+Add it to your Gemfile:
 
-and run bundle install to update your bundle.
+  gem 'ar-postgis'
 
-Alternately, if you are not using bundler, install it separately as a gem:
+or install it as a gem:
 
-  gem install activerecord-postgis-adapter
+  gem install ar-postgis
 
-Please note that this adapter uses the rgeo gem, which may have additional dependencies. Please see the \README documentation for rgeo for more information.
+Please note that this adapter uses the rgeo gem, which may have additional dependencies. Please see the \README
+documentation for rgeo for more information.
 
-Once you have installed the adapter, you'll need to edit your config/database.yml to call for it. At minimum, this means changing the adapter name from "postgresql" to "postgis". It may also require other settings to ensure that other functions (such as rake test) continue to work as expected. We recommend reading the Configuration section in the Documentation.rdoc file carefully before starting to use this adapter.
+Once you have installed the adapter, you'll need to edit your config/database.yml to call for it. At minimum, this
+means changing the adapter name from "postgresql" to "postgis". It may also require other settings to ensure that
+other functions (such as rake test) continue to work as expected. We recommend reading the Configuration section
+in the Documentation.rdoc file carefully before starting to use this adapter.
 
 == Development and Support
 
@@ -50,27 +59,17 @@ Original project info:
 
 \Documentation is available at http://dazuma.github.com/activerecord-postgis-adapter/rdoc
 
-Source code is hosted on Github at http://github.com/dazuma/activerecord-postgis-adapter
-
-Contributions are welcome. Fork the project on Github.
-
-Report bugs on Github issues at http://github.org/dazuma/activerecord-postgis-adapter/issues
-
 Support available on the rgeo-users google group at http://groups.google.com/group/rgeo-users
 
-Contact the author at dazuma at gmail dot com.
-
 == Acknowledgments
 
-The PostGIS Adapter and its supporting libraries (including RGeo) are
+The PostGIS Adapter and its supporting libraries (including RGeo) were originally
 written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development is supported by Pirq. (http://pirq.com).
+Development was supported by Pirq. (http://pirq.com).
 
 This adapter implementation owes some debt to the spatial_adapter plugin
-(http://github.com/fragility/spatial_adapter). Although we made some
-different design decisions for this adapter, studying the spatial_adapter
-source gave us a head start on the implementation.
+(http://github.com/fragility/spatial_adapter).
 
 == License
 

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -1,4 +1,4 @@
-# The activerecord-postgis-adapter gem installs the *postgis*
+# The ar-postgis gem installs the *postgis*
 # connection adapter into ActiveRecord.
 
 module ActiveRecord

data/lib/active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb

@@ -112,13 +112,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-        def drop_table(table_name_, *options_)
-          if postgis_lib_version.to_s.split('.').first.to_i == 1
-            execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
-          end
-          super
-        end
-
         def add_column(table_name_, column_name_, type_, options_={})
           table_name_ = table_name_.to_s
           column_name_ = column_name_.to_s
@@ -134,7 +127,7 @@ module ActiveRecord  # :nodoc:
               type_ = (options_[:type] || info_[:type] || type_).to_s.gsub('_', '').upcase
               has_z_ = options_[:has_z]
               has_m_ = options_[:has_m]
-              srid_ = (options_[:srid] || -1).to_i
+              srid_ = (options_[:srid] || PostGISAdapter::DEFAULT_SRID).to_i
               if options_[:geographic]
                 type_ << 'Z' if has_z_
                 type_ << 'M' if has_m_

data/lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_column.rb

@@ -11,14 +11,13 @@ module ActiveRecord  # :nodoc:
         def initialize(factory_settings_, table_name_, name_, default_, oid_type_, sql_type_=nil, null_=true, opts_=nil)
           @factory_settings = factory_settings_
           @table_name = table_name_
-          @geographic = sql_type_ =~ /geography/i ? true : false
+          @geographic = !!(sql_type_ =~ /geography/i)
           if opts_
             # This case comes from an entry in the geometry_columns table
-            @geometric_type = ::RGeo::ActiveRecord.geometric_type_from_name(opts_[:type]) ||
-              ::RGeo::Feature::Geometry
+            @geometric_type = ::RGeo::ActiveRecord.geometric_type_from_name(opts_[:type]) || ::RGeo::Feature::Geometry
             @srid = opts_[:srid].to_i
-            @has_z = opts_[:has_z] ? true : false
-            @has_m = opts_[:has_m] ? true : false
+            @has_z = !!opts_[:has_z]
+            @has_m = !!opts_[:has_m]
           elsif @geographic
             # Geographic type information is embedded in the SQL type
             @geometric_type = ::RGeo::Feature::Geometry

data/lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb

@@ -80,7 +80,11 @@ module ActiveRecord  # :nodoc:
         end
 
         def srid
-          @srid ? @srid.to_i : (geographic? ? 4326 : -1)
+          if @srid
+            @srid.to_i
+          else
+            geographic? ? 4326 : PostGISAdapter::DEFAULT_SRID
+          end
         end
 
         def has_z?

data/lib/active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb

@@ -5,6 +5,9 @@ module ActiveRecord  # :nodoc:
         :geography => {:type => 'geometry', :geographic => true}
       )
 
+      # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
+      DEFAULT_SRID = 0
+
       module CommonAdapterMethods  # :nodoc:
         def set_rgeo_factory_settings(factory_settings_)
           @rgeo_factory_settings = factory_settings_
@@ -22,9 +25,8 @@ module ActiveRecord  # :nodoc:
           @postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
         end
 
-        # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
         def default_srid
-          0
+          DEFAULT_SRID
         end
 
         def srs_database_columns

data/lib/active_record/connection_adapters/postgis_adapter/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = "0.7.0".freeze
+      VERSION = "0.7.1".freeze
     end
   end
-end
+end

data/test/tc_ddl.rb

@@ -1,21 +1,16 @@
 require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
-
 module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-
         class TestDDL < ::MiniTest::Test  # :nodoc:
-
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
           include AdapterTestHelper
 
           define_test_methods do
-
-
             def test_create_simple_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -26,13 +21,12 @@ module RGeo
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(true, col_.has_spatial_constraints?)
               assert_equal(false, col_.geographic?)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
+              assert_equal(0, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_create_no_constraints_geometry
               klass_ = create_ar_class
@@ -50,7 +44,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_simple_geography
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -65,7 +58,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_point_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -75,7 +67,6 @@ module RGeo
               assert(klass_.cached_attributes.include?('latlon'))
             end
 
-
             def test_create_geometry_with_index
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -87,7 +78,6 @@ module RGeo
               assert(klass_.connection.indexes(:spatial_test).last.spatial)
             end
 
-
             def test_add_geometry_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -100,7 +90,7 @@ module RGeo
               assert_equal(2, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -110,7 +100,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_add_no_constraints_geometry_column
               klass_ = create_ar_class
@@ -124,7 +113,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Geometry, cols_[-2].geometric_type)
               assert_nil(cols_[-2].srid)
@@ -134,7 +123,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             def test_add_geography_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -147,7 +135,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -157,7 +145,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             def test_drop_geometry_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -171,11 +158,10 @@ module RGeo
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-1].geometric_type)
               assert_equal('latlon', cols_[-1].name)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-1].srid)
+              assert_equal(0, cols_[-1].srid)
               assert_equal(false, cols_[-1].geographic?)
             end
 
-
             def test_drop_geography_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -196,7 +182,6 @@ module RGeo
               assert_equal(false, cols_[-2].geographic?)
             end
 
-
             def test_create_simple_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -206,13 +191,12 @@ module RGeo
               col_ = klass_.columns.last
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(false, col_.geographic?)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
+              assert_equal(0, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_create_no_constraints_geometry_using_shortcut
               klass_ = create_ar_class
@@ -229,11 +213,9 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_simple_geography_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
-                # t_.method_missing(:geometry, 'latlon', :geographic => true)
                 t_.geometry 'latlon', :geographic => true
               end
               col_ = klass_.columns.last
@@ -244,7 +226,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_point_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -254,7 +235,6 @@ module RGeo
               assert(klass_.cached_attributes.include?('latlon'))
             end
 
-
             def test_create_geometry_with_options
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -273,7 +253,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_geometry_using_limit
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -292,11 +271,8 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
           end
-
         end
-
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-postgis
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord