rgeoip 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/ext/rgeoip.c

@@ -1,4 +1,7 @@
 #include "ruby.h"
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#endif
 #include <GeoIP.h>
 #include <GeoIPCity.h>
 
@@ -27,11 +30,19 @@ enum {
 
 static VALUE rb_cRgeoip, rb_cRgeoipDatabase;
 static VALUE rgeoip_symbols[RGEOIP_SYMBOLS_MAX];
+static ID    i_to_s;
+#ifdef HAVE_RUBY_ENCODING_H
+static rb_encoding *enc_utf8;
+static rb_encoding *enc_iso_8859_1;
+#endif
 
 /* -------- */
 
 typedef struct {
-    VALUE databases;
+    VALUE       databases;
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_encoding *encoding;
+#endif
 } Rgeoip;
 
 typedef struct {
@@ -54,6 +65,12 @@ static VALUE
 gi_country(VALUE self, VALUE addr_or_host);
 static VALUE
 gi_city(VALUE self, VALUE addr_or_host);
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gi_set_encoding(VALUE, VALUE);
+static VALUE
+gi_get_encoding(VALUE);
+#endif
 static VALUE
 gid_alloc(VALUE klass);
 static void
@@ -64,6 +81,14 @@ static VALUE
 gid_country(VALUE self, VALUE addr_or_host);
 static VALUE
 gid_city(VALUE self, VALUE addr_or_host);
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gid_set_encoding(VALUE, VALUE);
+static VALUE
+gid_get_encoding(VALUE);
+#endif
+static VALUE
+gid_enc_str(RgeoipDatabase *, const char*);
 static GeoIP_id_by
 GeoIP_id_dwim(VALUE addr);
 static GeoIP_record_by
@@ -72,6 +97,10 @@ static int
 is_addr_p(VALUE value);
 static VALUE
 rb_hash_sset(VALUE hash, VALUE key, VALUE value);
+#ifdef HAVE_RUBY_ENCODING_H
+static rb_encoding*
+charset2encoding(GeoIPCharset charset);
+#endif
 
 /* Rgeoip */
 /*
@@ -124,6 +153,9 @@ gi_new(int argc, VALUE *argv, VALUE self)
     }
 
     gi->databases = rb_ary_new();
+#ifdef HAVE_RUBY_ENCODING_H
+    gi->encoding  = enc_iso_8859_1;
+#endif
 
     for (i=0; i<argc; i++)
     {
@@ -154,7 +186,7 @@ static VALUE
 gi_open(VALUE self, VALUE filenames)
 {
     Rgeoip *gi;
-    VALUE args[1] = {0};
+    VALUE args[3] = {0};
     Data_Get_Struct(self, Rgeoip, gi);
 
     if (TYPE(filenames) == T_ARRAY)
@@ -164,7 +196,11 @@ gi_open(VALUE self, VALUE filenames)
     else
     {
         args[0] = filenames;
-        rb_ary_push(gi->databases, rb_class_new_instance(1, args, rb_cRgeoipDatabase));
+        args[1] = Qnil;
+#ifdef HAVE_RUBY_ENCODING_H
+        args[2] = gi_get_encoding(self);
+#endif
+        rb_ary_push(gi->databases, rb_class_new_instance(3, args, rb_cRgeoipDatabase));
     }
 
     return self;
@@ -243,6 +279,39 @@ gi_city(VALUE self, VALUE addr_or_host)
     return Qnil;
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gi_set_encoding(VALUE self, VALUE enc)
+{
+    Rgeoip          *gi;
+    rb_encoding *rb_enc;
+    Data_Get_Struct(self, Rgeoip, gi);
+
+    rb_enc = rb_to_encoding(enc);
+    if (strcmp((rb_enc_name(rb_enc)), "UTF-8") == 0 ||
+        strcmp((rb_enc_name(rb_enc)), "ISO-8859-1") == 0)
+    {
+        gi->encoding = rb_enc;
+    }
+    else
+    {
+        rb_raise(rb_eRuntimeError, "Unsupported Encoding");
+    }
+    return gi_get_encoding(self);
+}
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gi_get_encoding(VALUE self)
+{
+    Rgeoip *gi;
+    Data_Get_Struct(self, Rgeoip, gi);
+
+    return rb_enc_from_encoding(gi->encoding);
+}
+#endif
+
 /* Rgeoip::Database */
 /*
  * Document-class: Rgeoip::Database
@@ -280,7 +349,7 @@ static VALUE
 gid_new(int argc, VALUE *argv, VALUE self)
 {
     RgeoipDatabase *gid;
-    VALUE filename, flags;
+    VALUE filename, flags, encoding;
 
     Data_Get_Struct(self, RgeoipDatabase, gid);
     if (gid == NULL)
@@ -290,9 +359,9 @@ gid_new(int argc, VALUE *argv, VALUE self)
         DATA_PTR(self) = gid;
     }
 
-    rb_scan_args(argc, argv, "11", &filename, &flags);
+    rb_scan_args(argc, argv, "12", &filename, &flags, &encoding);
 
-    filename = StringValue(filename);
+    filename = rb_funcall(filename, i_to_s, 0);
 
     gid->ptr = GeoIP_open(RSTRING_PTR(filename),
                           GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE | GEOIP_MMAP_CACHE);
@@ -301,6 +370,14 @@ gid_new(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eRuntimeError, "Problem opening database");
     }
 
+#ifdef HAVE_RUBY_ENCODING_H
+    if (NIL_P(encoding))
+    {
+        encoding = rb_str_new2("ISO-8859-1");
+    }
+    gid_set_encoding(self, encoding);
+#endif
+
     return self;
 }
 
@@ -337,15 +414,15 @@ gid_country(VALUE self, VALUE addr_or_host)
     result = rb_hash_new();
     if (GeoIP_code_by_id(id))
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_CODE], rb_str_freeze(rb_str_new2(GeoIP_code_by_id(id))));
+        rb_hash_sset(result, rgeoip_symbols[RS_CODE], gid_enc_str(gid, GeoIP_code_by_id(id)));
     }
     if (GeoIP_code3_by_id(id))
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_CODE3], rb_str_freeze(rb_str_new2(GeoIP_code3_by_id(id))));
+        rb_hash_sset(result, rgeoip_symbols[RS_CODE3], gid_enc_str(gid, GeoIP_code3_by_id(id)));
     }
     if (GeoIP_name_by_id(id))
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_NAME], rb_str_freeze(rb_str_new2(GeoIP_name_by_id(id))));
+        rb_hash_sset(result, rgeoip_symbols[RS_NAME], gid_enc_str(gid, GeoIP_name_by_id(id)));
     }
 
     return result;
@@ -384,27 +461,27 @@ gid_city(VALUE self, VALUE addr_or_host)
     result = rb_hash_new();
     if (record->country_code)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_CODE], rb_str_freeze(rb_str_new2(record->country_code)));
+        rb_hash_sset(result, rgeoip_symbols[RS_CODE], gid_enc_str(gid, record->country_code));
     }
     if (record->country_code3)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_CODE3], rb_str_freeze(rb_str_new2(record->country_code3)));
+        rb_hash_sset(result, rgeoip_symbols[RS_CODE3], gid_enc_str(gid, record->country_code3));
     }
     if (record->country_name)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_NAME], rb_str_freeze(rb_str_new2(record->country_name)));
+        rb_hash_sset(result, rgeoip_symbols[RS_NAME], gid_enc_str(gid, record->country_name));
     }
     if (record->region)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_REGION], rb_str_freeze(rb_str_new2(record->region)));
+        rb_hash_sset(result, rgeoip_symbols[RS_REGION], gid_enc_str(gid, record->region));
     }
     if (record->city)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_CITY], rb_str_freeze(rb_str_new2(record->city)));
+        rb_hash_sset(result, rgeoip_symbols[RS_CITY], gid_enc_str(gid, record->city));
     }
     if (record->postal_code)
     {
-        rb_hash_sset(result, rgeoip_symbols[RS_POSTAL_CODE], rb_str_freeze(rb_str_new2(record->postal_code)));
+        rb_hash_sset(result, rgeoip_symbols[RS_POSTAL_CODE], gid_enc_str(gid, record->postal_code));
     }
     rb_hash_sset(result, rgeoip_symbols[RS_LATITUDE],  rb_float_new((double)record->latitude));
     rb_hash_sset(result, rgeoip_symbols[RS_LONGITUDE], rb_float_new((double)record->longitude));
@@ -415,6 +492,69 @@ gid_city(VALUE self, VALUE addr_or_host)
     return result;
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gid_set_encoding(VALUE self, VALUE enc)
+{
+    RgeoipDatabase *gid;
+    rb_encoding *rb_enc;
+    Data_Get_Struct(self, RgeoipDatabase, gid);
+
+    rb_enc = rb_to_encoding(enc);
+    if (strcmp(rb_enc_name(rb_enc), "ISO-8859-1") == 0)
+    {
+        GeoIP_set_charset(gid->ptr, GEOIP_CHARSET_ISO_8859_1);
+    }
+    else if (strcmp(rb_enc_name(rb_enc), "UTF-8") == 0)
+    {
+        GeoIP_set_charset(gid->ptr, GEOIP_CHARSET_UTF8);
+    }
+    else
+    {
+        rb_raise(rb_eRuntimeError, "Unsupported Encoding");
+    }
+    return gid_get_encoding(self);
+}
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gid_get_encoding(VALUE self)
+{
+    RgeoipDatabase   *gid;
+    rb_encoding *encoding;
+    Data_Get_Struct(self, RgeoipDatabase, gid);
+
+    encoding = charset2encoding(GeoIP_charset(gid->ptr));
+    if (encoding == NULL)
+    {
+        rb_raise(rb_eRuntimeError, "Unknown charset");
+    }
+
+    return rb_enc_from_encoding(encoding);
+}
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE
+gid_enc_str(RgeoipDatabase *gid, const char* str)
+{
+    rb_encoding *internal_encoding = rb_default_internal_encoding();
+    VALUE val = rb_enc_str_new(str, strlen(str),
+                               charset2encoding(GeoIP_charset(gid->ptr)));
+    if (internal_encoding) {
+        val = rb_str_export_to_enc(val, internal_encoding);
+    }
+    return rb_str_freeze(val);
+}
+#else
+static VALUE
+gid_enc_str(RgeoipDatabase *gid, const char* str)
+{
+    return rb_str_freeze(rb_str_new2(str));
+}
+#endif
+
 /* -------- */
 
 static GeoIP_id_by
@@ -465,6 +605,25 @@ rb_hash_sset(VALUE hash, VALUE key, VALUE value)
     return rb_hash_aset(hash, key, value);
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static rb_encoding*
+charset2encoding(GeoIPCharset charset)
+{
+    if (charset == GEOIP_CHARSET_ISO_8859_1)
+    {
+        return enc_iso_8859_1;
+    }
+    else if (charset == GEOIP_CHARSET_UTF8)
+    {
+        return enc_utf8;
+    }
+    else
+    {
+        return NULL;
+    }
+}
+#endif
+
 /* -------- */
 
 void
@@ -476,12 +635,20 @@ Init_rgeoip(void)
     rb_define_method(rb_cRgeoip, "open", gi_open, 1);
     rb_define_method(rb_cRgeoip, "country", gi_country, 1);
     rb_define_method(rb_cRgeoip, "city", gi_city, 1);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_define_method(rb_cRgeoip, "encoding=", gi_set_encoding, 1);
+    rb_define_method(rb_cRgeoip, "encoding", gi_get_encoding, 0);
+#endif
 
     rb_cRgeoipDatabase = rb_define_class_under(rb_cRgeoip, "Database", rb_cObject);
     rb_define_alloc_func(rb_cRgeoipDatabase, gid_alloc);
     rb_define_method(rb_cRgeoipDatabase, "initialize", gid_new, -1);
     rb_define_method(rb_cRgeoipDatabase, "country", gid_country, 1);
     rb_define_method(rb_cRgeoipDatabase, "city", gid_city, 1);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_define_method(rb_cRgeoipDatabase, "encoding=", gid_set_encoding, 1);
+    rb_define_method(rb_cRgeoipDatabase, "encoding", gid_get_encoding, 0);
+#endif
 
     rgeoip_symbols[RS_CODE]        = ID2SYM(rb_intern("code"));
     rgeoip_symbols[RS_CODE3]       = ID2SYM(rb_intern("code3"));
@@ -493,4 +660,11 @@ Init_rgeoip(void)
     rgeoip_symbols[RS_LONGITUDE]   = ID2SYM(rb_intern("longitude"));
     rgeoip_symbols[RS_DMA_CODE]    = ID2SYM(rb_intern("dma_code"));
     rgeoip_symbols[RS_AREA_CODE]   = ID2SYM(rb_intern("area_code"));
+
+    i_to_s = rb_intern("to_s");
+
+#ifdef HAVE_RUBY_ENCODING_H
+    enc_utf8 = rb_utf8_encoding();
+    enc_iso_8859_1 = rb_enc_find("ISO-8859-1");
+#endif
 }

data/rgeoip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rgeoip}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["miyucy"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-03-23}
   s.description = %q{alternative libGeoIP binding for Ruby}
   s.email = %q{miyucy@gmail.com}
   s.extensions = ["ext/extconf.rb"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".gemtest",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,24 +28,28 @@ Gem::Specification.new do |s|
     "VERSION",
     "ext/extconf.rb",
     "ext/rgeoip.c",
+    "lib/rack/rgeoip.rb",
     "rgeoip.gemspec",
+    "test/data/GeoIP.dat",
+    "test/data/GeoLiteCity.dat",
     "test/helper.rb",
+    "test/test_rack_rgeoip_lookup.rb",
     "test/test_rgeoip.rb",
     "test/test_rgeoip_database.rb"
   ]
   s.homepage = %q{http://github.com/miyucy/rgeoip}
   s.licenses = ["LGPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{alternative libGeoIP binding for Ruby}
   s.test_files = [
     "test/helper.rb",
+    "test/test_rack_rgeoip_lookup.rb",
     "test/test_rgeoip.rb",
     "test/test_rgeoip_database.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -53,12 +58,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<ZenTest>, [">= 0"])
+      s.add_development_dependency(%q<rack>, [">= 0"])
     else
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<ZenTest>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
     end
   else
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -66,6 +73,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<ZenTest>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
   end
 end
 

data/test/test_rgeoip.rb

@@ -28,7 +28,7 @@ class TestRgeoip < Test::Unit::TestCase
       Rgeoip.new.open Tempfile.new("rgeoip").path
     }
 
-    assert_raise(TypeError) {
+    assert_raise(RuntimeError) {
       Rgeoip.new.open nil
     }
   end
@@ -44,7 +44,7 @@ class TestRgeoip < Test::Unit::TestCase
       Rgeoip.new.open [Tempfile.new("rgeoip").path, Tempfile.new("rgeoip").path]
     }
 
-    assert_raise(TypeError) {
+    assert_raise(RuntimeError) {
       Rgeoip.new.open [nil]
     }
   end
@@ -63,6 +63,46 @@ class TestRgeoip < Test::Unit::TestCase
     assert_equal("Tokyo", rgeoip.city("202.12.27.33")[:city])
   end
 
+  def test_get_encoding
+    assert_equal(Encoding, rgeoip.encoding.class)
+  end if defined? Encoding
+
+  def test_set_invalid_encoding
+    @rgeoip = rgeoip
+    encoding = @rgeoip.encoding
+
+    assert_raise(RuntimeError) {
+      @rgeoip.encoding = Encoding.find("Shift_JIS")
+    }
+    assert_raise(RuntimeError) {
+      @rgeoip.encoding = "Shift_JIS"
+    }
+
+    assert_equal(encoding, @rgeoip.encoding)
+  end if defined? Encoding
+
+  def test_set_encoding_iso_8859_1
+    @rgeoip = rgeoip
+    enc_iso8859_1 = Encoding.find("ISO-8859-1")
+
+    @rgeoip.encoding = "ISO-8859-1"
+    assert_equal(enc_iso8859_1, @rgeoip.encoding)
+
+    @rgeoip.encoding = enc_iso8859_1
+    assert_equal(enc_iso8859_1, @rgeoip.encoding)
+  end if defined? Encoding
+
+  def test_set_encoding_utf8
+    @rgeoip = rgeoip
+    enc_utf8 = Encoding.find("UTF-8")
+
+    @rgeoip.encoding = "UTF-8"
+    assert_equal(enc_utf8, @rgeoip.encoding)
+
+    @rgeoip.encoding = enc_utf8
+    assert_equal(enc_utf8, @rgeoip.encoding)
+  end if defined? Encoding
+
   private
 
   def paths

data/test/test_rgeoip_database.rb

@@ -72,6 +72,68 @@ class TestRgeoipDatabase < Test::Unit::TestCase
     assert_equal(nil, city_db.city("1.2.3.4.5"))
   end
 
+  def test_get_encoding
+    assert_equal(Encoding, city_db.encoding.class)
+  end if defined? Encoding
+
+  def test_set_invalid_encoding
+    @city_db = city_db
+    encoding = @city_db.encoding
+
+    assert_raise(RuntimeError) {
+      @city_db.encoding = Encoding.find("Shift_JIS")
+    }
+
+    assert_raise(RuntimeError) {
+      @city_db.encoding = "Shift_JIS"
+    }
+
+    assert_equal(encoding, @city_db.encoding)
+  end if defined? Encoding
+
+  def test_set_encoding_utf8
+    @city_db = city_db
+    enc_utf8 = Encoding.find("UTF-8")
+
+    @city_db.encoding = "UTF-8"
+    assert_equal(enc_utf8, @city_db.encoding)
+
+    @city_db.encoding = enc_utf8
+    assert_equal(enc_utf8, @city_db.encoding)
+  end if defined? Encoding
+
+  def test_set_encoding_iso_8859_1
+    @city_db = city_db
+    enc_iso8859_1 = Encoding.find("ISO-8859-1")
+
+    @city_db.encoding = "ISO-8859-1"
+    assert_equal(enc_iso8859_1, @city_db.encoding)
+
+    @city_db.encoding = enc_iso8859_1
+    assert_equal(enc_iso8859_1, @city_db.encoding)
+  end if defined? Encoding
+
+  def test_encoding_utf8
+    @city_db = city_db
+    @city_db.encoding = "UTF-8"
+    assert_equal(@city_db.encoding, @city_db.city("m.root-servers.net")[:city].encoding)
+  end if defined? Encoding
+
+  def test_encoding_utf8
+    @city_db = city_db
+    @city_db.encoding = "ISO-8859-1"
+    assert_equal(@city_db.encoding, @city_db.city("m.root-servers.net")[:city].encoding)
+  end if defined? Encoding
+
+  def test_default_internal
+    di = Encoding.default_internal
+
+    Encoding.default_internal = "Shift_JIS"
+    assert_equal(Encoding.default_internal, city_db.city("m.root-servers.net")[:city].encoding)
+
+    Encoding.default_internal = di
+  end if defined? Encoding
+
   private
 
   def paths

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rgeoip
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - miyucy
@@ -15,99 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +09:00
+date: 2011-03-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: yard
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
-  name: yard
-  version_requirements: *id001
+  type: :development
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bundler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
+  type: :development
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id003
+  type: :development
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rcov
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rcov
-  version_requirements: *id004
+  type: :development
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: ZenTest
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: ZenTest
-  version_requirements: *id005
+  type: :development
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rack
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rack
-  version_requirements: *id006
+  type: :development
   prerelease: false
+  version_requirements: *id006
 description: alternative libGeoIP binding for Ruby
 email: miyucy@gmail.com
 executables: []
@@ -150,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2012554838246895694
       segments: 
       - 0
       version: "0"
@@ -159,9 +130,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []