earth 1.1.0 → 1.1.1

data/lib/earth/air/airport.rb

@@ -9,6 +9,7 @@ require 'geocoder'
 class Airport < ActiveRecord::Base
   extend Earth::Model
   extend Geocoder::Model::ActiveRecord
+  Geocoder::Configuration.units = :km
 
   TABLE_STRUCTURE = <<-EOS
 

data/lib/earth/locality/zip_code.rb

@@ -19,6 +19,7 @@ class ZipCode < ActiveRecord::Base
 
   extend Earth::Model
   extend Geocoder::Model::ActiveRecord
+  Geocoder::Configuration.units = :km
 
   TABLE_STRUCTURE = <<-EOS
 

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/earth/air/aircraft_spec.rb

@@ -12,7 +12,7 @@ describe Aircraft do
       it { fallback.m3.should be_within(5e-9).of(0.00000013) }
       it { fallback.m2.should be_within(5e-6).of(-0.00024) }
       it { fallback.m1.should be_within(5e-2).of(6.2) }
-      it { fallback.b.should be_within(0.5).of(1377) }
+      it { fallback.b.should be_within(0.5).of(1378) }
     end
   end
   

data/spec/earth/air/airport_spec.rb

@@ -1,8 +1,19 @@
 # encoding: UTF-8
 require 'spec_helper'
 require 'earth/air/airport'
+require "#{Earth::FACTORY_DIR}/airport"
 
 describe Airport do
+  # from geocoder
+  describe '#distance_to' do
+    it "should return distance in km" do
+      a = FactoryGirl.create :airport, :airport1
+      b = FactoryGirl.create :airport, :airport2
+      
+      a.distance_to(b).should be_within(5e-6).of(111.19493)
+    end
+  end
+  
   describe "Sanity check", :sanity => true do
     it "should have all the data" do
       Airport.count.should == 5325

data/spec/earth/locality/zip_code_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 require "#{Earth::FACTORY_DIR}/zip_code"
 
 describe ZipCode do
-  # from acts_as_mappable
-  describe '.find_within(radius, units, lat/lng)' do
-    it 'returns all zips within radius of the lat/lng' do
+  # from geocoder
+  describe '.near(point, radius)' do
+    it 'returns all zips within radius of the point' do
       zip1 = FactoryGirl.create :zip_code, :zip1
       zip2 = FactoryGirl.create :zip_code, :zip2
       zip3 = FactoryGirl.create :zip_code, :zip3
       
-      ZipCode.near(zip1, 15, :units => :km).should == [zip1, zip2]
+      ZipCode.near(zip1, 15).should == [zip1, zip2]
     end
   end
   

data/spec/earth_spec.rb

@@ -16,7 +16,7 @@ describe Earth do
   describe '.resources' do
     it 'should get a list of all resource names' do
       Earth.init :all
-      Earth.resources.length.should == 104
+      Earth.resources.length.should == 103
       Earth.resources.should include('Aircraft')
       Earth.resources.should include('Industry')
     end

data/spec/factories/airline.rb

@@ -4,6 +4,5 @@ FactoryGirl.define do
   factory :airline, :class => Airline do
     trait(:delta) { iata_code 'DL'; name 'Delta'; icao_code 'DAL'; bts_code 'DL' }
     trait(:united) { iata_code 'UA'; name 'United'; icao_code 'UAL'; bts_code 'UL' }
-    trait(:lufthansa) { iata_code 'LH'; name 'Lufthansa'; icao_code 'DLH'; bts_code 'LH' }
   end
 end

data/spec/factories/airport.rb

@@ -2,10 +2,7 @@ require 'earth/air/airport'
 
 FactoryGirl.define do
   factory :airport, :class => Airport do
-    trait(:lax) { iata_code 'LAX'; city 'Los Angeles' }
-    trait(:mdw) { iata_code 'MDW'; city 'Chicago' }
-    trait(:msn) { iata_code 'MSN'; city 'Madison' }
-    trait(:ord) { iata_code 'ORD'; city 'Chicago' }
-    trait(:sfo) { iata_code 'SFO'; city 'San Francisco' }
+    trait(:airport1) { iata_code 'test1'; latitude 0; longitude 0 }
+    trait(:airport2) { iata_code 'test2'; latitude 0; longitude 1 }
   end
 end

data/spec/factories/flight_segment.rb

@@ -3,35 +3,7 @@ require 'earth/air/flight_segment'
 FactoryGirl.define do
   factory :flight_segment, :class => FlightSegment do
     row_hash { "fake-#{rand(1e11)}" }
-
-    trait(:from_lax) { origin_airport_iata_code 'LAX' }
-    trait(:from_ord) { origin_airport_iata_code 'ORD' }
-
-    trait(:from_los_angeles) { origin_airport_city 'Los Angeles' }
-    trait(:from_chicago) { origin_airport_city 'Chicago' }
-    
-    trait(:to_sfo) { destination_airport_iata_code 'SFO' }
-    trait(:to_msn) { destination_airport_iata_code 'MSN' }
-    trait(:to_lax) { destination_airport_iata_code 'LAX' }
-    trait(:to_ord) { destination_airport_iata_code 'ORD' }
-
-    trait(:to_los_angeles) { destination_airport_city 'Los Angeles' }
-    trait(:to_chicago) { destination_airport_city 'Chicago' }
-    
-    trait(:june_2010) { month 6; year 2010 }
-    trait(:may_2011) { year 2011; month 5 }
-    trait(:june_2011) { year 2011; month 6 }
-    trait(:may_25_2011) { year 2011; month 5 }
-    trait(:july_2011) { year 2011; month 7 }
-    
-    trait(:united) { airline_bts_code 'UA' }
     trait(:delta) { airline_bts_code 'DL' }
-    trait(:lufthansa) { airline_bts_code 'LH' }
-    trait(:united_icao) { airline_icao_code 'UAL' }
     trait(:delta_icao) { airline_icao_code 'DAL' }
-    trait(:lufthansa_icao) { airline_icao_code 'DLH' }
-    
-    trait(:loaded) { load_factor 0.99 }
-    trait(:empty) { load_factor 0.01 }
   end
 end

data/spec/factories/zip_code.rb

@@ -4,6 +4,6 @@ FactoryGirl.define do
   factory :zip_code, :class => ZipCode do
     trait(:zip1) { name 'test1'; latitude '50'; longitude '-75'; egrid_subregion_abbreviation 'CAMX' }
     trait(:zip2) { name 'test2'; latitude '50'; longitude '-75.1' }
-    trait(:zip3) { name 'test3'; latitude '50'; longitude '-75.25' }
+    trait(:zip3) { name 'test3'; latitude '50'; longitude '-75.3' }
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 Z
+date: 2012-11-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -766,7 +766,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1769596959788236667
+      hash: 3407051875551125701
       segments: 
       - 0
       version: "0"
@@ -775,7 +775,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1769596959788236667
+      hash: 3407051875551125701
       segments: 
       - 0
       version: "0"