simple_geolocation 0.0.5 → 0.0.6

data/lib/simple_geolocation/geocoder.rb

@@ -8,7 +8,7 @@ module SimpleGeolocation
       Location::ATTRIBUTES + [:completeness]
     end
 
-    delegate :lat, :lng, :city, :state, :provider, :zip, :street, :district, :number, :completeness, :to => :location
+    delegate :lat, :lng, :city, :state, :country, :provider, :zip, :street, :district, :number, :completeness, :to => :location
 
     def initialize(raw_location)
       @raw_location = raw_location

data/lib/simple_geolocation/geoworkers/geoip/geoip.rb

@@ -16,14 +16,12 @@ module SimpleGeolocation
 
       def get_location!
         result = ip_geocoder.city(geocoder.raw_location)
-        if @success  = result && result.city_name.present? && result.region_name.present?
-          @location = Location.new(
-            :lat => result.latitude,
-            :lng => result.longitude,
-            :city => result.city_name,
-            :state => result.region_name,
-            :provider => "geoip"
-          )
+        if @success  = result && result.latitude.present? && result.longitude.present?
+            new_raw_location = "#{result.latitude}, #{result.longitude}"
+            geokit = Geokit.new(Geocoder.new(new_raw_location))
+            geokit.process!
+            @success = geokit.success?
+            @location = geokit.location
         else
           Geokit.new(geocoder).process!
         end

data/lib/simple_geolocation/geoworkers/geokit/geokit.rb

@@ -22,6 +22,7 @@ module SimpleGeolocation
             :lng => result.lng,
             :city => result.city,
             :state => result.state,
+            :country => result.country,
             :street => result.street_name,
             :number => result.street_number,
             :zip => result.zip,

data/lib/simple_geolocation/location.rb

@@ -1,6 +1,6 @@
 module SimpleGeolocation
   class Location
-    ATTRIBUTES = [:lat, :lng, :city, :state, :provider, :zip, :street, :district, :number]
+    ATTRIBUTES = [:lat, :lng, :city, :state, :country, :provider, :zip, :street, :district, :number]
     attr_accessor *ATTRIBUTES
 
     def initialize(attributes = {})

data/lib/simple_geolocation/version.rb

@@ -1,3 +1,3 @@
 module SimpleGeolocation
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/simple_geolocation_spec.rb

@@ -5,7 +5,7 @@ describe SimpleGeolocation do
 
 
   it 'should identify if the given location is an ip' do
-    @geo = SimpleGeolocation::Geocoder.new("74.125.113.105")
+    @geo = SimpleGeolocation::Geocoder.new("189.58.112.247")
     @geo.ip?.should be_true
     @geo.zip?.should be_false
     @geo.address?.should be_false
@@ -26,13 +26,16 @@ describe SimpleGeolocation do
   end
 
   it "should return the location of an user's based on IP" do
-    @geo = SimpleGeolocation::Geocoder.new("74.125.113.105")
+    @geo = SimpleGeolocation::Geocoder.new("189.58.112.247")
     @geo.ip?.should be_true
     @geo.geocode!
     @geo.success?.should be_true
-    @geo.lat.should == 37.41919999999999
-    @geo.lng.should == -122.0574
-    @geo.completeness.should == 55
+    @geo.lat.should == -26.3001576
+    @geo.lng.should == -48.8320838
+    @geo.city.should == "Joinville"
+    @geo.state.should == "SC"
+    @geo.country.should == "Brasil"
+    @geo.completeness.should == 90
   end
 
   it "should return the location of an ordinary address" do
@@ -42,7 +45,7 @@ describe SimpleGeolocation do
     @geo.success?.should be_true
     @geo.lat.should == -26.30101
     @geo.lng.should == -48.8452974
-    @geo.completeness.should == 88
+    @geo.completeness.should == 90
   end
 
   it "should return the location of a brazilian zipcode (CEP)" do
@@ -57,7 +60,7 @@ describe SimpleGeolocation do
     @geo.zip.should == "22640-100"
     @geo.lat.should == -23.0032808
     @geo.lng.should == -43.3230295
-    @geo.completeness.should == 88
+    @geo.completeness.should == 90
   end
 
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simple_geolocation
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Esdras Mayrink
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -03:00
+date: 2011-04-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -68,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -82,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -129,23 +109,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: simple_geolocation
-rubygems_version: 1.4.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A gem that fetch locations based on IP, ZIP and ordinary address through several existing geolocation gems.