sxgeo 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cd697929b9ddf5145222d67da7902bfc90d3b9d5
+  data.tar.gz: 6db4e7baa20ab14f230e90034a42813d1ac26054
+SHA512:
+  metadata.gz: 7233b86e15438ac02be0bb98a9dcd7ea3537563e748d969497626a39b5c639093edd80054aa924d1c1dd8ebc5385c3ddcf52fbb50e4e75feb8824e0ad4494eed
+  data.tar.gz: 866fcd43728e09f9a99167aa6ef61d97151870705d1cb63964ec4fe06a60450448c35b8abe7a864bce23d31c266f917a93b50d7c5d599b1ea078157805d5e5ef

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*~

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README.md

@@ -1,29 +1,13 @@
 # Sxgeo
 
-TODO: Write a gem description
+Порт Sypex Geo 2.1 - PHP класса для определение местоположения по IP-адресу заточенный для России.
 
-## Installation
+Гем содержит в себе бинарный файл БД по городам городов.
 
-Add this line to your application's Gemfile:
+Пример использования:
 
-    gem 'sxgeo'
+		SxGeo.new.get(ip)['city'].force_encoding('UTF-8')
 
-And then execute:
+Еще примеры http://sypexgeo.net/ru/docs/
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sxgeo
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+batch mode пока не работает.

data/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/lib/sxgeo.rb

@@ -5,8 +5,9 @@ class SxGeo
 	SXGEO_FILE = 0
 	SXGEO_MEMORY = 1
 	SXGEO_BATCH = 2
+	SXGEO_CITY_FILE = File.dirname(__FILE__) + "/sxgeo/SxGeoCity.dat"
 
-	def initialize (db_file = File.dirname(__FILE__) + "/sxgeo/SxGeoCity.dat", type = SXGEO_FILE)
+	def initialize (db_file = SXGEO_CITY_FILE, mode = SXGEO_FILE)
 		@cc2iso = [
 			'', 'AP', 'EU', 'AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'AN', 'AO', 'AQ',
 			'AR', 'AS', 'AT', 'AU', 'AW', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH',
@@ -30,8 +31,8 @@ class SxGeo
 			'AX', 'GG', 'IM', 'JE', 'BL', 'MF'
 		]
 
-		@batch_mode  = false
-		@memory_mode = false
+		@batch_mode  = 0
+		@memory_mode = 0
 		@debug_mode  = false
 
 		@fh = File.open(db_file, 'rb')
@@ -45,14 +46,14 @@ class SxGeo
 		@b_idx_str = @fh.read @b_idx_len * 4
 		@m_idx_str = @fh.read @m_idx_len * 4
 		@block_len   = 3 + @id_len;
-		@batch_mode  = type & SXGEO_BATCH
-		@memory_mode = type & SXGEO_MEMORY
+		@batch_mode  = mode & SXGEO_BATCH
+		@memory_mode = mode & SXGEO_MEMORY
 		@db_begin = @fh.tell
-		if (@batch_mode)
+		if @batch_mode != 0
 			@b_idx_arr = @b_idx_str.unpack("N*")
 			@m_idx_arr = @m_idx_str.scan(/.{1,4}/)
 		end
-		if (@memory_mode)
+		if @memory_mode != 0
 			@db = @fh.read @db_items * @block_len
 			@regions_db = @fh.read @region_size
 			@cities_db  = @fh.read @city_size
@@ -72,7 +73,7 @@ class SxGeo
 					max = offset
 				end
 			end
-			while ipn > @m_idx_arr[min] && min < max
+			while (ipn > @m_idx_arr[min]) && (min < max)
 				min+=1
 			end
 		else
@@ -121,12 +122,11 @@ class SxGeo
 		# if ip1n == 0 || ip1n == 10 || ip1n == 127 || ip1n >= @b_idx_len || false === (ipn = ip2long(ip)) # TODO
 		# 	return false
 		# end
-		 # binding.pry
 		ipn = [ipn].pack 'N'
 		@ip1c = ip1n.chr
 		# Находим блок данных индексе первых байт
 		blocks = {}
-		if @batch_mode
+		if @batch_mode != 0
 			blocks = {'min' => @b_idx_arr[ip1n.to_i-1], 'max' => @b_idx_arr[ip1n.to_i]}
 		else
 			blocks['min'], blocks['max'] = @b_idx_str[(ip1n - 1) * 4, (ip1n - 1) * 4+8].unpack 'NN'
@@ -143,8 +143,7 @@ class SxGeo
 		max = blocks['max'] if max > blocks['max']
 		len = max - min
 		# Находим нужный диапазон в БД
-		if @memory_mode
-			# binding.pry
+		if @memory_mode != 0
 			puts "#{ipn}, #{min}, #{max}" if @debug_mode
 			return search_db(@db, ipn, min, max)
 		else
@@ -161,17 +160,8 @@ class SxGeo
 	  long
 	end
 
-	# def long2ip(long)
-	#   ip = []
-	#   4.times do |i|
-	#     ip.push(long.to_i & 255)
-	#     long = long.to_i >> 8
-	#   end
-	#   ip.join(".")
-	# end
-
 	def parseCity(seek)
-		if @memory_mode
+		if @memory_mode != 0
 			raw = @cities_db[seek, @max_city]
 		else
 			@fh.pos = @cities_begin + seek
@@ -179,10 +169,15 @@ class SxGeo
 		end
 		@city = {}
 		@city['regid'], @city['cc'],
-			@city['2fips'], @city['lat'], @city['lon'] = raw.unpack 'NCaNN'
+			@city['fips'], @city['lat'], @city['lon'] = raw.unpack 'NCa2NN'
 		@city['country']  = @cc2iso[@city['cc']];
-		@city['lat'] /= 1000000;
-		@city['lon'] /= 1000000;
+
+		# convert unsigned int32 to signed int32
+    @city['lat'] -= 0xFFFF_FFFF if @city['lat'] >= 0x8000_0000
+    @city['lon'] -= 0xFFFF_FFFF if @city['lon'] >= 0x8000_0000
+
+		@city['lat'] /= 1000000.0;
+		@city['lon'] /= 1000000.0;
 		@city['city'] = raw[15,raw.length].split("\0").first
 		return @city;
 	end
@@ -234,7 +229,7 @@ class SxGeo
 			'Pacific/Auckland', 'Pacific/Chatham', 'Pacific/Efate', 'Pacific/Fiji', 'Pacific/Galapagos', 'Pacific/Guadalcanal', 'Pacific/Honolulu',
 			'Pacific/Port_Moresby' ]
 		if region_seek > 0
-			if @memory_mode
+			if @memory_mode != 0
 				region = @regions_db[region_seek, @max_region].split "\0"
 			else
 				@fh.pos = @info['regions_begin'] + region_seek

data/lib/sxgeo/version.rb

@@ -1,3 +1,3 @@
 module Sxgeo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'sxgeo'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+  config.mock_with :rr
+end

data/spec/sxgeo_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe SxGeo do
+	it 'works in normal mode' do
+		SxGeo.new.get('87.250.250.203')['city'].force_encoding('UTF-8').should == 'Москва'
+	end
+
+	it 'works in batch mode' do
+		pending 'Batch mode not work yet'
+		sxgeo = SxGeo.new SxGeo::SXGEO_CITY_FILE, SxGeo::SXGEO_BATCH
+		sxgeo.get('87.250.250.203')['city'].force_encoding('UTF-8').should == 'Москва'
+	end
+
+	it 'works in memory mode' do
+		sxgeo = SxGeo.new SxGeo::SXGEO_CITY_FILE, SxGeo::SXGEO_MEMORY
+		sxgeo.get('87.250.250.203')['city'].force_encoding('UTF-8').should == 'Москва'
+	end
+
+	it 'works in batch and memory modes' do
+		pending 'Batch mode not work yet'
+		sxgeo = SxGeo.new SxGeo::SXGEO_CITY_FILE, SxGeo::SXGEO_BATCH | SxGeo::SXGEO_MEMORY
+		sxgeo.get('87.250.250.203')['city'].force_encoding('UTF-8').should == 'Москва'
+	end
+
+	it '.ip2long works well' do
+		sxgeo = SxGeo.new
+		sxgeo.ip2long('87.250.250.203').should == 1476065995
+	end
+
+end

data/sxgeo.gemspec

@@ -15,4 +15,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency "rspec-core", "~> 2.0"
+  gem.add_development_dependency "rspec-expectations", "~> 2.0"
+  gem.add_development_dependency "rr", "~> 1.0"
 end

metadata

@@ -1,16 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sxgeo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - nleo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
-dependencies: []
+date: 2014-03-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Sypex Geo port
 email: 
 executables: []
@@ -18,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -25,29 +67,32 @@ files:
 - lib/sxgeo.rb
 - lib/sxgeo/SxGeoCity.dat
 - lib/sxgeo/version.rb
+- spec/spec_helper.rb
+- spec/sxgeo_spec.rb
 - sxgeo.gemspec
 homepage: https://github.com/nleo/sxgeo
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sypex Geo port
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/sxgeo_spec.rb