simple_geolocation 0.0.7 → 0.0.8

data/lib/simple_geolocation/geocoder.rb

@@ -14,19 +14,14 @@ module SimpleGeolocation
       @raw_location = raw_location
     end
 
-    def ip?
-      !!/^(\d+\.){3}\d+$/.match(@raw_location)
-    end
-
     # Only brazilian zipcode is supported.
     def zip?
-      return false if ip?
       number = @raw_location.to_s.gsub(/(\.|\D|\-|\s)/, '')
       number.size == 8
     end
 
     def address?
-      !ip? && !zip?
+      !zip?
     end
 
     def geocode!

data/lib/simple_geolocation/geoworkers/base.rb

@@ -14,9 +14,7 @@ module SimpleGeolocation
       end
 
       def self.instantiate_geoworker_based_on(geocoder)
-        if geocoder.ip?
-          GeoIP.new(geocoder)
-        elsif geocoder.zip?
+        if geocoder.zip?
           Geozip.new(geocoder)
         else
           Geokit.new(geocoder)

data/lib/simple_geolocation/geoworkers/geoworkers.rb

@@ -1,7 +1,6 @@
 module SimpleGeolocation
   module Geoworkers
     autoload :Base, 'simple_geolocation/geoworkers/base'
-    autoload :GeoIP, 'simple_geolocation/geoworkers/geoip/geoip'
     autoload :Geokit, 'simple_geolocation/geoworkers/geokit/geokit'
     autoload :Geozip, 'simple_geolocation/geoworkers/geozip/geozip'
   end

data/lib/simple_geolocation/version.rb

@@ -1,3 +1,3 @@
 module SimpleGeolocation
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/simple_geolocation.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_dependency "geokit"
-  s.add_dependency "geoip"
   s.add_dependency "activesupport"
   s.add_dependency "brcep"
 

data/spec/simple_geolocation_spec.rb

@@ -3,48 +3,25 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'simple_geolocation')
 
 describe SimpleGeolocation do
 
-
-  it 'should identify if the given location is an ip' do
-    @geo = SimpleGeolocation::Geocoder.new("189.58.112.247")
-    @geo.ip?.should be_true
-    @geo.zip?.should be_false
-    @geo.address?.should be_false
-  end
-
   it 'should identify if the given location is a zip' do
     @geo = SimpleGeolocation::Geocoder.new("89237-440")
-    @geo.ip?.should be_false
     @geo.zip?.should be_true
     @geo.address?.should be_false
   end
 
   it 'should identify if the given location is an address' do
     @geo = SimpleGeolocation::Geocoder.new("Joinville - SC")
-    @geo.ip?.should be_false
     @geo.address?.should be_true
     @geo.zip?.should be_false
   end
 
-  it "should return the location of an user's based on IP" do
-    @geo = SimpleGeolocation::Geocoder.new("189.58.112.247")
-    @geo.ip?.should be_true
-    @geo.geocode!
-    @geo.success?.should be_true
-    @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
     @geo = SimpleGeolocation::Geocoder.new("Rua do Principe, 199, Joinville, SC")
     @geo.address?.should be_true
     @geo.geocode!
     @geo.success?.should be_true
-    @geo.lat.should == -26.30101
-    @geo.lng.should == -48.8452974
+    @geo.lat.should == -26.3009192
+    @geo.lng.should == -48.8452937
     @geo.completeness.should == 90
   end
 
@@ -53,9 +30,9 @@ describe SimpleGeolocation do
     @geo.zip?.should be_true
     @geo.geocode!
     @geo.success?.should be_true
-    @geo.street.should == "Av. Das Américas"
+    @geo.street.should == "Avenida das Américas"
     @geo.district.should == "Barra da Tijuca"
-    @geo.state.should == "RJ"
+    @geo.state.should == "Rio de Janeiro"
     @geo.city.should == "Rio De Janeiro"
     @geo.zip.should == "22640-100"
     @geo.lat.should == -23.0032808

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_geolocation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243604251040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243604251040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70243604250540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243604250540
-- !ruby/object:Gem::Dependency
-  name: geoip
-  requirement: &70243604249780 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70243604249780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70243604248920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243604248920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: brcep
-  requirement: &70243604248420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243604248420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "\n    This gem is used with geolocation in mind, meaning that the
   main goal is to get a latitude and longitude, but it will return additional data
   if\n    available. With this gem you can pass an IP number or an ZIP number or an
@@ -84,8 +93,6 @@ files:
 - lib/simple_geolocation.rb
 - lib/simple_geolocation/geocoder.rb
 - lib/simple_geolocation/geoworkers/base.rb
-- lib/simple_geolocation/geoworkers/geoip/data/GeoLiteCity.dat
-- lib/simple_geolocation/geoworkers/geoip/geoip.rb
 - lib/simple_geolocation/geoworkers/geokit/geokit.rb
 - lib/simple_geolocation/geoworkers/geoworkers.rb
 - lib/simple_geolocation/geoworkers/geozip/geozip.rb
@@ -108,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4192126495364420408
+      hash: 3332890912338725372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4192126495364420408
+      hash: 3332890912338725372
 requirements: []
 rubyforge_project: simple_geolocation
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem that fetch locations based on IP, ZIP and ordinary address through

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

@@ -1,32 +0,0 @@
-require 'geoip'
-module SimpleGeolocation
-  module Geoworkers
-    class GeoIP < Base
-
-      def process!
-        get_location!
-        geocoder.success! if success?
-      end
-
-      private
-
-      def ip_geocoder
-        @ip_geocoder ||= ::GeoIP.new(File.join(File.dirname(__FILE__), 'data', 'GeoLiteCity.dat'))
-      end
-
-      def get_location!
-        result = ip_geocoder.city(geocoder.raw_location)
-        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
-      end
-
-    end
-  end
-end