activerecord-postgres-earthdistance 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9458af5bee1a6c5416b450109d62aa9888f37d7
-  data.tar.gz: 52a8f7eb26951d8c77f3b1332b630ed5978f560f
+  metadata.gz: ba84eef72063d43d8409981a0de2169081953159
+  data.tar.gz: 8d9775c25f7dbafe1df807816c9e1e72dca92718
 SHA512:
-  metadata.gz: 7e53a9aa32535c9ffd538d28221f99618f7497add3a8b6f4f63b38c4fee66e05feb6d0ae420c0ecec8bf8f4dbb7271564b586751a139c49be7f39d06e9e7642c
-  data.tar.gz: 895a6791fdd7d3a6ed3b73b70254a136cb119517f0dc5ba341c0e7a1f02aee61aa34d3915ee68412cfeaa06cc42a2c192d9bded4600e2fdb6edf2a12d2c382d5
+  metadata.gz: ef50f5bba44fa8612cb55f3837dedb9fd1a66990d6a44fbfe000aafebb341d5b98899c54f739af4dbcec95b7b29ee27b60a2797b95d215b2061d5383124e8622
+  data.tar.gz: 84f152880d57a62d38aff7ec1d1f04b45882b3019deb74abb2e4381a2940a110a61cfd61c4315bcc5cfce26696ff825367acec64bdd88a96ff3e53f73a7bbd55

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-postgres-earthdistance (0.4.0)
+    activerecord-postgres-earthdistance (0.4.1)
       pg
       rails (>= 3.1)
       rake
@@ -9,61 +9,84 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.11)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
     json (1.8.1)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    minitest (5.4.3)
-    multi_json (1.10.1)
-    pg (0.17.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pg (0.18.2)
+    rack (1.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
-      sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -77,18 +100,14 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.2)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/README.md

@@ -45,9 +45,13 @@ Edit the created migration:
 
 ```ruby
 class AddIndexToPlaces < ActiveRecord::Migration
-  def change
+  def up
     add_earthdistance_index :places
   end
+
+  def down
+    remove_earthdistance_index :places
+  end
 end
 ```
 

data/activerecord-postgres-earthdistance.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-earthdistance"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"

data/lib/activerecord-postgres-earthdistance/activerecord.rb

@@ -4,13 +4,14 @@ module ActiveRecord
   module ConnectionAdapters
     module SchemaStatements
 
-      # Installs hstore by creating the Postgres extension
-      # if it does not exist
-      #
       def add_earthdistance_index table_name, options = {}
         execute "CREATE INDEX %s_earthdistance_ix ON %s USING gist (ll_to_earth(%s, %s));" %
           [table_name, table_name, (options[:lat] || 'lat'), (options[:lng] || 'lng')]
       end
+
+      def remove_earthdistance_index table_name
+        execute "DROP INDEX %s_earthdistance_ix;" % [table_name]
+      end
     end
   end
 end

data/lib/activerecord-postgres-earthdistance/acts_as_geolocated.rb

@@ -2,9 +2,6 @@ module ActiveRecordPostgresEarthdistance
   module ActsAsGeolocated
     extend ActiveSupport::Concern
 
-    included do
-    end
-
     module ClassMethods
       def acts_as_geolocated(options = {})
         if table_exists?
@@ -14,16 +11,32 @@ module ActiveRecordPostgresEarthdistance
         end
       end
 
-      def within_box radius, lat, lng
-        where("ll_to_earth(#{self.latitude_column}, #{self.longitude_column}) <@ earth_box(ll_to_earth(?, ?), ?)", lat, lng, radius)
+      def within_box(radius, lat, lng)
+        earth_box = Arel::Nodes::NamedFunction.new('earth_box', [ll_to_earth_coords(lat, lng), radius])
+        where Arel::Nodes::InfixOperation.new('<@', ll_to_earth_columns, earth_box)
+      end
+
+      def within_radius(radius, lat, lng)
+        earth_distance = Arel::Nodes::NamedFunction.new('earth_distance', [ll_to_earth_columns, ll_to_earth_coords(lat, lng)])
+        within_box(radius, lat, lng).where(Arel::Nodes::InfixOperation.new('<=', earth_distance, radius))
       end
 
-      def within_radius radius, lat, lng
-        within_box(radius, lat, lng).where("earth_distance(ll_to_earth(#{self.latitude_column}, #{self.longitude_column}), ll_to_earth(?, ?)) <= ?", lat, lng, radius)
+      def order_by_distance(lat, lng, order = "ASC")
+        earth_distance = Arel::Nodes::NamedFunction.new('earth_distance', [ll_to_earth_columns, ll_to_earth_coords(lat, lng)])
+        order("#{earth_distance.to_sql} #{order.to_s}")
       end
 
-      def order_by_distance lat, lng, order= "ASC"
-        order("earth_distance(ll_to_earth(#{self.latitude_column}, #{self.longitude_column}), ll_to_earth(#{lat}, #{lng})) #{order}")
+      protected
+      def ll_to_earth_columns
+        Arel::Nodes::NamedFunction.new('ll_to_earth', [arel_table[self.latitude_column], arel_table[self.longitude_column]])
+      end
+
+      def ll_to_earth_coords lat, lng
+        if Arel::Nodes.respond_to?(:build_quoted) # for arel >= 6.0.0
+          Arel::Nodes::NamedFunction.new('ll_to_earth', [Arel::Nodes.build_quoted(lat), Arel::Nodes.build_quoted(lng)])
+        else
+          Arel::Nodes::NamedFunction.new('ll_to_earth', [lat, lng])
+        end
       end
     end
   end
@@ -38,7 +51,6 @@ module ActiveRecordPostgresEarthdistance
       end
     end
   end
-
 end
 
 ActiveRecord::Base.send :include, ActiveRecordPostgresEarthdistance::ActsAsGeolocated

data/spec/act_as_geolocated_spec.rb

@@ -39,6 +39,21 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       let(:test_data) { { radius: 1000, lat: -27.5969039, lng: -48.5494544 } }
       it { should be_empty }
     end
+
+    context "when joining tables that are also geoloacted" do
+      let(:test_data) { { radius: 1000, lat: -27.5969039, lng: -48.5494544 } }
+
+      subject { Place.within_box(test_data[:radius], test_data[:lat], test_data[:lng]) }
+
+      it "should work with objects having columns with the same name" do
+        expect { Place.joins(:events).within_radius(test_data[:radius], test_data[:lat], test_data[:lng]).to_a }.to_not raise_error
+
+      end
+
+      it "should work with nested associations" do
+        expect { Event.joins(:events).within_radius(test_data[:radius], test_data[:lat], test_data[:lng]).to_a }.to_not raise_error
+      end
+    end
   end
 
   describe "#within_radius" do

data/spec/fixtures/event.rb

@@ -0,0 +1,5 @@
+class Event < ActiveRecord::Base
+  acts_as_geolocated
+  belongs_to :place
+  has_many :events
+end

data/spec/fixtures/place.rb

@@ -1,3 +1,4 @@
 class Place < ActiveRecord::Base
   acts_as_geolocated
+  has_many :events
 end

data/spec/spec_helper.rb

@@ -23,7 +23,9 @@ RSpec.configure do |config|
         CREATE EXTENSION IF NOT EXISTS cube;
         CREATE EXTENSION IF NOT EXISTS earthdistance;
         DROP TABLE IF EXISTS places;
+        DROP TABLE IF EXISTS events;
         CREATE TABLE places (id serial PRIMARY KEY, data text, lat float8, lng float8);
+        CREATE TABLE events (id serial PRIMARY KEY, event_id integer, place_id integer, data text, lat float8, lng float8);
 }
     rescue Exception => e
       puts "Exception: #{e}"
@@ -39,8 +41,9 @@ RSpec.configure do |config|
       retry
     end
 
-    # Load model used in spec
+    # Load models used in spec
     require 'fixtures/place'
+    require 'fixtures/event'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-earthdistance
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,6 +120,7 @@ files:
 - lib/templates/earthdistance.sql
 - lib/templates/setup_earthdistance.rb
 - spec/act_as_geolocated_spec.rb
+- spec/fixtures/event.rb
 - spec/fixtures/place.rb
 - spec/spec_helper.rb
 homepage: http://github.com/diogob/activerecord-postgres-earthdistance
@@ -142,11 +143,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Check distances with latitude and longitude using PostgreSQL special indexes
 test_files:
 - spec/act_as_geolocated_spec.rb
+- spec/fixtures/event.rb
 - spec/fixtures/place.rb
 - spec/spec_helper.rb