ip2location_ruby 8.0.1 → 8.0.2

data/lib/ip2location_ruby/i2l_float_data.rb

@@ -1,7 +1,7 @@
-class I2lFloatData  < BinData::BasePrimitive
-  
-  def read_and_return_value(io)
-    addr = BinData::FloatLe.read(io)
-  end
-  
+class I2lFloatData  < BinData::BasePrimitive
+  
+  def read_and_return_value(io)
+    addr = BinData::FloatLe.read(io)
+  end
+  
 end

data/lib/ip2location_ruby/i2l_ip_data.rb

@@ -1,10 +1,10 @@
-class I2lIpData  < BinData::BasePrimitive
-  def read_and_return_value(io)
-    iv = eval_parameter(:ip_version)
-    if iv == 4
-      addr = BinData::Uint32le.read(io)
-    elsif iv == 6
-      addr = BinData::Uint128le.read(io)
-    end
-  end
+class I2lIpData  < BinData::BasePrimitive
+  def read_and_return_value(io)
+    iv = eval_parameter(:ip_version)
+    if iv == 4
+      addr = BinData::Uint32le.read(io)
+    elsif iv == 6
+      addr = BinData::Uint128le.read(io)
+    end
+  end
 end

data/lib/ip2location_ruby/i2l_string_data.rb

@@ -1,16 +1,16 @@
-class I2lStringData  < BinData::BasePrimitive
-  
-  def read_and_return_value(io)
-    country_long = eval_parameter(:country_long)
-    io.seekbytes(-4) if country_long
-    file = io.instance_variable_get('@raw_io')
-    addr = BinData::Uint32le.read(io)
-    old_offset = file.tell
-    country_long ? file.seek(addr + 3) : file.seek(addr)
-    length = BinData::Uint8.read(file)
-    res = BinData::String.new(:length => length).read(file)
-    file.seek(old_offset)
-    res
-  end
-
+class I2lStringData  < BinData::BasePrimitive
+  
+  def read_and_return_value(io)
+    country_long = eval_parameter(:country_long)
+    io.seekbytes(-4) if country_long
+    file = io.instance_variable_get('@raw_io')
+    addr = BinData::Uint32le.read(io)
+    old_offset = file.tell
+    country_long ? file.seek(addr + 3) : file.seek(addr)
+    length = BinData::Uint8.read(file)
+    res = BinData::String.new(:length => length).read(file)
+    file.seek(old_offset)
+    res
+  end
+
 end

data/lib/ip2location_ruby/ip2location_config.rb

@@ -1,17 +1,17 @@
-class Ip2locationConfig < BinData::Record
-  endian :little
-	uint8 :databasetype
-	uint8 :databasecolumn
-	uint8 :databaseday
-	uint8 :databasemonth
-	uint8 :databaseyear
-	# uint32 :databasecount
-	# uint32 :databaseaddr
-	# uint32 :ipversion
-  uint32 :ipv4databasecount
-  uint32 :ipv4databaseaddr
-  uint32 :ipv6databasecount
-  uint32 :ipv6databaseaddr
-  uint32 :ipv4indexbaseaddr
-  uint32 :ipv6indexbaseaddr
+class Ip2locationConfig < BinData::Record
+  endian :little
+	uint8 :databasetype
+	uint8 :databasecolumn
+	uint8 :databaseday
+	uint8 :databasemonth
+	uint8 :databaseyear
+	# uint32 :databasecount
+	# uint32 :databaseaddr
+	# uint32 :ipversion
+  uint32 :ipv4databasecount
+  uint32 :ipv4databaseaddr
+  uint32 :ipv6databasecount
+  uint32 :ipv6databaseaddr
+  uint32 :ipv4indexbaseaddr
+  uint32 :ipv6indexbaseaddr
 end

data/lib/ip2location_ruby/ip2location_record.rb

@@ -1,22 +1,22 @@
-class Ip2LocationRecord 
-  def self.init(database, ip_version)
-    cls = Class.new(BinData::Record)
-    cls.class_eval {
-      endian :little
-      i2l_ip_data :ip_from, :ip_version => ip_version
-      database.each do |col|
-        if [:latitude, :longitude].include? col.first
-          i2l_float_data col.first
-        elsif col.first == :country
-          i2l_string_data :country_short
-          i2l_string_data :country_long, :country_long => true
-        else
-          i2l_string_data col.first
-        end
-      end
-      
-      i2l_ip_data :ip_to, :ip_version => ip_version
-    }
-    cls 
-  end
+class Ip2LocationRecord 
+  def self.init(database, ip_version)
+    cls = Class.new(BinData::Record)
+    cls.class_eval {
+      endian :little
+      i2l_ip_data :ip_from, :ip_version => ip_version
+      database.each do |col|
+        if [:latitude, :longitude].include? col.first
+          i2l_float_data col.first
+        elsif col.first == :country
+          i2l_string_data :country_short
+          i2l_string_data :country_long, :country_long => true
+        else
+          i2l_string_data col.first
+        end
+      end
+      
+      i2l_ip_data :ip_to, :ip_version => ip_version
+    }
+    cls 
+  end
 end

data/spec/ip2location_ruby_spec.rb

@@ -1,53 +1,53 @@
-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
-
-  it "work correctly with ipv4 with new library" do
-    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO4.bin")
-    record = i2l.get_all('13.5.10.6')
-    record.should_not be_nil
-    record.country_short.should == 'KR'
-  end
-
-  it "work correctly with ipv6 with new library" do
-    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO6.bin")
-    record = i2l.get_all('2a01:04f8:0d16:26c2::')
-    record.should_not be_nil
-    record.country_short.should == 'DE'
-  end
-
-  # it "profile ipv6 in IPV6.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv6_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # it "profile ipv4 in IPV6.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # it "profile ipv4 in IPV4.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # this need spec/assets/IP2LOCATION-LITE-DB5.bin file which too big to include in this test.
-
-  # it "should get float value of attitude" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB5.bin")
-  #   record = i2l.get_all('192.110.164.88')
-  #   record['latitude'].should eq(33.44837951660156)
-  # end
-end
+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
+
+  it "work correctly with ipv4 with new library" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO4.bin")
+    record = i2l.get_all('13.5.10.6')
+    record.should_not be_nil
+    record.country_short.should == 'KR'
+  end
+
+  it "work correctly with ipv6 with new library" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO6.bin")
+    record = i2l.get_all('2a01:04f8:0d16:26c2::')
+    record.should_not be_nil
+    record.country_short.should == 'DE'
+  end
+
+  # it "profile ipv6 in IPV6.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv6_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
+  # it "profile ipv4 in IPV6.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
+  # it "profile ipv4 in IPV4.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
+  # this need spec/assets/IP2LOCATION-LITE-DB5.bin file which too big to include in this test.
+
+  # it "should get float value of attitude" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB5.bin")
+  #   record = i2l.get_all('192.110.164.88')
+  #   record['latitude'].should eq(33.44837951660156)
+  # end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'ip2location_ruby'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'ip2location_ruby'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end
 require 'awesome_print'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Vincent.Z
@@ -108,20 +108,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ip2location ruby library
+description: The official IP2Location Ruby library to geolocate an IP address. You
+  can lookup for country, region, city, latitude, longitude, zip code, time zone,
+  ISP, domain, area code, usage type, mobile data, weather data and elevation from
+  an IP address. Supported both IPv4 and IPv6 lookup.
 email: support@ip2location.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
 files:
 - ".document"
 - ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
 - Rakefile
 - VERSION
 - ip2location_ruby.gemspec
@@ -140,7 +141,10 @@ files:
 homepage: https://github.com/ip2location/ip2location-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/ip2location/ip2location-ruby/issues
+  homepage_uri: https://www.ip2location.com
+  source_code_uri: https://github.com/ip2location/ip2location-ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -157,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: the ip2location ruby library

data/README.rdoc

@@ -1,35 +0,0 @@
-= IP2Location Ruby Library
-This is IP2Location Ruby library that enables the user to find the country, region or state, city, latitude and longitude, US ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, and usage type by IP address or hostname originates from.  The library reads the geo location information
-from **IP2Location BIN data** file.
-
-Supported IPv4 and IPv6 address.
-
-For more details, please visit:
-[http://www.ip2location.com/developers/ruby](http://www.ip2location.com/developers/ruby)
-
-== Usage
-
-    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'
-
-== Contributing to ip2location
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Sample BIN Databases
-
-* Download free IP2Location LITE databases at [http://lite.ip2location.com](http://lite.ip2location.com)  
-* Download IP2Location sample databases at [http://www.ip2location.com/developers](http://www.ip2location.com/developers)
-
-== Support
-
-Email: support@ip2location.com  
-URL: [http://www.ip2location.com](http://www.ip2location.com)