activerecord-spatial 0.0.1 → 0.1.0

data/test/test_helper.rb

@@ -25,11 +25,12 @@ POSTGIS_PATHS = [
   '/usr/pgsql-*/share/contrib/postgis-*',
 ].compact
 
-puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
-puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
-puts "Geos library version #{Geos::VERSION}" if defined?(Geos::VERSION)
-puts "GEOS version #{Geos::GEOS_VERSION}"
-puts "GEOS extensions version #{Geos::GEOS_EXTENSIONS_VERSION}"
+puts "ActiveRecordSpatial #{ActiveRecordSpatial::VERSION}"
+puts "ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
+puts "Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
+puts "Geos library #{Geos::VERSION}" if defined?(Geos::VERSION)
+puts "GEOS #{Geos::GEOS_VERSION}"
+puts "GEOS extensions #{Geos::GEOS_EXTENSIONS_VERSION}"
 if defined?(Geos::FFIGeos)
   puts "Using #{Geos::FFIGeos.geos_library_paths.join(', ')}"
 end
@@ -174,10 +175,6 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
         klass = model.classify
 
         ActiveSupport::Dependencies.load_file(BASE_PATH.join("models/#{model}.rb"), [ klass ])
-
-        ActiveRecord::Base.silence do
-          fixtures model.pluralize
-        end
       end
     end
 
@@ -223,37 +220,49 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
       [ 0, 0 ]
     ], cs.to_a)
   end
+
+  # Starting with Rails 4, `order` scopes are prepended to prior scopes, so
+  # we need to account for both here.
+  def apply_id_order_scope(scope)
+    if ActiveRecord::VERSION::MAJOR >= 4
+      scope.unscoped.order('id').merge(scope)
+    else
+      scope.order('id')
+    end
+  end
 end
 
-module ActiveRecord
-  class SQLCounter
-    cattr_accessor :ignored_sql
-    self.ignored_sql = [
-      /^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
-      /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/,
-      /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/, /^ROLLBACK/, /\WFROM pg_/
-    ]
+if !defined?(ActiveRecord::SQLCounter)
+  module ActiveRecord
+    class SQLCounter
+      cattr_accessor :ignored_sql
+      self.ignored_sql = [
+        /^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
+        /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/,
+        /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/, /^ROLLBACK/, /\WFROM pg_/
+      ]
 
-    cattr_accessor :log
-    self.log = []
+      cattr_accessor :log
+      self.log = []
 
-    attr_reader :ignore
+      attr_reader :ignore
 
-    def initialize(ignore = self.class.ignored_sql)
-      @ignore   = ignore
-    end
+      def initialize(ignore = self.class.ignored_sql)
+        @ignore   = ignore
+      end
 
-    def call(name, start, finish, message_id, values)
-      sql = values[:sql]
+      def call(name, start, finish, message_id, values)
+        sql = values[:sql]
 
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
-      self.class.log << sql
+        # FIXME: this seems bad. we should probably have a better way to indicate
+        # the query was cached
+        return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
+        self.class.log << sql
+      end
     end
-  end
 
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+    ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+  end
 end
 
 class SpatialTestRunner < MiniTest::Reporters::SpecReporter

metadata

@@ -1,43 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spatial
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rails
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-  type: :runtime
-  prerelease: false
-  name: rails
 - !ruby/object:Gem::Dependency
+  name: geos-extensions
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0.dev
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0.dev
-  type: :runtime
-  prerelease: false
-  name: geos-extensions
 description: ActiveRecord Spatial gives AR the ability to work with PostGIS columns.
 email: code@zoocasa.com
 executables: []
@@ -62,6 +67,9 @@ files:
 - lib/activerecord-spatial/active_record/models/spatial_column.rb
 - lib/activerecord-spatial/active_record/models/spatial_ref_sys.rb
 - lib/activerecord-spatial/associations.rb
+- lib/activerecord-spatial/associations/active_record.rb
+- lib/activerecord-spatial/associations/active_record_3.rb
+- lib/activerecord-spatial/associations/base.rb
 - lib/activerecord-spatial/spatial_columns.rb
 - lib/activerecord-spatial/spatial_function.rb
 - lib/activerecord-spatial/spatial_scope_constants.rb
@@ -87,31 +95,33 @@ files:
 - test/models/foo3d.rb
 - test/models/foo_geography.rb
 - test/models/zortable.rb
+- test/spatial_function_tests.rb
 - test/spatial_scopes_geographies_tests.rb
 - test/spatial_scopes_tests.rb
 - test/test_helper.rb
 homepage: https://github.com/zoocasa/activerecord-spatial
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ActiveRecord Spatial gives AR the ability to work with PostGIS columns.
 test_files:
 - test/accessors_geographies_tests.rb
@@ -133,6 +143,7 @@ test_files:
 - test/models/foo3d.rb
 - test/models/foo_geography.rb
 - test/models/zortable.rb
+- test/spatial_function_tests.rb
 - test/spatial_scopes_geographies_tests.rb
 - test/spatial_scopes_tests.rb
 - test/test_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzVhNGNkYTg1MTBkYTM3MGFmYjI2NTBkOTEyMzRlNDhmZDZhMTM3ZQ==
-  data.tar.gz: !binary |-
-    MmUyYzQ0ZjU3ZDllYjhjOGFhNWY3ZmU5OTY1NDRkMjk2YzY1NmFlOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Yjk3MzU1MTllMzdkOWM4OWI2ZGQwNjUzYWQyMzI3ZTQ4MjAzNGRjZWYyN2Vi
-    YjNkYjZlYzAwNzk3MTFkZWEzMGMwMjNmODE2ZTgzYzI1NzFlNjEzMWIzZjRh
-    NjFlY2QxMzI1MTY5MTJiMTYzMzgwNGVjZWZjMDU2NTZlNWFhZGE=
-  data.tar.gz: !binary |-
-    OGI3NjI0ZDI5M2JjOWJiOWYxZDExYTJkMTNmMzg1NDYyNjZkZjhmZjA5NmIy
-    OGM4OTIxYWYxMTExYWQ3MGZjNmJkNmY0NTEzMzM4MTZlNTc2YTRjYjBhMDlm
-    NzgxOGIxYTUxMDQ0MGRhNTBhNjE0YzE4ZGQ4ZGU3YmQxMDBlNDI=