postgis_adapter 0.7.1 → 0.7.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Spatial Adapter Copyright (c) 2006 Guilhem Vellut <guilhem.vellut+georuby@gmail.com>
+Spatial Adapter Copyright (c) 2006 Guilhem Vellut <guilhem.vellut+georuby@gmail.com>
 PostGis Adapter Functions (c) 2008 Marcos Piccinini <nofxx>
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.rdoc

@@ -57,6 +57,13 @@ in ruby schema mode and loaded in migrations the same way as columns
 of basic types.
 
 
+=== Example App
+
+Simple rails app to demonstrate, check it out:
+
+http://github.com/nofxx/postgis_example
+
+
 === Model
 
     class TablePoint < ActiveRecord::Base

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = "Execute PostGIS functions on Active Record"
     gem.email = "x@nofxx.com"
     gem.homepage = "http://github.com/nofxx/postgis_adapter"
-    gem.authors = ["Marcos Augusto"]
+    gem.authors = ["Marcos Piccinini"]
     gem.rubyforge_project = "postgis_adapter"
     # TODO: better way for this.....
     #    gem.add_dependency 'geo_ruby'

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/postgis_adapter.rb

@@ -243,7 +243,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
           ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default,raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
         end
       else
-        ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new(name, ActiveRecord::ConnectionAdapters::PostgreSQLColumn.extract_value_from_default( default), type, notnull == "f")
+        ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new(name, default, type, notnull == "f")
       end
     end
   end

data/postgis_adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Augusto"]
-  s.date = %q{2009-10-10}
+  s.authors = ["Marcos Piccinini"]
+  s.date = %q{2009-10-18}
   s.description = %q{Execute PostGIS functions on Active Record}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [

data/rails/init.rb

@@ -3,6 +3,7 @@ end
 
 unless ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
   raise SpatialAdapterNotCompatibleError.
-    new("Only PostgreSQL with PostGIS is supported by the postgis adapter plugin.")
+    new("Database config file not set or it does not map to PostgreSQL\n" +
+        "Only PostgreSQL with PostGIS is supported by postgis_adapter.")
 end
 require 'postgis_adapter'

data/spec/postgis_adapter_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe "PostgisAdapter" do
@@ -150,8 +151,8 @@ describe "PostgisAdapter" do
       pts = Area.find_all_by_geom(LineString.from_coordinates([[0,0],[2,2]],4326))
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
-      pts[0].data.should match /Point/
-      pts[1].data.should match /Point/
+      pts[0].data.should match(/Point/)
+      pts[1].data.should match(/Point/)
     end
 
     it "should find by geom again" do
@@ -163,8 +164,8 @@ describe "PostgisAdapter" do
       pts = Area.find_all_by_geom([[0,0],[2,2],4326])
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
-      pts[0].data.should match /Point/
-      pts[1].data.should match /Point/
+      pts[0].data.should match(/Point/)
+      pts[1].data.should match(/Point/)
     end
 
     it "should not mess with rails finder" do
@@ -174,4 +175,50 @@ describe "PostgisAdapter" do
 
   end
 
+  describe "PostgreSQL-specific types and default values" do
+
+    # Verify that a non-NULL column with a default value is handled correctly.
+    # Additionally, if the database uses UTF8 encoding, set the binary (bytea)
+    # column value to an illegal UTF8 string; it should be stored as the
+    # specified binary string and not as a text string. (The binary data test
+    # cannot fail if the database uses SQL_ASCII or LATIN1 encoding.)
+
+    ActiveRecord::Schema.define() do
+      create_table :binary_defaults, :force => true do |t|
+        t.string :name, :null => false
+        t.string :data, :null => false, :default => ''
+        t.binary :value
+      end
+    end
+
+    class BinaryDefault < ActiveRecord::Base
+    end
+
+    it "should create some records" do
+      if BinaryDefault.connection.encoding == "UTF8"
+        BinaryDefault.create!(:name => "foo", :data => "baz",
+                              :value => "f\xf4o") # fôo as ISO-8859-1 (i.e., not valid UTF-8 data)
+        BinaryDefault.create!(:name => "bar",     # data value not specified, should use default
+                              :value => "b\xe5r") # bår as ISO-8859-1 (i.e., not valid UTF-8 data)
+      else
+        BinaryDefault.create!(:name => "foo", :data => "baz")
+        BinaryDefault.create!(:name => "bar")
+      end
+    end
+
+    it "should find the records" do
+      foo = BinaryDefault.find_by_name("foo")
+      bar = BinaryDefault.find_by_name("bar")
+
+      foo.data.should eql("baz")
+      bar.data.should eql("")
+
+      if BinaryDefault.connection.encoding == "UTF8"
+        foo.value.should eql("f\xf4o")
+        bar.value.should eql("b\xe5r")
+      end
+    end
+
+  end
+
 end

data/spec/spec.opts

@@ -1,4 +1,4 @@
---colour
---format profile
---timeout 20
+--colour
+--format profile
+--timeout 20
 --diff

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'pg'
 require 'activerecord'
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 gem 'activerecord', "=2.3.4"
+gem 'nofxx-georuby'
 require 'postgis_adapter'
 
 # Monkey patch Schema.define logger

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
-- Marcos Augusto
+- Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -03:00
+date: 2009-10-18 01:00:00 -02:00
 default_executable: 
 dependencies: []