geoplugin 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ceebc4d29eddbe1b90b6dc41dcc1a92b308acd
-  data.tar.gz: 4dfe0f07722687ba3782413aee3841aa830cc533
+  metadata.gz: b59e30d2d61dc0b88d1f5a50139fbefb0022263f
+  data.tar.gz: ca6ee07806ff4c3f3cda16909c6f47ac97393400
 SHA512:
-  metadata.gz: 85655045128bbf3fcecad483cef7e9807e819f65ebf2df105ef3f14c7cc927642e2e8ea39be3645d00791db8e52ec1eef618c72a44af2444df2b336737381819
-  data.tar.gz: 6dc95fbdfb5abea7327ccb9b73d69153ef8e4e4ab11f5b5a729530266760248a18c37236678401b54de4cb875061074bb21d43b9951c7ca5d168f2c15fc43e68
+  metadata.gz: 42b4ec00bb6bd74ad8da95be3fce779660fe1aa80b4ac9e2efb55a8631a9a8b0cc778eff800d57e847403de3966e756f9db6eb376126b529642271af183b50b4
+  data.tar.gz: a94ec0a0b573c468dc4ebb68cfd7e32c024efada474c7bd9bd5489db50e7f844be5ca21a8b619fb8b45247f3d5460e0e960304c204968cf96d8150aca37a1ea3

data/lib/geoplugin.rb

@@ -3,10 +3,10 @@ require "geoplugin/locate"
 
 module Geoplugin
 	def self.me(options = {})
-		location = options[:ssl] ? Geoplugin::Locate.ssl_locate_no_ip(options[:key]) : Geoplugin::Locate.locate_no_ip
+		location = options[:ssl] ? Geoplugin::Locate.ssl_locate(nil, options[:key]) : Geoplugin::Locate.locate
 	end
 
- 	def self.new(ip, options = {})
-   	location = options[:ssl] ? Geoplugin::Locate.ssl_locate(options[:key], ip) : Geoplugin::Locate.locate(ip)
+ 	def self.new(ip = nil, options = {})
+   	location = options[:ssl] ? Geoplugin::Locate.ssl_locate(ip, options[:key]) : Geoplugin::Locate.locate(ip)
   end
 end

data/lib/geoplugin/locate.rb

@@ -3,8 +3,8 @@ require 'json'
 require 'ipaddress'
 require 'uri'
 
-API_URL = "http://www.geoplugin.net/json.gp"
-API_SSL_URL = "https://ssl.geoplugin.net/json.gp"
+API_URL = 'http://www.geoplugin.net/json.gp'
+API_SSL_URL = 'https://ssl.geoplugin.net/json.gp'
 
 module Geoplugin
 	class	Locate
@@ -26,65 +26,44 @@ module Geoplugin
 								:currencysymbol_utf, 
 								:currencyconverter
 
-		def initialize(attributes)
-      @request = attributes["geoplugin_request"]
-      @status = attributes["geoplugin_status"]
-      @city = attributes["geoplugin_city"]
-      @region = attributes["geoplugin_region"]
-      @areacode = attributes["geoplugin_areaCode"]
-      @dmacode = attributes["geoplugin_dmaCode"]
-      @countrycode = attributes["geoplugin_countryCode"]
-      @countryname = attributes["geoplugin_countryName"]
-      @continentcode = attributes["geoplugin_continentCode"]
-      @latitude = attributes["geoplugin_latitude"]
-      @longitude = attributes["geoplugin_longitude"]
-      @regioncode = attributes["geoplugin_regionCode"]
-      @regionname = attributes["geoplugin_regionName"]
-      @currencycode = attributes["geoplugin_currencyCode"]
-      @currencysymbol = attributes["geoplugin_currencySymbol"]
-      @currencysymbol_utf = attributes["geoplugin_currencySymbol_UTF8"]
-      @currencyconverter = attributes["geoplugin_currencyConverter"]
+	  def initialize(attributes)
+      @request = attributes['geoplugin_request']
+      @status = attributes['geoplugin_status']
+      @city = attributes['geoplugin_city']
+      @region = attributes['geoplugin_region']
+      @areacode = attributes['geoplugin_areaCode']
+      @dmacode = attributes['geoplugin_dmaCode']
+      @countrycode = attributes['geoplugin_countryCode']
+      @countryname = attributes['geoplugin_countryName']
+      @continentcode = attributes['geoplugin_continentCode']
+      @latitude = attributes['geoplugin_latitude']
+      @longitude = attributes['geoplugin_longitude']
+      @regioncode = attributes['geoplugin_regionCode']
+      @regionname = attributes['geoplugin_regionName']
+      @currencycode = attributes['geoplugin_currencyCode']
+      @currencysymbol = attributes['geoplugin_currencySymbol']
+      @currencysymbol_utf = attributes['geoplugin_currencySymbol_UTF8']
+      @currencyconverter = attributes['geoplugin_currencyConverter']
     end
 
-    # locate with ip
-    def self.locate(ip)
-    	response = get_response(ip)
-    	new(response) if not response.empty?
+    # locate
+    def self.locate(ip = nil)
+    	response = apiresponse(ip)
+    	new(response) unless response.empty?
     end
 
-    def self.ssl_locate(key, ip)
-    	response = get_ssl_response(key, ip)
-    	new(response) if not response.empty?
-    end
-
-    #locate without ip
-    def self.locate_no_ip
-    	response = get_response
-    	new(response) if not response.empty?
-    end
-
-    def self.ssl_locate_no_ip(key)
-    	response = get_ssl_response(key)
-    	new(response) if not response.empty?
+    def self.ssl_locate(ip = nil, key)
+    	response = apiresponse(ip, true, key)
+    	new(response) unless response.empty?
     end
 
   private
-	  def self.get_response(ip = nil)
-
-	  	return [] if ip and not IPAddress.valid? ip
-	  
-	  	url = ip ? URI.parse(URI.encode("#{API_URL}?ip=#{ip}")) : URI.parse(URI.encode("#{API_URL}"))
-	    response = Faraday.get(url)
-	    return response.success? ? JSON.parse(response.body) : []
-	  end
-
-	  def self.get_ssl_response(key, ip = nil)
 
+	  private_class_method def self.apiresponse(ip = nil, ssl = false, key = nil)
 	  	return [] if ip and not IPAddress.valid? ip
-
-	  	url = ip ? URI.parse(URI.encode("#{API_SSL_URL}?ip=#{ip}&k=#{key}")) : URI.parse(URI.encode("#{API_SSL_URL}?k=#{key}"))
+      url = URI.parse(URI.encode("#{ssl ? API_SSL_URL : API_URL}?#{ip ? 'ip=' + ip : ''}#{key ? '&k=' + key : ''}"))
 	    response = Faraday.get(url)
-	    return response.success? ? JSON.parse(response.body) : []
+	    response.success? ? JSON.parse(response.body) : []
 	  end
 	end
 end

data/lib/geoplugin/version.rb

@@ -1,3 +1,3 @@
 module Geoplugin
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoplugin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Davide Santangelo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler