activerecord-postgres-earthdistance 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d72052be04de8547bb77665bcf6d489db976aa
-  data.tar.gz: 55a3171e669113183f6a48eb283a407c18e43221
+  metadata.gz: 693d1cb274f3a7106fbdc225fc4d837faec9cb35
+  data.tar.gz: 21874225968e12b05ca6e73acc6aa05bc3f860be
 SHA512:
-  metadata.gz: 98d50f7ed42fd9c3565214e1d610d3eff809b482039c0be4ae12c05b0a6e764c2ae26a28d97302d58055c31f200e807ff49b6c02660a9c9f3b4f6ec553fc2ab5
-  data.tar.gz: e0752d90060076c92e23a5c40768260840d085755fe25c7d19656aa21289c1d1d4560adfd9b7984eb6f2da66e2008c74cb6ff136977d935ed72e5b74edf19efe
+  metadata.gz: 8e93b59b3ecf2e5fcb2bf68d813d5fd6702a1f19a7b7850e36ef42911249c72ed60b0b0f8b7032979e5b986a2ccb97b4e52962b1f7fcaa0b532d79c901e4475c
+  data.tar.gz: daf84e9742146cb893ec708e85390f65d398ebefab8959621774530ebd72b6e9b6cd475acc4306d6377779c90cd02a5a87e8e28aee516d9f5ecd083828a6091b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-postgres-earthdistance (0.4.2)
+    activerecord-postgres-earthdistance (0.4.3)
       pg
       rails (>= 3.1)
       rake
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.2)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -62,19 +62,19 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pg (0.18.2)
-    rack (1.6.2)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -84,9 +84,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -101,7 +101,7 @@ GEM
     rspec-mocks (2.99.3)
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

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.2"
+  s.version = "0.4.3"
 
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"

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

@@ -12,30 +12,31 @@ module ActiveRecordPostgresEarthdistance
       end
 
       def within_box(radius, lat, lng)
-        earth_box = Arel::Nodes::NamedFunction.new('earth_box', [ll_to_earth_coords(lat, lng), quote_value(radius)])
-        where Arel::Nodes::InfixOperation.new('<@', ll_to_earth_columns, earth_box)
+        earth_box = Arel::Nodes::NamedFunction.new('earth_box', [Utils.ll_to_earth_coords(lat, lng), Utils.quote_value(radius)])
+        where Arel::Nodes::InfixOperation.new('<@', Utils.ll_to_earth_columns(self), 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, quote_value(radius)))
+        earth_distance = Arel::Nodes::NamedFunction.new('earth_distance', [Utils.ll_to_earth_columns(self), Utils.ll_to_earth_coords(lat, lng)])
+        within_box(radius, lat, lng).where(Arel::Nodes::InfixOperation.new('<=', earth_distance, Utils.quote_value(radius)))
       end
 
       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)])
+        earth_distance = Arel::Nodes::NamedFunction.new('earth_distance', [Utils.ll_to_earth_columns(self), Utils.ll_to_earth_coords(lat, lng)])
         order("#{earth_distance.to_sql} #{order.to_s}")
       end
+    end
 
-      protected
-      def ll_to_earth_columns
-        Arel::Nodes::NamedFunction.new('ll_to_earth', [arel_table[self.latitude_column], arel_table[self.longitude_column]])
+    module Utils
+      def self.ll_to_earth_columns(klass)
+        Arel::Nodes::NamedFunction.new('ll_to_earth', [klass.arel_table[klass.latitude_column], klass.arel_table[klass.longitude_column]])
       end
 
-      def ll_to_earth_coords lat, lng
+      def self.ll_to_earth_coords lat, lng
         Arel::Nodes::NamedFunction.new('ll_to_earth', [quote_value(lat), quote_value(lng)])
       end
 
-      def quote_value value
+      def self.quote_value value
         if Arel::Nodes.respond_to?(:build_quoted) # for arel >= 6.0.0
           Arel::Nodes.build_quoted(value)
         else
@@ -55,6 +56,7 @@ module ActiveRecordPostgresEarthdistance
       end
     end
   end
+
 end
 
 ActiveRecord::Base.send :include, ActiveRecordPostgresEarthdistance::ActsAsGeolocated

data/spec/act_as_geolocated_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe "ActiveRecord::Base.act_as_geolocated" do
+  describe 'ActiveRecord::Base' do
+    context "when using .where with a model instance as a placeholder" do
+      let(:place) { Place.create! }
+      subject { Place.where('id = ?', place).first }
+      after { place.destroy! }
+
+      it { should == place }
+    end
+  end
+
   describe "#within_box" do
     let(:test_data) { { lat: nil, lng: nil, radius: nil } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-earthdistance
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails