activerecord-postgres-earthdistance 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e87b2bf7fbe3af69b42a9a578f5f3adf8967acd
+  data.tar.gz: ab06b2bdaf4422c238ed5fd3d666c348c1569a4c
+SHA512:
+  metadata.gz: a382568c1c7e968ae804c70da525e3e2185c6aa69dd338d5bd57a72e7512367e6f45a7f89d2821d83fbdc26edaba0e698c03961de25aac677a3e92aacdac57a8
+  data.tar.gz: e737a628e1f27075b92e7257cd9186274749f3e551845c3a5a42f7fca7bad0e1e50b25073e974a0177263bb2caaa959b3b7ac5ecdcfa36b48680c9dd3b592812

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-postgres-earthdistance (0.2.0)
+    activerecord-postgres-earthdistance (0.3.0)
       pg
       rails (>= 3.1)
       rake
@@ -9,72 +9,63 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
+    actionmailer (4.0.1)
+      actionpack (= 4.0.1)
+      mail (~> 2.5.4)
+    actionpack (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
+    hike (1.2.3)
+    i18n (0.6.5)
     json (1.7.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.20.1)
-    multi_json (1.5.0)
-    pg (0.14.1)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    pg (0.17.0)
     polyglot (0.3.3)
-    rack (1.4.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
-      bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.1)
+      actionmailer (= 4.0.1)
+      actionpack (= 4.0.1)
+      activerecord (= 4.0.1)
+      activesupport (= 4.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.1)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.1)
+      actionpack (= 4.0.1)
+      activesupport (= 4.0.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.12.0)
@@ -85,17 +76,23 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    sprockets (2.2.2)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,4 +1,4 @@
-#ActiveRecord + PostgreSQL Earthdistance [![Build Status](https://secure.travis-ci.org/softa/activerecord-postgres-earthdistance.png?branch=master)](http://travis-ci.org/softa/activerecord-postgres-earthdistance)
+#ActiveRecord + PostgreSQL Earthdistance [![Build Status](https://travis-ci.org/diogob/activerecord-postgres-earthdistance.png?branch=master)](https://travis-ci.org/diogob/activerecord-postgres-earthdistance)
 
 Check distances with latitude and longitude using PostgreSQL special indexes.
 This gem enables your model to query the database using the earthdistance extension. This should be much faster than using trigonometry functions over standart indexs.
@@ -47,7 +47,7 @@ Edit the created migration:
 class AddIndexToPlaces < ActiveRecord::Migration
   def change
     add_earthdistance_index :places
-  end 
+  end
 end
 ```
 
@@ -89,6 +89,11 @@ To query for all places within a given radius of 100 meters from the origin 30,5
 Place.within_radius(500, 30, 50).all
 ```
 
+You can also order the records based on the distance from a point
+```ruby
+Place.within_radius(500, 30, 50).order_by_distance(20,30)
+```
+
 ##Test Database
 
 To have earthdistance enabled when you load your database schema (as happens in rake db:test:prepare), you
@@ -108,7 +113,7 @@ unsure about the implications of this change, we suggest reading this
 ##Help
 
 You can use issues in github for that. Or else you can reach us at
-twitter: [@dbiazus](https://twitter.com/#!/dbiazus) 
+twitter: [@dbiazus](https://twitter.com/#!/dbiazus)
 
 ##Note on Patches/Pull Requests
 

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

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

@@ -14,9 +14,14 @@ module ActiveRecordPostgresEarthdistance
 
       def within_radius radius, lat, lng
         where(["ll_to_earth(#{self.latitude_column}, #{self.longitude_column}) <@ earth_box(ll_to_earth(?, ?), ?)" +
-               "AND earth_distance(ll_to_earth(#{self.latitude_column}, #{self.longitude_column}), ll_to_earth(?, ?)) <= ?", 
+               "AND earth_distance(ll_to_earth(#{self.latitude_column}, #{self.longitude_column}), ll_to_earth(?, ?)) <= ?",
                lat, lng, radius, lat, lng, radius])
       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}")
+      end
+
     end
   end
 end

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

@@ -20,7 +20,7 @@ class EarthDistance < Rails::Railtie
     include Rails::Generators::Migration
 
     def self.source_root
-      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+      @source_root ||= File.join(File.dirname(__FILE__), '..', 'templates')
     end
 
     def self.next_migration_number(dirname)

data/spec/act_as_geolocated_spec.rb

@@ -8,6 +8,10 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       @place = Place.create!(:lat => -30.0277041, :lng => -51.2287346)
     end
 
+    after(:all) do
+      @place.destroy
+    end
+
     context "when query with null data" do
       it{ should == [] }
     end
@@ -26,4 +30,27 @@ describe "ActiveRecord::Base.act_as_geolocated" do
       let(:test_data){ {radius: 1000, lat: -27.5969039, lng: -48.5494544} }
     end
   end
+
+  describe "#order_by_distance" do
+    let(:current_location){ {lat: nil, lng: nil, radius: nil} }
+    subject{ Place.order_by_distance(current_location[:lat], current_location[:lng]) }
+    before(:all) do
+      @place_1 = Place.create!(:lat => 52.370216, :lng => 4.895168) #Amsterdam
+      @place_2 = Place.create!(:lat => 52.520007, :lng => 13.404954) #Berlin
+    end
+    after(:all) do
+      @place_1.destroy
+      @place_2.destroy
+    end
+
+    context "when sorting on distance" do
+      let(:current_location){{lat: 51.511214, lng: 0.119824}} #London
+      it{ should == [@place_1, @place_2] }
+    end
+
+    context "when sorting on distance from another location" do
+      let(:current_location){{lat: 52.229676, lng: 21.012229}} #Warsaw
+      it{ should == [@place_2, @place_1] }
+    end
+  end
 end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-earthdistance
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,26 +125,28 @@ files:
 homepage: http://github.com/diogob/activerecord-postgres-earthdistance
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Check distances with latitude and longitude using PostgreSQL special indexes
-test_files: []
+test_files:
+- spec/act_as_geolocated_spec.rb
+- spec/fixtures/place.rb
+- spec/spec_helper.rb