ipcountry 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80afd824ed97342e6da6f8f5a9525b64cccb2941
-  data.tar.gz: 643a91130e0839e7bc0b820ce06de07aee04aef0
+  metadata.gz: a7e7cd2da87a4288e825bbd8f34702e518775304
+  data.tar.gz: bfbfe3e58b80a6dd8bcb2c281443b79c06345b47
 SHA512:
-  metadata.gz: 58c6b459f11b6448c3c7c0df0455f1830cdb90edd6f7e155815b709cd9448363b566f93f5f613af21cec8f1583cb2bb3e4b2213d15e219f296dadfcc1f8db861
-  data.tar.gz: 81601dd17eb38cc1a8a94cfc6812f010bbff2370ceeec96a42076d6461787edd0139c1c41d9d854aa431f1f8b3929c1cb7bbe7fe8e2fead6d2322ff20bc5d68a
+  metadata.gz: b53ca649dfcee681e392a03b09361736b35807ba112c68751ecdf06a64696cd4eefab817ee8c4d5ffda484c20af545002189b38c1eecfe9a9e3b4cbfeb7c7111
+  data.tar.gz: dd4fa776a7d03b06560d1977523fde0d42985fd067c240592b07b349d1d688d1d4d86d8634c083d6baaa270a32f1c086959600aaab4d26b12eca4aee887f7f24

data/bin/ipcountry

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'ipcountry'
+
+info = Ipcountry::Info.new(ARGV[0])
+result = ''
+if info.status == 'success'
+  result = info.query + ':' + info.country
+else
+  result = info.query + ':' + info.message
+end
+
+p result

data/lib/ipcountry.rb

@@ -10,12 +10,7 @@ module Ipcountry
     attr_accessor :result
 
     def initialize(ip)
-      uri = URI.parse('http://ip-api.com/json/' + ip.to_s)
-      https = Net::HTTP.new(uri.host, uri.port)
-      res = https.start {
-        https.get(uri.request_uri)
-      }
-
+      res =  connect(ip)
       if res.code == '200'
         @result = JSON.parse(res.body)
       else
@@ -23,20 +18,44 @@ module Ipcountry
       end
     end
 
+    def status
+      @result['status']
+    end
+
+    def message
+      @result['message']
+    end
+
     def country
-      @result["country"]
+      @result['country']
     end
 
-    def countryCode
-      @result["countryCode"]
+    def countrycode
+      @result['countryCode']
     end
 
     def isp
-      @result["isp"]
+      @result['isp']
     end
 
     def organization
-      @result["org"]
+      @result['org']
+    end
+
+    def query
+      @result['query']
+    end
+
+    private
+
+    def connect(ip)
+      uri = URI.parse('http://ip-api.com/json/' + ip.to_s)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
+      res = http.start do |h|
+        h.get(uri.request_uri)
+      end
+      res
     end
   end
 end

data/lib/ipcountry/version.rb

@@ -1,3 +1,3 @@
 module Ipcountry
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipcountry
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yusuke Ohashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,7 +41,8 @@ dependencies:
 description: This gem looks up ip address infomation. I use this api. http://ip-api.com/docs/api:json
 email:
 - yusuke@junkpiano.me
-executables: []
+executables:
+- ipcountry
 extensions: []
 extra_rdoc_files: []
 files:
@@ -50,6 +51,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/ipcountry
 - ipcountry.gemspec
 - lib/ipcountry.rb
 - lib/ipcountry/version.rb