ip2location_ruby 0.1.2 → 0.2.0

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ip2location"
+  gem.name = "ip2location_ruby"
   gem.homepage = "http://github.com/zhu1230/ip2location"
   gem.license = "MIT"
   gem.summary = %Q{the ip2location ruby library}

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/ip2location_ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vincent.Z"]
-  s.date = "2013-05-15"
+  s.date = "2013-05-16"
   s.description = "the ip2location ruby library"
   s.email = "zhu1230@gmail.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "ip2location_ruby.gemspec",
     "lib/ip2location_ruby.rb",
-    "lib/ip2location_ruby//database_config.rb",
+    "lib/ip2location_ruby/database_config.rb",
     "lib/ip2location_ruby/i2l_float_data.rb",
     "lib/ip2location_ruby/i2l_ip_data.rb",
     "lib/ip2location_ruby/i2l_string_data.rb",

data/lib/ip2location_ruby/ip2location_record.rb

@@ -1,6 +1,7 @@
-class Ip2LocationRecord <BinData::Record
+class Ip2LocationRecord 
   def self.init(database, ip_version)
-    Ip2LocationRecord.class_eval {
+    cls = Class.new(BinData::Record)
+    cls.class_eval {
       endian :little
       i2l_ip_data :ip_from, :ip_version => ip_version
       
@@ -16,6 +17,7 @@ class Ip2LocationRecord <BinData::Record
       end
       
       i2l_ip_data :ip_to, :ip_version => ip_version
-    } 
+    }
+    cls 
   end
 end

data/lib/ip2location_ruby.rb

@@ -9,7 +9,7 @@ require 'ip2location_ruby/i2l_ip_data'
 require 'ip2location_ruby/ip2location_record'
 
 class Ip2location
-  attr_accessor :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version
+  attr_accessor :record_class, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version
   
   def open(url)
     self.file = File.open(File.expand_path url, 'rb')
@@ -20,7 +20,7 @@ class Ip2location
     self.columns = i2l.databasecolumn + 0
     self.database = DbConfig.setup_database(self.db_index)
     self.ip_version = (i2l.ipversion == 0 ? 4 : 6)
-    Ip2LocationRecord.init database, self.ip_version
+    self.record_class = (Ip2LocationRecord.init database, self.ip_version)
     self
   end
   
@@ -65,7 +65,7 @@ class Ip2location
     else
       from_base = ( base_addr + mid * col_length)
       file.seek(from_base)  
-      return Ip2LocationRecord.read(file)
+      return self.record_class.read(file)
     end
   end
     

data/spec/ip2location_ruby_spec.rb

@@ -2,11 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Ip2location" do
   it "work correctly with ipv4" do
-
     i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-SAMPLE.bin")
     record = i2l.get_all('13.5.10.6')
     record.should_not be_nil
     record.country_short.should == 'US'
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -141,7 +141,7 @@ files:
 - VERSION
 - ip2location_ruby.gemspec
 - lib/ip2location_ruby.rb
-- lib/ip2location_ruby//database_config.rb
+- lib/ip2location_ruby/database_config.rb
 - lib/ip2location_ruby/i2l_float_data.rb
 - lib/ip2location_ruby/i2l_ip_data.rb
 - lib/ip2location_ruby/i2l_string_data.rb
@@ -163,6 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1108149545426494590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: