ipgeobase 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5fd94751a091e9f684b217975349e98e6708aeb
+  data.tar.gz: 92fd18fe2d5cb2c7765e981cb079c998b020aff0
+SHA512:
+  metadata.gz: 4e49790ef3ecb36d23c3adbf0fcd08e8ed6af2e48d9120a8b721fe5b4b350a3139b1f15c539d6c81f50b837d92b77e21c013ddb871dc7287a2fd8a8ba44cdbde
+  data.tar.gz: d3f5a30da27fbbf270204ea9f83dede310690e5ac530ff58958af94de0ee2bcc7884128b10195aa8f4ef066707b8c6df602e02980bc480be4c70706f0e8660a3

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: eKNSKm6UDVvUejJOn77bpzYwokSYCV2PV

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 *.swp
 *.swo
+coverage

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in ipgeobase.gemspec
 gemspec
+
+gem 'rake'
+gem 'minitest', '> 5.0.3'
+gem 'webmock', require: 'webmock/minitest'
+gem 'coveralls', require: false

data/README.md

@@ -0,0 +1,42 @@
+# Ipgeobase
+
+[![Gem Version](https://badge.fury.io/rb/ipgeobase.png)](https://rubygems.org/gems/ipgeobase)
+[![Build Status](https://travis-ci.org/mokevnin/ipgeobase.png)](https://travis-ci.org/mokevnin/ipgeobase)
+[![Dependency Status](https://gemnasium.com/mokevnin/ipgeobase.png)](https://gemnasium.com/mokevnin/ipgeobase)
+[![Code Climate](https://codeclimate.com/github/mokevnin/ipgeobase.png)](https://codeclimate.com/github/mokevnin/ipgeobase)
+[![Coverage Status](https://coveralls.io/repos/mokevnin/ipgeobase/badge.png?branch=master)](https://coveralls.io/r/mokevnin/ipgeobase)
+[![Gem Version](http://stillmaintained.com/mokevnin/ipgeobase.png)](http://stillmaintained.com/mokevnin/ipgeobase)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'ipgeobase'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install 'ipgeobase'
+
+## Usage
+
+    ip_meta = Ipgeobase.lookup('10.11.12.134')
+    ip_meta.city # => Москва
+    ip_meta.country # => Россия
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+run tests:
+
+    turn -Itest test/lib
+

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/lib/*_test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/ipgeobase.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "happymapper"
+  s.add_runtime_dependency "iconv"
 end

data/lib/ipgeobase.rb

@@ -1,14 +1,14 @@
 require 'uri'
 require 'net/http'
-require 'happymapper'
 
 module Ipgeobase
-  autoload 'Version', 'ipgeobase/version'
+  URL = 'http://ipgeobase.ru:7020/geo'
   autoload 'IpMetaData', 'ipgeobase/ip_meta_data'
 
   def self.lookup(ip)
-    uri = URI.parse('http://ipgeobase.ru:7020/geo')
+    uri = URI.parse(URL)
     uri.query = URI.encode_www_form :ip => ip
+
     IpMetaData.parse(Net::HTTP.get(uri))
   end
 end

data/lib/ipgeobase/ip_meta_data.rb

@@ -1,10 +1,12 @@
-require 'iconv'
+require 'happymapper'
+require 'iconv' unless String.instance_methods.include?(:encode)
 
 module Ipgeobase
   class IpMetaData
     include HappyMapper
 
     tag 'ip-answer'
+    element :inetnum, String, :deep => true
     element :city, String, :deep => true
     element :country, String, :deep => true
     element :region, String, :deep => true
@@ -13,15 +15,25 @@ module Ipgeobase
     element :lng, Float, :deep => true
 
     def city
-      Iconv.iconv('windows-1251', 'utf-8', @city).first
+      encode(@city)
     end
 
     def country
-      Iconv.iconv('windows-1251', 'utf-8', @country).first
+      encode(@country)
     end
 
     def region
-      Iconv.iconv('windows-1251', 'utf-8', @region).first
+      encode(@region)
+    end
+
+    private
+
+    def encode(api_string)
+      if api_string.respond_to?(:encode)
+        api_string.encode
+      else
+        Iconv.iconv('windows-1251', 'utf-8', api_string).first
+      end
     end
   end
 end

data/lib/ipgeobase/version.rb

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

data/test/fixtures/response.xml

@@ -0,0 +1,11 @@
+<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

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class IpgeobaseTest < TestCase
+  def setup
+    @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 => {})
+  end
+
+  def test_lookup_http_query
+    Ipgeobase.lookup @ip
+
+    assert_requested @stub
+  end
+
+  def test_lookup_response_object
+    meta = Ipgeobase.lookup @ip
+
+    assert_equal 54.321480, meta.lat
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+Bundler.require
+
+require "minitest/autorun"
+
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
+
+class TestCase < MiniTest::Test
+  def load_fixture(filename)
+    File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")
+  end
+end

metadata

@@ -1,27 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ipgeobase
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Mokevnin Kirill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
-  requirement: &18988120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18988120
+  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
 email:
 - mokevnin@gmail.com
@@ -29,35 +45,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - Gemfile
+- README.md
 - Rakefile
 - ipgeobase.gemspec
 - lib/ipgeobase.rb
 - lib/ipgeobase/ip_meta_data.rb
 - lib/ipgeobase/version.rb
+- test/fixtures/response.xml
+- test/lib/ipgeobase_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ipgeobase
-rubygems_version: 1.8.10
+rubygems_version: 2.0.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: geo to ip
-test_files: []
+test_files:
+- test/fixtures/response.xml
+- test/lib/ipgeobase_test.rb
+- test/test_helper.rb