geo_locale 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3630bc2042f478722327069b9b89537d3edfa75
-  data.tar.gz: 93a05c5cb14ddb962bd0bbfef6c8a598379cfef8
+  metadata.gz: 2810f63b7da90f39c9449254810fc4a53c89185c
+  data.tar.gz: c89638f968f4ec925c6b6e9263e1b8600164c839
 SHA512:
-  metadata.gz: 29c014106ca2986094bf8aa6e63ee67676f274d9aee86369cd07a2c9176fa7abb20f61aa759a3e4e6d944a99718e722ced46f2b06aa7d4a359444fecae1edd63
-  data.tar.gz: 2212080c277d6455443c673b982b5f8f89bf9a8ff1f23d0af7cb78a6897f0bb8c8388085b615857863e1b763f8be5ba1bfae0875e9a5c3b70d0b1e3eb2ff341c
+  metadata.gz: 3de8168f9d7121b3eaa847246a53095687edb278a1212620c5de2941097184aedbc06a1d680b9dfc8104ffdfc2b114d47fe53d4218d23e4e0ad28587d48e934b
+  data.tar.gz: 3eec2c6def2b37bc874d77255cf95ea6db5a05fd905b33d563c75a7a293e594de6ea104905772309570a8643200d327d38bc4d9053eb51eedee6a9eeb607e360

data/README.md

@@ -1,6 +1,8 @@
 # GeoLocale
 
-TODO: Write a gem description
+Simple wrapper for GeoIP gem with some redundancy on GeoKit to get a two-letter country code or locale from an IP address.
+
+Basic use-case: Detect application user's origin and display app in that language.
 
 ## Installation
 
@@ -21,12 +23,41 @@ Or install it yourself as:
 ## Usage
 Configure default locales
 ```ruby
+# in /config/initializers/geo_locale.rb
 GeoLocale.configure do |config|
-  config.dev_country = "fr"
-  config.local_country = "de"
+  config.default_country = "de" # set to nil or false if you want to catch fails in geolocation
+  config.default_locale = "en" # country->locale conversion is minimal for now, set this explicitly to ensure GeoLocale.locale
+  config.default_lcid = "en-us"
+  config.overrides["ee"] = "en" # hash used to override standard country codes
 end
 ```
 
+To get country code:
+GeoLocale.country_code(ip: "")
+Use in controller like so:
+```ruby
+GeoLocale.country_code(request.remote_ip)
+=> "en"
+```
+
+To get locale:
+GeoLocale.locale(country_code: "", ip: "", lcid: false)
+```ruby
+GeoLocale.locale(country_code: "gb")
+=> "en"
+GeoLocale.locale(country_code: "gb", lcid: true)
+=> "en-gb"
+GeoLocale.locale(ip: "97.77.25.20")
+=> "en"
+GeoLocale.locale(ip: "97.77.25.20", lcid: true)
+=> "en-us"
+```
+country_code is prioritized as it does not require external calls.
+```ruby
+GeoLocale.locale(ip: "97.77.25.20", country_code: "lv")
+=> "lv"
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/Epigene/geo_locale/fork )

data/geo_locale.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "geo_locale"
   spec.version       = GeoLocale::VERSION
   spec.date          = Date.today.to_s
-  spec.platform      = Gem::Platform::RUBY
+  #spec.platform      = Gem::Platform::RUBY
   spec.authors       = ["Epigene"]
   spec.email         = ["augusts.bautra@gmail.com"]
   spec.summary       = ['A Rails 4+ gem for getting user country']
@@ -19,15 +19,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  #s.rubyforge_project = "ga_collector_pusher"
+  spec.rubyforge_project = "geo_locale"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.7.0"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rspec', "~> 3.1.0"
 
-  #spec.add_dependency "rest-client"
-  #spec.add_dependency "activesupport"
   spec.add_dependency 'geoip'
-  spec.add_dependency 'i18n'
+  spec.add_dependency 'geokit'
+  spec.add_dependency 'geokit-rails'
+
 end

data/lib/geo_locale/country_code.rb

@@ -0,0 +1,46 @@
+module GeoLocale
+  IP_REGEX = /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/
+
+  def self.country_code (ip: "") # ip = "12.12.12.12"
+    country_code = GeoLocale.geo_ip_try(ip)
+    if country_code.present?
+      return country_code
+    else
+      country_code = GeoLocale.geokit_try(ip)
+      if country_code.present?
+        return country_code
+      else
+        # final fallback, config default
+        return GeoLocale.config.default_country
+      end
+    end
+  end
+
+  def self.geo_ip_try (ip)
+    begin
+      return nil unless ip.match(GeoLocale::IP_REGEX).present?
+      code = GeoIP.new("#{GeoLocale::ROOT}/lib/data/GeoIP.dat").country(ip).country_code2.downcase
+      if code == "--"
+        return nil
+      else
+        if GeoLocale.config.overrides["#{code}"].present?
+          return GeoLocale.config.overrides["#{code}"]
+        else
+          return code
+        end
+      end
+    rescue
+      nil
+    end
+  end
+
+  def self.geokit_try (ip)
+    return nil unless ip.match(GeoLocale::IP_REGEX).present?
+    begin
+      return Geokit::Geocoders::MultiGeocoder.geocode(ip).country_code.downcase
+    rescue
+      nil
+    end
+  end
+
+end

data/lib/geo_locale/locale.rb

@@ -0,0 +1,79 @@
+module GeoLocale
+
+  def self.locale (ip: "", country_code: "", lcid: false)
+    if country_code.present?
+      unless lcid
+        locale = GeoLocale::LOCALE[country_code]
+        return figure_out_returnable_locale(locale: locale)
+      else
+        lcid_string = GeoLocale::LCID[country_code]
+        return figure_out_returnable_lcid(lcid_string: lcid_string)
+      end
+
+    elsif ip.present?
+      country_code = GeoLocale.country_code(ip: ip)
+      unless lcid
+        locale = GeoLocale::LOCALE[country_code]
+        return figure_out_returnable_locale(locale: locale)
+      else
+        lcid_string = GeoLocale::LCID[country_code]
+        return figure_out_returnable_lcid(lcid_string: lcid_string)
+      end
+
+    else
+      unless lcid
+        locale = GeoLocale::LOCALE["#{GeoLocale.config.default_country}"]
+        return figure_out_returnable_locale(locale: locale)
+      else
+        lcid_string = GeoLocale::LCID["#{GeoLocale.config.default_country}"]
+        return figure_out_returnable_lcid(lcid_string: lcid_string)
+      end
+    end
+  end
+
+  LOCALE = {
+    "lv" => "lv",
+    "lt" => "lt",
+    "ee" => "et",
+    "ru" => "ru",
+    "ie" => "en", # Ireland
+    "gb" => "en", # UK a.k.a Great Britain
+    "uk" => "en", # fallback England
+    "us" => "en", # US&A
+    "pl" => "pl",
+    "de" => "de",
+    "fr" => "fr"
+  }
+
+  LCID = {
+    "lv" => "lv",
+    "lt" => "lt",
+    "ee" => "et",
+    "ru" => "ru",
+    "ie" => "en-ie", # Ireland
+    "gb" => "en-gb", # UK a.k.a Great Britain
+    "uk" => "en-gb", # fallback England
+    "us" => "en-us", # US&A
+    "pl" => "pl",
+    "de" => "de",
+    "fr" => "fr"
+  }
+
+
+  def self.figure_out_returnable_locale(locale:)
+    if locale.present?
+      return locale
+    else
+      return GeoLocale.config.default_locale
+    end
+  end
+
+  def self.figure_out_returnable_lcid(lcid_string:)
+    if lcid_string.present?
+      return lcid_string
+    else
+      return GeoLocale.config.default_lcid
+    end
+  end
+
+end

data/lib/geo_locale/version.rb

@@ -1,3 +1,3 @@
 module GeoLocale
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/geo_locale.rb

@@ -1,5 +1,9 @@
 require "geo_locale/version"
-require "geo_locale/geo_locale"
+require "geo_locale/country_code"
+require "geo_locale/locale"
+require 'geoip'
+require 'geokit'
+require 'geokit-rails'
 
 module GeoLocale
   class << self
@@ -12,11 +16,13 @@ module GeoLocale
   end
 
   class Config
-    attr_accessor :local_country, :dev_country
+    attr_accessor :default_country, :default_locale, :default_lcid, :overrides
 
     def initialize
-      @local_country = "en"
-      @dev_country = "en"
+      @default_country = "us"
+      @default_locale = "en"
+      @default_lcid = "en-us"
+      @overrides = {}
     end
   end
 

data/spec/spec_helper.rb

@@ -2,8 +2,15 @@ require 'bundler/setup'
 Bundler.setup
 
 require "geo_locale"
-require "rails"
 
 RSpec.configure do |config|
-  # some (optional) config here
-end
+  LV_IPS =["81.198.65.13", "85.9.209.244", "83.241.46.175", "78.84.147.188", "159.148.168.103"]
+  LT_IPS =["77.79.35.98", "158.129.84.6", "91.211.246.238"]
+  EE_IPS =["188.92.162.172", "46.36.219.51", "84.50.44.25"]
+  RU_IPS =["92.255.197.224", "213.85.92.10", "80.78.245.89"]
+  US_IPS =["97.77.25.20", "192.185.83.90", "199.180.150.25"]
+  GB_IPS =["78.157.209.36", "79.143.87.234", "195.40.6.43"]
+  IR_IPS =["77.104.75.76", "94.74.132.65"]
+  IE_IPS =["54.170.245.171", "54.171.4.57", "176.34.86.253"]
+  PL_IPS =["83.3.115.58", "109.207.54.81", "88.199.29.50"]
+end

data/spec/tests/geolocation_spec.rb

@@ -0,0 +1,146 @@
+# rspec spec/tests/geolocation_spec.rb
+
+require 'spec_helper'
+
+describe "Geolocation" do
+  lv_ip = LV_IPS.sample
+  lt_ip = LT_IPS.sample
+  ee_ip = EE_IPS.sample
+  ru_ip = RU_IPS.sample
+  us_ip = US_IPS.sample
+  gb_ip = GB_IPS.sample
+  ir_ip = IR_IPS.sample
+  ie_ip = IE_IPS.sample
+  pl_ip = PL_IPS.sample
+
+  before :each do
+    GeoLocale.config = nil
+    GeoLocale.configure {}
+  end
+
+  describe "GeoIP" do
+    it "should return nil for 0.0.0.0" do
+      expect(GeoLocale.geo_ip_try("0.0.0.0")).to eq nil
+    end
+    it "should return nil for localhost" do
+      expect(GeoLocale.geo_ip_try("localhost")).to eq nil
+    end
+    it "should return lv for #{lv_ip}" do
+      expect(GeoLocale.geo_ip_try(lv_ip) ).to eq "lv"
+    end
+    it "should return lt for #{lt_ip}" do
+      expect(GeoLocale.geo_ip_try(lt_ip)).to eq "lt"
+    end
+    it "should return ee for #{ee_ip}" do
+      expect(GeoLocale.geo_ip_try(ee_ip)).to eq "ee"
+    end
+    it "should return et for #{ee_ip} after override" do
+      GeoLocale.config.overrides["ee"] = "et"
+      expect(GeoLocale.geo_ip_try("#{ee_ip}")).to eq "et"
+    end
+    it "should return ru for #{ru_ip}" do
+      expect(GeoLocale.geo_ip_try("#{ru_ip}")).to eq "ru"
+    end
+    it "should return us for #{us_ip}" do
+      expect(GeoLocale.geo_ip_try("#{us_ip}")).to eq "us"
+    end
+    it "should return gb for #{gb_ip}" do # Great Britain
+      expect(GeoLocale.geo_ip_try("#{gb_ip}")).to eq "gb"
+    end
+    it "should return ir for #{ir_ip}" do # Iran
+      expect(GeoLocale.geo_ip_try("#{ir_ip}")).to eq "ir"
+    end
+    it "should return ie for #{ie_ip}" do # Ireland
+      expect(GeoLocale.geo_ip_try("#{ie_ip}")).to eq "ie"
+    end
+    it "should return pl for #{pl_ip}" do # Poland
+      expect(GeoLocale.geo_ip_try("#{pl_ip}")).to eq "pl"
+    end
+  end
+
+  describe "GeoKit" do # enable these to see IPs fail
+    # xit "should return nil for #{lv_ip}" do
+    #   expect(GeoLocale.geokit_try("#{lv_ip}")).to eq nil
+    # end
+    # xit "should return nil for localhost" do
+    #   expect(GeoLocale.geokit_try("localhost")).to eq nil
+    # end
+    xit "should return lv for #{lv_ip}" do
+      puts lv_ip
+      expect(GeoLocale.geokit_try(lv_ip)).to eq "lv"
+    end
+    # xit "should return lt for #{lt_ip}" do
+    #   expect(GeoLocale.geokit_try(lt_ip)).to eq "lt"
+    # end
+    # xit "should return ee for #{ee_ip}" do
+    #   expect(GeoLocale.geokit_try(ee_ip)).to eq "ee"
+    # end
+    # xit "should return et for #{ee_ip} after override" do
+    #   GeoLocale.config.overrides["ee"] = "et"
+    #   expect(GeoLocale.geokit_try("#{ee_ip}")).to eq "et"
+    # end
+    # xit "should return ru for #{ru_ip}" do
+    #   expect(GeoLocale.geokit_try("#{ru_ip}")).to eq "ru"
+    # end
+    # xit "should return us for #{us_ip}" do
+    #   expect(GeoLocale.geokit_try("#{us_ip}")).to eq "us"
+    # end
+    # xit "should return gb for #{gb_ip}" do # Great Britain
+    #   expect(GeoLocale.geokit_try("#{gb_ip}")).to eq "gb"
+    # end
+    # xit "should return ir for #{ir_ip}" do # Iran
+    #   expect(GeoLocale.geokit_try("#{ir_ip}")).to eq "ir"
+    # end
+    # xit "should return ie for #{ie_ip}" do # Ireland
+    #   expect(GeoLocale.geokit_try("#{ie_ip}")).to eq "ie"
+    # end
+    # xit "should return pl for #{pl_ip}" do # Poland
+    #   expect(GeoLocale.geokit_try("#{pl_ip}")).to eq "pl"
+    # end
+  end
+
+  describe "Cascade" do
+    it "should return config default and set value for 0.0.0.0" do
+      expect(GeoLocale.country_code(ip: "0.0.0.0")).to eq "us"
+      GeoLocale.config.default_country = "de"
+      expect(GeoLocale.country_code(ip: "0.0.0.0")).to eq "de"
+    end
+    it "should return config default and set value for localhost" do
+      expect(GeoLocale.country_code(ip: "localhost")).to eq "us"
+      GeoLocale.config.default_country = "fr"
+      expect(GeoLocale.country_code(ip: "localhost")).to eq "fr"
+    end
+    it "should return lv for #{lv_ip}" do
+      expect(GeoLocale.country_code(ip: lv_ip)).to eq "lv"
+    end
+    it "should return lt for #{lt_ip}" do
+      expect(GeoLocale.country_code(ip: lt_ip)).to eq "lt"
+    end
+    it "should return ee for #{ee_ip}" do
+      expect(GeoLocale.country_code(ip: ee_ip)).to eq "ee"
+    end
+    it "should return et for #{ee_ip} after override" do
+      GeoLocale.config.overrides["ee"] = "et"
+      expect(GeoLocale.country_code(ip: "#{ee_ip}")).to eq "et"
+    end
+    it "should return ru for #{ru_ip}" do
+      expect(GeoLocale.country_code(ip: "#{ru_ip}")).to eq "ru"
+    end
+    it "should return us for #{us_ip}" do
+      expect(GeoLocale.country_code(ip: "#{us_ip}")).to eq "us"
+    end
+    it "should return gb for #{gb_ip}" do # Great Britain
+      expect(GeoLocale.country_code(ip: "#{gb_ip}")).to eq "gb"
+    end
+    it "should return ir for #{ir_ip}" do # Iran
+      expect(GeoLocale.country_code(ip: "#{ir_ip}")).to eq "ir"
+    end
+    it "should return ie for #{ie_ip}" do # Ireland
+      expect(GeoLocale.country_code(ip: "#{ie_ip}")).to eq "ie"
+    end
+    it "should return pl for #{pl_ip}" do # Poland
+      expect(GeoLocale.country_code(ip: "#{pl_ip}")).to eq "pl"
+    end
+  end
+
+end

data/spec/tests/initialize_spec.rb

@@ -3,25 +3,11 @@
 require 'spec_helper'
 
 describe "Initializing" do
-  before :all do
-
-  end
-
-  it "should set dev_country to en" do
-    expect(GeoLocale.config.dev_country).to eq "en"
+  it "should set default_country to us" do
+    expect(GeoLocale.config.default_country).to eq "us"
   end
-  it "should set local_country to en" do
-    expect(GeoLocale.config.local_country).to eq "en"
+  it "should change default_country to de" do
+    GeoLocale.config.default_country = "de"
+    expect(GeoLocale.config.default_country).to eq "de"
   end
-  it "should change local_country to de" do
-    GeoLocale.config.local_country = "de"
-    expect(GeoLocale.config.local_country).to eq "de"
-  end
-  it "should change dev_country to fr" do
-    GeoLocale.configure do |c|
-      c.dev_country = "fr"
-    end
-    expect(GeoLocale.config.dev_country).to eq "fr"
-  end
-
 end

data/spec/tests/locale_spec.rb

@@ -0,0 +1,110 @@
+# rspec spec/tests/locale_spec.rb
+
+require 'spec_helper'
+
+describe "Locale interpret" do
+  lv_ip = LV_IPS.sample
+  lt_ip = LT_IPS.sample
+  ee_ip = EE_IPS.sample
+  ru_ip = RU_IPS.sample
+  us_ip = US_IPS.sample
+  gb_ip = GB_IPS.sample
+  ir_ip = IR_IPS.sample
+  ie_ip = IE_IPS.sample
+  pl_ip = PL_IPS.sample
+
+  before :each do
+    GeoLocale.config = nil
+    GeoLocale.configure {}
+  end
+
+  describe "from country code" do
+    context "with unchanged defaults" do
+      it "should return en if no arguments given" do
+        expect( GeoLocale.locale(country_code: "") ).to eq "en"
+      end
+      it 'should return lv for country_code: "lv"' do
+        expect( GeoLocale.locale(country_code: "lv") ).to eq "lv"
+      end
+      it 'should return en for country_code: "gb"' do
+        expect( GeoLocale.locale(country_code: "gb") ).to eq "en"
+      end
+      it 'should return en-gb for country_code: "gb", lcid: true' do
+        expect( GeoLocale.locale(country_code: "gb", lcid: true) ).to eq "en-gb"
+      end
+    end
+    context "with customized config" do
+      it "should return de if no arguments given" do
+        GeoLocale.config.default_country = "de"
+        expect( GeoLocale.locale(country_code: "") ).to eq "de"
+      end
+      it 'should return lv for country_code: "lv"' do
+        GeoLocale.config.default_country = "de"
+        expect( GeoLocale.locale(country_code: "lv") ).to eq "lv"
+      end
+      it 'should return en for country_code: "gb"' do
+        GeoLocale.config.default_country = "de"
+        expect( GeoLocale.locale(country_code: "gb") ).to eq "en"
+      end
+      it 'should return en-gb for country_code: "gb", lcid: true' do
+        GeoLocale.config.default_country = "de"
+        expect( GeoLocale.locale(country_code: "gb", lcid: true) ).to eq "en-gb"
+      end
+    end
+  end
+
+  describe "from IP" do
+    context "with unchanged defaults" do
+      it "should return en if no arguments given" do
+        expect( GeoLocale.locale(ip: "") ).to eq "en"
+      end
+      it "should return lv for #{lv_ip}" do
+        expect( GeoLocale.locale(ip: lv_ip) ).to eq "lv"
+      end
+      it "should return en for #{us_ip} " do
+        expect( GeoLocale.locale(ip: us_ip) ).to eq "en"
+      end
+      it "should return en-ie for #{ie_ip}, lcid: true" do
+        expect( GeoLocale.locale(ip: ie_ip, lcid: true) ).to eq "en-ie"
+      end
+    end
+    context "with customized config" do
+      it "should return en if only default_contry configured and no arguments given" do
+        GeoLocale.config.default_country = "no"
+        expect( GeoLocale.locale(ip: "") ).to eq "en"
+      end
+      it "should return en if only default_locale configured and no arguments given" do
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: "") ).to eq "en"
+      end
+      it 'should return "no" if both defaults configured and no arguments given' do
+        GeoLocale.config.default_country = "no"
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: "") ).to eq "no"
+      end
+      it "should return lv for #{lv_ip}" do
+        GeoLocale.config.default_country = "no"
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: lv_ip) ).to eq "lv"
+      end
+      it "should return en for #{gb_ip}" do
+        GeoLocale.config.default_country = "no"
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: gb_ip) ).to eq "en"
+      end
+      it "should return en-ie for #{ie_ip}, lcid: true" do
+        GeoLocale.config.default_country = "no"
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: ie_ip, lcid: true) ).to eq "en-ie"
+      end
+      it "should return lt for #{lt_ip}, lcid: true" do
+        GeoLocale.config.default_country = "no"
+        GeoLocale.config.default_locale = "no"
+        expect( GeoLocale.locale(ip: lt_ip, lcid: true) ).to eq "lt"
+      end
+    end
+  end
+
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_locale
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Epigene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,24 +42,24 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: geoip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: geoip
+  name: geokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: geokit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,11 +110,13 @@ files:
 - geo_locale.gemspec
 - lib/data/GeoIP.dat
 - lib/geo_locale.rb
-- lib/geo_locale/geo_locale.rb
+- lib/geo_locale/country_code.rb
+- lib/geo_locale/locale.rb
 - lib/geo_locale/version.rb
 - spec/spec_helper.rb
-- spec/tests/geo_ip_part_spec.rb
+- spec/tests/geolocation_spec.rb
 - spec/tests/initialize_spec.rb
+- spec/tests/locale_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -134,12 +136,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: geo_locale
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: '["A Rails 4+ gem for getting user country"]'
 test_files:
 - spec/spec_helper.rb
-- spec/tests/geo_ip_part_spec.rb
+- spec/tests/geolocation_spec.rb
 - spec/tests/initialize_spec.rb
+- spec/tests/locale_spec.rb

data/lib/geo_locale/geo_locale.rb

@@ -1,25 +0,0 @@
-module GeoLocale
-
-  def self.country_code
-    country_code = GeoLocale.geo_ip_try
-    if country_code.present?
-      return
-    else
-      country_code = GeoLocale.config.local_country
-    end
-  end
-
-  def self.geo_ip_try
-    begin
-      return GeoIP.new("#{GeoLocale::ROOT}/lib/data/GeoIP.dat").country(request.remote_ip).country_code2.downcase
-    rescue
-      nil
-    end
-  end
-
-  def _try
-    # request.location is handled by Geocoder, fails often
-    # request.location.country_code.downcase
-  end
-
-end

data/spec/tests/geo_ip_part_spec.rb

@@ -1,20 +0,0 @@
-# rspec spec/tests/geo_ip_part_spec.rb
-
-require 'spec_helper'
-
-describe "GeoIP part" do
-  before :all do
-
-  end
-
-  it "status should be sent" do
-    # request = stub(host: 'dietbikini.com')
-    # GeoLocale.any_instance.stub request: request
-    helper.request.stub(:path).and_return("/asdf.asdf")
-    request = ActionController::TestRequest.new(host: "www.google.lv", remote_ip: "146.185.168.135")
-    expect(GeoLocale.geo_ip_try).to eq "xx"
-  end
-
-
-
-end