ipgeobase 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5fd94751a091e9f684b217975349e98e6708aeb
-  data.tar.gz: 92fd18fe2d5cb2c7765e981cb079c998b020aff0
+  metadata.gz: 8ce8d5c88631b03539a5a393e8a7e920526c67a7
+  data.tar.gz: 0e951f4cff52429b16210d23c4bae4318f56ecff
 SHA512:
-  metadata.gz: 4e49790ef3ecb36d23c3adbf0fcd08e8ed6af2e48d9120a8b721fe5b4b350a3139b1f15c539d6c81f50b837d92b77e21c013ddb871dc7287a2fd8a8ba44cdbde
-  data.tar.gz: d3f5a30da27fbbf270204ea9f83dede310690e5ac530ff58958af94de0ee2bcc7884128b10195aa8f4ef066707b8c6df602e02980bc480be4c70706f0e8660a3
+  metadata.gz: bf188c0a6b6545e9fe0990e03f65bde6b068c29503c53e4bdf2f711b37bcca01bbe5ae559bf8e1518910cb9ac2b4f93f5b110779df9cffddc0ca4591e792c1d0
+  data.tar.gz: 085295caa836a49556318b96abd36de81ab5513c2b7197ccd974fef10fa3082546025efd0e10299db580a55eccee938a9c6e3855fd2e27aea12e9deaeaf0ad9e

data/README.md

@@ -40,3 +40,7 @@ run tests:
 
     turn -Itest test/lib
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mokevnin/ipgeobase/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/ipgeobase.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'net/http'
+require 'open-uri'
 
 module Ipgeobase
   URL = 'http://ipgeobase.ru:7020/geo'
@@ -8,7 +8,7 @@ module Ipgeobase
   def self.lookup(ip)
     uri = URI.parse(URL)
     uri.query = URI.encode_www_form :ip => ip
-
-    IpMetaData.parse(Net::HTTP.get(uri))
+    resp = open(uri).read()
+    IpMetaData.parse(resp.to_s)
   end
 end

data/lib/ipgeobase/ip_meta_data.rb

@@ -30,9 +30,9 @@ module Ipgeobase
 
     def encode(api_string)
       if api_string.respond_to?(:encode)
-        api_string.encode
+        api_string.encode("UTF-8")
       else
-        Iconv.iconv('windows-1251', 'utf-8', api_string).first
+        Iconv.iconv('utf-8', 'windows-1251', api_string).first
       end
     end
   end

data/lib/ipgeobase/version.rb

@@ -1,3 +1,3 @@
 module Ipgeobase
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/fixtures/response_not_utf.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<ip-answer>
+  <ip value="46.8.114.116">
+    <inetnum>46.8.112.0 - 46.8.127.255</inetnum>
+    <country>RU</country>
+    <city>���������</city>
+    <region>����������� �������</region>
+    <district>����������� ����������� �����</district>
+    <lat>54.321480</lat>
+    <lng>48.385651</lng>
+  </ip>
+</ip-answer>

data/test/lib/ipgeobase_test.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 require 'test_helper'
 
 class IpgeobaseTest < TestCase
@@ -5,7 +7,7 @@ class IpgeobaseTest < TestCase
     @ip = '46.8.114.116'
     @stub = stub_request(:get, "#{Ipgeobase::URL}?ip=#{@ip}").
       with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-      to_return(:status => 200, :body => load_fixture('response.xml'), :headers => {})
+      to_return(:status => 200, :body => load_fixture('response_not_utf.xml'), :headers => {})
   end
 
   def test_lookup_http_query
@@ -19,4 +21,10 @@ class IpgeobaseTest < TestCase
 
     assert_equal 54.321480, meta.lat
   end
+
+  def test_should_encode_to_utf8
+    meta = Ipgeobase.lookup @ip
+
+    assert_equal "Ульяновск", meta.city
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ipgeobase
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mokevnin Kirill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: iconv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: geo to ip
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
+- ".coveralls.yml"
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -55,6 +55,7 @@ files:
 - lib/ipgeobase/ip_meta_data.rb
 - lib/ipgeobase/version.rb
 - test/fixtures/response.xml
+- test/fixtures/response_not_utf.xml
 - test/lib/ipgeobase_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -66,21 +67,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ipgeobase
-rubygems_version: 2.0.4
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: geo to ip
 test_files:
 - test/fixtures/response.xml
+- test/fixtures/response_not_utf.xml
 - test/lib/ipgeobase_test.rb
 - test/test_helper.rb
+has_rdoc: