geonames_client 1.0.1 → 1.0.2

data/Gemfile

@@ -8,7 +8,6 @@ group :development, :test do
   gem 'growl'
 	gem 'guard-rspec'
 	gem 'guard-shell'
-	gem 'httparty'
 end
 
 # Specify your gem's dependencies in geonames_client.gemspec

data/lib/geonames_client.rb

@@ -1,3 +1,4 @@
+require "geonames_client/numeric_extensions"
 require "geonames_client/version"
 
 module GeonamesClient
@@ -6,9 +7,3 @@ module GeonamesClient
   autoload :Service,           'geonames_client/service'
   autoload :ServiceDefinition, 'geonames_client/service_definition'
 end
-
-class Numeric
-  def degrees
-    self * Math::PI / 180
-  end
-end

data/lib/geonames_client/numeric_extensions.rb

@@ -0,0 +1,5 @@
+class Numeric
+  def degrees
+    self * Math::PI / 180
+  end
+end

data/lib/geonames_client/service.rb

@@ -1,4 +1,9 @@
-require 'httparty'
+begin
+  require 'httparty'
+rescue LoadError
+  require 'rubygems'
+  require 'httparty'
+end
 
 module GeonamesClient
   class Service

data/lib/geonames_client/version.rb

@@ -1,3 +1,3 @@
 module GeonamesClient
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geonames_client
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - C. Jason Harrelson
@@ -101,9 +101,9 @@ files:
 - Rakefile
 - geonames_client.gemspec
 - lib/geonames_client.rb
-- lib/geonames_client/_location.rb
 - lib/geonames_client/location.rb
 - lib/geonames_client/nearby_street.rb
+- lib/geonames_client/numeric_extensions.rb
 - lib/geonames_client/service.rb
 - lib/geonames_client/service_definition.rb
 - lib/geonames_client/version.rb

data/lib/geonames_client/_location.rb

@@ -1,68 +0,0 @@
-class Location
-
-  def self.deg2rad(deg)
-     (deg * Math::PI / 180)
-  end
-
-  def self.rad2deg(rad)
-     (rad * 180 / Math::PI)
-  end
-
-  def self.acos(rad)
-     Math.atan2(Math.sqrt(1 - rad**2), rad)
-  end
-
-  def self.distance_in_miles(loc1, loc2)
-     lat1 = loc1.latitude
-     lon1 = loc1.longitude
-     lat2 = loc2.latitude
-     lon2 = loc2.longitude
-     theta = lon1 - lon2
-
-     dist = Math.sin(self.deg2rad(lat1)) * Math.sin(deg2rad(lat2))
-        + Math.cos(self.deg2rad(lat1)) * Math.cos(self.deg2rad(lat2)) * Math.cos(deg2rad(theta))
-
-     dist = self.rad2deg(self.acos(dist))
-
-     (dist * 60 * 1.1515).round #distance in miles
-  end
-
-  def miles_to(location)
-     Location.distance_in_miles(self, location)
-  end
-
-  def self.locationArea(location, miles)
-     radius = miles.to_f
-     latR = radius / ((6076 / 5280) * 60)
-     lonR = radius / (((Math.cos(location.latitude * Math::PI / 180) * 6076) / 5280) * 60)
-
-     {
-        :min_latitude => location.latitude - latR,
-        :min_longitude => location.longitude - lonR,
-        :max_latitude => location.latitude + latR,
-        :max_longitude => location.longitude + lonR
-     }
-  end
-
-  def self.location_ids_in_range(location, miles)
-     la = Location.locationArea(location, miles)
-     Location.find(:all,
-        :select => Location.connection.quote_column_name( 'id' ),
-        :conditions => ["(#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'latitude'} <= ?) AND (#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'latitude'} >= ?) AND " +
-           "(#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'longitude'} >= ?) AND (#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'longitude'} <= ?)",
-           la[:max_latitude], la[:min_latitude], la[:min_longitude], la[:max_longitude]
-        ]
-     ).collect { |l| l.id }
-  end
-
-  def self.locations_in_range(location, miles)
-     la = Location.locationArea(location, miles)
-     Location.find(:all,
-        :conditions => ["(#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'latitude'} <= ?) AND (#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'latitude'} >= ?) AND " +
-           "(#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'longitude'} >= ?) AND (#{connection.quote_table_name 'locations'}.#{connection.quote_column_name 'longitude'} <= ?)",
-           la[:max_latitude], la[:min_latitude], la[:min_longitude], la[:max_longitude]
-        ]
-     )
-  end
-
-end