xchange detail and country codes

cmthakur · Dec 10, 2014 · f2d27ec · f2d27ec
1 parent abe0db9
commit f2d27ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-*** Get country codes ***
-http://localhost:3001/country_codes?ip=github.com
+*** Get details ***
+http://localhost:3001/details?ip=github.com
 
-*** Get Details ***
+*** Get country code ***
 http://localhost:3001?ip=github.com
diff --git a/app.rb b/app.rb
@@ -16,12 +16,13 @@ class App < Sinatra::Base
 
     get '/' do
       ip = params['ip']
-      Tracker.get_details(ip).to_json
+      Tracker.country_codes(ip)
+
     end
 
-    get '/country_codes' do
+    get '/details' do
       ip = params['ip']
-      Tracker.country_codes(ip)
+      Tracker.get_details(ip).to_json
     end
 
   end

diff --git a/lib/tracker.rb b/lib/tracker.rb
@@ -6,7 +6,7 @@ def self.get_details(ip)
 
   def self.country_codes(ip)
     details = geoip.city(ip)
-    [details[:country_code2], details[:country_code3]]
+    details[:country_code2] || details[:country_code3]
   end