activerecord-postgres-earthdistance 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49e3fc1de6b2ece19a9479d5276208b3b0219d14
-  data.tar.gz: 218459e70fbd4a1086a20b93545d30b1d7df828d
+  metadata.gz: 1c47a1398981c4a66255e7539712df6343c33791
+  data.tar.gz: 2ff076ca1b78a76daa37b915dbe5b15c02b2f904
 SHA512:
-  metadata.gz: 83e61e7ff6ec64126fb22fd32397a9711e03010e67eeb545c9aa6d5ce90760ca9b497f6d0e35b8cb8de3063f21bec45c02228bda5b50e079abd716e2d293a3c5
-  data.tar.gz: f9695b98ed7528a2132b2b355dd56b2f8facf98233b78c7a87c604a5355968e1473aaa7d0dded4473b9792b83745dbf6bfce829af72a52ebbc65523a668e1c56
+  metadata.gz: 01d68f1a5c84ccc17dda51536625e38ef64f790214035cccad2c9b359c8889bad9837f31e108fb307fb02baf54a6ad7418322d518a43b888ba80d880cf511daf
+  data.tar.gz: '0719bc8b1e9c9f8dddb2610536868f6b8027eb3adc8fa19d640c3d2df89a4f73ccb1533f405c40f57c10c866575e27198cf881eb023ed6934958aa890cefcaff'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-postgres-earthdistance (0.6.0)
+    activerecord-postgres-earthdistance (0.7.0)
       activerecord (>= 3.1)
       pg
       rake
@@ -9,22 +9,22 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activesupport (5.1.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
+    arel (9.0.0)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     method_source (0.8.2)
     minitest (5.11.3)

data/activerecord-postgres-earthdistance.gemspec

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

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

@@ -1,9 +1,10 @@
 module ActiveRecordPostgresEarthdistance
+  MILES_TO_METERS_FACTOR = 1609.344
   module ActsAsGeolocated
     extend ActiveSupport::Concern
+    
 
-    module ClassMethods
-      MILES_TO_METERS_FACTOR = 1609.344
+    module ClassMethods  
       def acts_as_geolocated(options = {})
         if table_exists?
           cattr_accessor :latitude_column, :longitude_column, :through_table, :distance_unit
@@ -43,7 +44,7 @@ module ActiveRecordPostgresEarthdistance
 
       def order_by_distance(lat, lng, order = "ASC")
         earth_distance = Utils.earth_distance(through_table_klass, lat, lng)
-        joins(through_table).order("#{earth_distance.to_sql} #{order}")
+        joins(through_table).order(Arel.sql("#{earth_distance.to_sql} #{order}"))
       end
 
       def through_table_klass
@@ -96,7 +97,12 @@ module ActiveRecordPostgresEarthdistance
         if relation.select_values.empty? && include_default_columns
           values << relation.arel_table[Arel.star]
         end
-        values << Utils.earth_distance(through_table_klass, lat, lng, name)
+        distances = Utils.earth_distance(through_table_klass, lat, lng, name)
+        distances = Arel::Nodes::Multiplication.new(
+          Utils.quote_value(1 / MILES_TO_METERS_FACTOR), distances
+        ) if relation.distance_unit === :miles
+
+        values << distances
 
         relation.select_values = values
       end

data/spec/act_as_geolocated_spec.rb

@@ -358,4 +358,46 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       end
     end
   end
+
+  describe "#selecting_distance_from with miles" do
+    let(:current_location) { { lat: nil, lng: nil, radius: nil } }
+    subject do
+      Place
+        .order_by_distance(current_location[:lat], current_location[:lng])
+        .selecting_distance_from(current_location[:lat], current_location[:lng])
+        .first
+        .try { |p| [p.data, p.distance.to_f] }
+    end
+    before(:all) do
+      Place.acts_as_geolocated distance_unit: :miles
+      @place = Place.create!(data: "Amsterdam", lat: 52.370216, lng: 4.895168) # Amsterdam
+    end
+    after(:all) do
+      Place.acts_as_geolocated
+      @place.destroy
+    end
+    context "when selecting distance" do
+      let(:current_location) { { lat: 52.229676, lng: 21.012229 } } # Warsaw
+      it { is_expected.to eq ["Amsterdam", 680.410076641856] }
+    end
+
+    context "through table" do
+
+      subject { Job.all.selecting_distance_from(current_location[:lat], current_location[:lng]).first }
+
+      before(:all) do
+        @event = Event.create!(lat: -30.0277041, lng: -51.2287346)
+        @job = Job.create!(event: @event)
+      end
+
+      after(:all) do
+        @event.destroy
+        @job.destroy
+      end
+
+      context "when selecting distance" do
+        it { is_expected.to respond_to :distance }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-earthdistance
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord