activerecord-postgres-earthdistance 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66511eae5a8cb2b504b1040cb1339974295916c5
-  data.tar.gz: 2700f96a4817f91aeee66f461cc80638b56fb44b
+  metadata.gz: 94eb40debf0a4955024e1c8c4213b88530b294b1
+  data.tar.gz: ec0ec0eb7d2472ebe8bad60197bbf0a7b45f1d36
 SHA512:
-  metadata.gz: f44686c1e06bb4d226a2c6327d1b604b060bb6437d54361de421ead725fe90adb2c3071c493dd6b3a6aecdda81da9cbb1d852ec2996060d219fecfd91d555893
-  data.tar.gz: b5bf876569b00f5ef302bbabc4199f143fb59d22841999f2778fee56680dc6f67f2ae560f35d475b90e3dc8334a04a9fd27f6636459ea2eca24acb88333734f6
+  metadata.gz: c9818e3e89ae5b0906c30fa097b26eb7445541541dbce5b31e633641f13d8a1ba797c500f4e420b0b6fad88315914e35c345971540043626ef1d1b589f5ecc35
+  data.tar.gz: b6dfb3232de9828d812589a01a4f199ee36af6dbdda53064373253e5000370982465eec956f122e9efcdb3fdb9029f1c24e3e5cc820653146d01f56208ae5384

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-postgres-earthdistance (0.5.1)
+    activerecord-postgres-earthdistance (0.5.2)
       activerecord (>= 3.1)
       pg
       rake
@@ -9,44 +9,47 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.1)
     method_source (0.8.2)
-    minitest (5.9.1)
-    pg (0.19.0)
+    minitest (5.10.1)
+    pg (0.20.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (11.3.0)
-    rdoc (4.2.1)
-      json (~> 1.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -57,7 +60,7 @@ DEPENDENCIES
   bundler
   pry
   rdoc
-  rspec (~> 2.11)
+  rspec
 
 BUNDLED WITH
-   1.13.6
+   1.14.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.5.1"
+  s.version = "0.5.2"
 
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "pg"
   s.add_development_dependency "bundler"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "rspec", "~> 2.11"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "pry"
 
   git_files            = begin

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

@@ -37,8 +37,6 @@ module ActiveRecordPostgresEarthdistance
         joins(through_table).order("#{earth_distance.to_sql} #{order}")
       end
 
-      private
-
       def through_table_klass
         if through_table.present?
           reflections[through_table.to_s].klass
@@ -84,11 +82,12 @@ module ActiveRecordPostgresEarthdistance
   module QueryMethods
     def selecting_distance_from(lat, lng, name = "distance", include_default_columns = true)
       clone.tap do |relation|
+        relation.joins!(through_table)
         values = []
         if relation.select_values.empty? && include_default_columns
           values << relation.arel_table[Arel.star]
         end
-        values << Utils.earth_distance(self, lat, lng, name)
+        values << Utils.earth_distance(through_table_klass, lat, lng, name)
 
         relation.select_values = values
       end

data/spec/act_as_geolocated_spec.rb

@@ -7,7 +7,7 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       subject { Place.where("id = ?", place).first }
       after { place.destroy! }
 
-      it { should == place }
+      it { is_expected.to eq place }
     end
   end
 
@@ -20,34 +20,34 @@ describe "ActiveRecord::Base.act_as_geolocated" do
     after(:all) { @place.destroy }
 
     context "when query with null data" do
-      it { should be_empty }
+      it { is_expected.to be_empty }
     end
 
     context "when query for the exact same point with radius 0" do
       let(:test_data) { { lat: -30.0277041, lng: -51.2287346, radius: 0 } }
 
-      it { should == [@place] }
+      it { is_expected.to eq [@place] }
     end
 
     context "when query for place within the box" do
       let(:test_data) { { radius: 4_000_000, lat: -27.5969039, lng: -48.5494544 } }
 
-      it { should == [@place] }
+      it { is_expected.to eq [@place] }
     end
 
     context "when query for place within the box, but outside the radius" do
       let(:test_data) { { radius: 300_000, lat: -27.5969039, lng: -48.5494544 } }
 
       it "the place shouldn't be within the radius" do
-        Place.within_radius(test_data[:radius], test_data[:lat], test_data[:lng]).should be_empty
+        expect(Place.within_radius(test_data[:radius], test_data[:lat], test_data[:lng])).to be_empty
       end
 
-      it { should == [@place] }
+      it { is_expected.to eq [@place] }
     end
 
     context "when query for place outside the box" do
       let(:test_data) { { radius: 1000, lat: -27.5969039, lng: -48.5494544 } }
-      it { should be_empty }
+      it { is_expected.to be_empty }
     end
 
     context "when joining tables that are also geoloacted" do
@@ -85,22 +85,22 @@ describe "ActiveRecord::Base.act_as_geolocated" do
     end
 
     context "when query with null data" do
-      it { should == [] }
+      it { is_expected.to eq [] }
     end
 
     context "when query for the exact same point with radius 0" do
       let(:test_data) { { lat: -30.0277041, lng: -51.2287346, radius: 0 } }
-      it { should == [@place] }
+      it { is_expected.to eq [@place] }
     end
 
     context "when query for place within radius" do
       let(:test_data) { { radius: 4_000_000, lat: -27.5969039, lng: -48.5494544 } }
-      it { should == [@place] }
+      it { is_expected.to eq [@place] }
     end
 
     context "when query for place outside the radius" do
       let(:test_data) { { radius: 1000, lat: -27.5969039, lng: -48.5494544 } }
-      it { should == [] }
+      it { is_expected.to eq [] }
     end
 
     context "uses lat and long of through table" do
@@ -119,22 +119,22 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       end
 
       context "when query with null data" do
-        it { should == [] }
+        it { is_expected.to eq [] }
       end
 
       context "when query for the exact same point with radius 0" do
         let(:test_data) { { lat: -30.0277041, lng: -51.2287346, radius: 0 } }
-        it { should == [@job] }
+        it { is_expected.to eq [@job] }
       end
 
       context "when query for place within radius" do
         let(:test_data) { { radius: 4_000_000, lat: -27.5969039, lng: -48.5494544 } }
-        it { should == [@job] }
+        it { is_expected.to eq [@job] }
       end
 
       context "when query for place outside the radius" do
         let(:test_data) { { radius: 1000, lat: -27.5969039, lng: -48.5494544 } }
-        it { should == [] }
+        it { is_expected.to eq [] }
       end
     end
   end
@@ -168,17 +168,17 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       end
 
       let(:current_location) { { lat: 51.511214, lng: 0.119824 } } # London
-      it { should == [@amsterdam_job, @berlin_job] }
+      it { is_expected.to eq [@amsterdam_job, @berlin_job] }
     end
 
     context "when sorting on distance" do
       let(:current_location) { { lat: 51.511214, lng: 0.119824 } } # London
-      it { should == [@amsterdam, @berlin] }
+      it { is_expected.to eq [@amsterdam, @berlin] }
     end
 
     context "when sorting on distance from another location" do
       let(:current_location) { { lat: 52.229676, lng: 21.012229 } } # Warsaw
-      it { should == [@berlin, @amsterdam] }
+      it { is_expected.to eq [@berlin, @amsterdam] }
     end
   end
 
@@ -199,7 +199,26 @@ describe "ActiveRecord::Base.act_as_geolocated" do
     end
     context "when selecting distance" do
       let(:current_location) { { lat: 52.229676, lng: 21.012229 } } # Warsaw
-      it { should == ["Amsterdam", 1_095_013.87438311] }
+      it { is_expected.to eq ["Amsterdam", 1_095_013.87438311] }
+    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

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "rspec"
-require "rspec/autorun"
 require "activerecord-postgres-earthdistance"
 require "active_record"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-earthdistance
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement