more jeweler

nofxx · Apr 23, 2009 · 68bb1f1 · 68bb1f1
1 parent 25f97dd
commit 68bb1f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/lib/postgis_adapter.rb b/lib/postgis_adapter.rb
@@ -18,10 +18,6 @@
 include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
-module PostgisAdapter
-  VERSION = '0.3.5'
-end
-
 #tables to ignore in migration : relative to PostGIS management of geometric columns
 ActiveRecord::SchemaDumper.ignore_tables << "spatial_ref_sys" << "geometry_columns"
 

diff --git a/spec/postgis_functions_spec.rb b/spec/postgis_functions_spec.rb
@@ -2,7 +2,6 @@
 
 describe "PostgisFunctions" do
   before(:all) do
-    #load_schema
     @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,42],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[-43,-20],[-42,-28]],4326))
     @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -6,15 +6,10 @@
 
 gem 'activerecord', "=2.3.2"
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
+require 'postgis_adapter'
+
 config = YAML.load_file(File.dirname(__FILE__) + '/db/database_postgis.yml')
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config)
-
-require File.dirname(__FILE__) + '/../init.rb'
 require File.dirname(__FILE__) + '/db/models_postgis.rb'
-
-def load_schema
-  load(File.dirname(__FILE__) + "/db/schema_postgis.rb")
-end
-