geoplugin 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59e30d2d61dc0b88d1f5a50139fbefb0022263f
-  data.tar.gz: ca6ee07806ff4c3f3cda16909c6f47ac97393400
+  metadata.gz: a87b30dac2b39149c2750fa917cf89c0aaf25867
+  data.tar.gz: b90184aa2776674ba46df9074d99bebb85dca0dd
 SHA512:
-  metadata.gz: 42b4ec00bb6bd74ad8da95be3fce779660fe1aa80b4ac9e2efb55a8631a9a8b0cc778eff800d57e847403de3966e756f9db6eb376126b529642271af183b50b4
-  data.tar.gz: a94ec0a0b573c468dc4ebb68cfd7e32c024efada474c7bd9bd5489db50e7f844be5ca21a8b619fb8b45247f3d5460e0e960304c204968cf96d8150aca37a1ea3
+  metadata.gz: fd690e5765626fe76d74950f3d87826e31ee6d14ab13d54321e5a16c552598487d888174b32c31ba848aeb4008eff92103cdf6027b5f8cebda42fa224262a4dd
+  data.tar.gz: dc42aa6d5658d2eec7bd3b66850aeb2d3513f5be216535371546bb162e7d8a177c682d8f9b408a3b68bf7ac604e5eadfab7b0e16f63802aab8b6a91e68619773

data/lib/geoplugin.rb

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

data/lib/geoplugin/locate.rb

@@ -7,26 +7,26 @@ API_URL = 'http://www.geoplugin.net/json.gp'
 API_SSL_URL = 'https://ssl.geoplugin.net/json.gp'
 
 module Geoplugin
-	class	Locate
-		attr_reader :request, 
-								:status, 
-								:city, 
-								:region, 
-								:areacode, 
-								:dmacode, 
-								:countrycode, 
-								:countryname, 
-								:continentcode, 
-								:latitude, 
-								:longitude, 
-								:regioncode, 
-								:regionname, 
-								:currencycode, 
-								:currencysymbol, 
-								:currencysymbol_utf, 
-								:currencyconverter
+  class	Locate
+    attr_reader :request,
+                :status,
+                :city,
+                :region,
+                :areacode,
+                :dmacode,
+                :countrycode,
+                :countryname,
+                :continentcode,
+                :latitude,
+                :longitude,
+                :regioncode,
+                :regionname,
+                :currencycode,
+                :currencysymbol,
+                :currencysymbol_utf,
+                :currencyconverter
 
-	  def initialize(attributes)
+    def initialize(attributes)
       @request = attributes['geoplugin_request']
       @status = attributes['geoplugin_status']
       @city = attributes['geoplugin_city']
@@ -47,23 +47,19 @@ module Geoplugin
     end
 
     # locate
-    def self.locate(ip = nil)
-    	response = apiresponse(ip)
-    	new(response) unless response.empty?
+    def self.locate(ip = nil, options)
+      response = apiresponse(ip, options)
+      new(response) unless response.empty?
     end
+    
+    private
 
-    def self.ssl_locate(ip = nil, key)
-    	response = apiresponse(ip, true, key)
-    	new(response) unless response.empty?
+    private_class_method 
+    def self.apiresponse(ip = nil, options = {})
+      return [] unless (not ip or IPAddress.valid? ip)
+      url = "#{options[:ssl] ? API_SSL_URL : API_URL}?#{ip ? 'ip=' + ip : ''}#{options[:key] ? '&k=' + options[:key] : ''}#{options[:base_currency] ? '&base_currency=' + options[:base_currency] : ''}"
+      response = Faraday.get(URI.parse(URI.encode(url)))
+      response.success? ? JSON.parse(response.body) : []
     end
-
-  private
-
-	  private_class_method def self.apiresponse(ip = nil, ssl = false, key = nil)
-	  	return [] if ip and not IPAddress.valid? ip
-      url = URI.parse(URI.encode("#{ssl ? API_SSL_URL : API_URL}?#{ip ? 'ip=' + ip : ''}#{key ? '&k=' + key : ''}"))
-	    response = Faraday.get(url)
-	    response.success? ? JSON.parse(response.body) : []
-	  end
-	end
-end
+  end
+end

data/lib/geoplugin/version.rb

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

metadata

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