qqwry 0.0.2 → 0.0.3

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-At First, you need to get the latest QQWry IP database from http://www.cz88.net
+At first, you need to get the latest QQWry IP database from http://www.cz88.net
 
 ````ruby
 require 'rubygems'

data/lib/qqwry/record.rb

@@ -2,7 +2,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'bindata'
-require 'iconv'
+require 'iconv' unless RUBY_VERSION.respond_to?(:encode)
 
 module QQWry
   class Record
@@ -58,7 +58,11 @@ module QQWry
 
     def conv(str)
       begin
-        Iconv::conv('UTF-8', 'GBK', str)
+        if str.respond_to?(:encode)
+          str.force_encoding('GBK').encode('UTF-8')
+        else
+          Iconv::conv('UTF-8', 'GBK', str)
+        end
       rescue
         str = str[0, str.length - 1]
         retry

data/lib/qqwry/version.rb

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

data/test/tc_record.rb

@@ -62,7 +62,9 @@ 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)
+    s = "\xe6\xa0\xaa"
+    s = s.force_encoding('UTF-8') if s.respond_to?(:force_encoding)
+    assert_equal(s, r.country.to_s)
     assert_equal('', r.area.to_s)
   end
 end

metadata

@@ -1,89 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qqwry
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Changli Gao
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-18 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bindata
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bindata
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bindata
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby interface to QQWry IP database
-email: 
+email:
 - xiaosuo@gmail.com
-executables: 
+executables:
 - qqwry
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -97,40 +96,31 @@ files:
 - qqwry.gemspec
 - test/tc_database.rb
 - test/tc_record.rb
-has_rdoc: true
 homepage: https://github.com/xiaosuo/qqwry
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to QQWry IP database
-test_files: 
+test_files:
 - test/tc_database.rb
 - test/tc_record.rb