qqwry 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,6 @@
 # QQWry
 
-A Ruby interface for QQWry IP database.
+A Ruby interface to QQWry IP database.
 
 ## Installation
 

data/lib/qqwry/record.rb

@@ -37,7 +37,7 @@ module QQWry
         parse_area(file)
       end
       if @country
-        @country = Iconv.conv('UTF-8', 'GBK', @country)
+        @country = conv(@country)
         @country = nil if @country=~ /\s*CZ88\.NET\s*/
       end
     end
@@ -56,6 +56,15 @@ module QQWry
       [ip].pack('N').unpack('C4').join('.')
     end
 
+    def conv(str)
+      begin
+        Iconv::conv('UTF-8', 'GBK', str)
+      rescue
+        str = str[0, str.length - 1]
+        retry
+      end
+    end
+
     def parse_area(file)
       case BinData::Uint8.read(file).to_i
       when 0x1, 0x2
@@ -69,7 +78,7 @@ module QQWry
         @area = BinData::Stringz.read(file).to_s
       end
       if @area
-        @area = Iconv.conv('UTF-8', 'GBK', @area)
+        @area = conv(@area)
         # CZ88.NET is an advertisement
         @area = nil if @area =~ /\s*CZ88\.NET\s*/
       end

data/lib/qqwry/version.rb

@@ -1,4 +1,4 @@
 
 module QQWry
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/qqwry.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = QQWry::VERSION
   gem.authors       = ["Changli Gao"]
   gem.email         = ["xiaosuo@gmail.com"]
-  gem.description   = %q{A Ruby interface for QQWry IP database}
-  gem.summary       = %q{A Ruby interface for QQWry IP database}
+  gem.description   = %q{A Ruby interface to QQWry IP database}
+  gem.summary       = %q{A Ruby interface to QQWry IP database}
   gem.homepage      = 'https://github.com/xiaosuo/qqwry'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/tc_record.rb

@@ -57,3 +57,12 @@ class TC_Record < Test::Unit::TestCase
     @nil_area = true
   end
 end
+
+class TC_Record_Abnormal < Test::Unit::TestCase
+  def test_invalid_encoding
+    io = StringIO.new("\x04\x03\x02\x01\xd6\xea\x96\x00\x96\x00")
+    r = QQWry::Record.new(0, io, 0)
+    assert_equal("\xe6\xa0\xaa", r.country.to_s)
+    assert_equal('', r.area.to_s)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qqwry
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 27
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Changli Gao
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-17 00:00:00 Z
+date: 2012-12-18 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bindata
@@ -73,7 +74,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: A Ruby interface for QQWry IP database
+description: A Ruby interface to QQWry IP database
 email: 
 - xiaosuo@gmail.com
 executables: 
@@ -96,6 +97,7 @@ files:
 - qqwry.gemspec
 - test/tc_database.rb
 - test/tc_record.rb
+has_rdoc: true
 homepage: https://github.com/xiaosuo/qqwry
 licenses: 
 - MIT
@@ -125,10 +127,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A Ruby interface for QQWry IP database
+summary: A Ruby interface to QQWry IP database
 test_files: 
 - test/tc_database.rb
 - test/tc_record.rb