activerecord-postgis-adapter 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da85e153ac728aed4dd05c63c31db2b8408db33
-  data.tar.gz: e1fb8123e8ac236ff5299d19f691147a510f9d22
+  metadata.gz: 4134b225eb23433b9805a83ec978ae7fe5c9ee5b
+  data.tar.gz: 7cd3ca0bea4ccd9c6b51a0e6eb646e82acc55eb0
 SHA512:
-  metadata.gz: b6af550d08c16c0eff95249fc80e08eb9aabf59e1cfac0c163edd43506ee6c6887b6acba7e7eac4f6ca3f63a6052f4479ba3337c48c4cbdfce88d21cf0874de8
-  data.tar.gz: 9bbe835d52ed5d41f91c1d22e58564775f7c200d52ea772a7818c9987456949fbffa7393e81ad20acec16edd6ccae52b1b95363f3403a920e046f810e3451ee6
+  metadata.gz: fff96e4437bda957061ef02a4ef9bcb7bd34463387947f39f4de46efddd00212724f54977460f6e796f938b51ef0ae840fde8f45df974a61f048d9304c05cd4f
+  data.tar.gz: ed3977486ef32fe77dc7e62bbfff5ed96af537f8f6c9509218a3ea3cb25770d5e05d86fa57b006fce32a65994185b951f8287b1a03f92d572684ed2aa304a6c3

data/lib/active_record/connection_adapters/postgis_adapter/oid/spatial.rb

@@ -100,12 +100,12 @@ module ActiveRecord
             nil
           end
 
-          def binary?(string)
+          def binary_string?(string)
             string[0] == "\x00" || string[0] == "\x01" || string[0, 4] =~ /[0-9a-fA-F]{4}/
           end
 
           def wkt_parser(factory, string)
-            if binary?(string)
+            if binary_string?(string)
               RGeo::WKRep::WKBParser.new(factory, support_ewkb: true, default_srid: @srid)
             else
               RGeo::WKRep::WKTParser.new(factory, support_ewkt: true, default_srid: @srid)

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

@@ -44,13 +44,20 @@ module ActiveRecord  # :nodoc:
                     :geometric_type,
                     :has_m,
                     :has_z,
-                    :limit, # override
                     :srid
 
         alias :geographic? :geographic
         alias :has_z? :has_z
         alias :has_m? :has_m
 
+        def limit
+          if spatial?
+            @limit
+          else
+            super
+          end
+        end
+
         def spatial?
           cast_type.respond_to?(:spatial?) && cast_type.spatial?
         end

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

@@ -12,14 +12,15 @@ module ActiveRecord  # :nodoc:
         # super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L320
         def new_column_definition(name, type, options)
           if (info = MainAdapter.spatial_column_options(type.to_sym))
+            if (limit = options.delete(:limit))
+              options.merge!(limit) if limit.is_a?(::Hash)
+            end
+
             geo_type = ColumnDefinition.geo_type(options[:type] || type || info[:type])
             base_type = info[:type] || (options[:geographic] ? :geography : :geometry)
 
             # puts name.dup << " - " << type.to_s << " - " << options.to_s << " :: " << geo_type.to_s << " - " << base_type.to_s
 
-            if (limit = options.delete(:limit))
-              options.merge!(limit) if limit.is_a?(::Hash)
-            end
             if options[:geographic]
               options[:limit] = ColumnDefinition.options_to_limit(geo_type, options)
             end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = '3.0.0.beta1'.freeze
+      VERSION = '3.0.0.beta2'.freeze
     end
   end
 end

data/test/ddl_test.rb

@@ -270,6 +270,24 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     assert_equal false, klass.columns[-1].array
   end
 
+  def test_reload_dumped_schema
+    klass.connection.create_table(:spatial_models, force: true) do |t|
+      t.geography "latlon1", limit: {:srid=>4326, :type=>"point", :geographic=>true}
+    end
+    klass.reset_column_information
+    col = klass.columns.last
+    assert_equal 4326, col.srid
+  end
+
+  def test_non_spatial_column_limits
+    klass.connection.create_table(:spatial_models, force: true) do |t|
+      t.string :foo, limit: 123
+    end
+    klass.reset_column_information
+    col = klass.columns.last
+    assert_equal 123, col.limit
+  end
+
   private
 
   def klass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord