sypex_geo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270f6a9db891c1f4f6235ca37888a22a1cb6aa18
-  data.tar.gz: 2882b224bdbc064f518858245d670df34b08225b
+  metadata.gz: 7561aef15597c229eade88c0f336e86cfc6d2894
+  data.tar.gz: a85ff0572ef6aa59fe54daf3f56cb6413079e125
 SHA512:
-  metadata.gz: 0cbf268f45fcf101a93e837a82567ce4b824be475e20c86c12e5b9d2211619c707b68d13ff1d209ce2d18b7f25966d26b0d3b2fe69f363004bb4a2e70551a67f
-  data.tar.gz: 189c75e6d57c803d169c74f36f711b02a38545a132f5e81512775e14545e7af5a4436861aafa5caad480203930619b62a95e022014419be00a1773979ab2dbfc
+  metadata.gz: 623a87b4e18f3d4eb85f2739e621337f5aa34f99454bcd36de44a5dc4409a330ec7ba013bc513c947c47609f288dc87f5fe0888dcbbdd70afb3c2f0d97d67055
+  data.tar.gz: 41452d01235f3b3caaa6b444262c24f0698d49d54b1aef93cd5f02a6b6d9edab3a9ae84a2e85b9842715137322b7aae28104615aa1447500f4e2d9d318a40fb2

data/.travis.yml

@@ -10,8 +10,8 @@ env:
   - SXGEO_CITY_DB=SxGeoCity.dat
 
 before_script:
-  - 'wget http://sypexgeo.net/files/SxGeoCountry.zip && unzip SxGeoCountry.zip'
-  - 'wget http://sypexgeo.net/files/SxGeoCity_utf8.zip && unzip SxGeoCity_utf8.zip'
+  - if [[ -n "$SXGEO_DB" ]]; then wget http://sypexgeo.net/files/SxGeoCountry.zip && unzip SxGeoCountry.zip; fi
+  - if [[ -n "$SXGEO_CITY_DB" ]]; then wget http://sypexgeo.net/files/SxGeoCity_utf8.zip && unzip SxGeoCity_utf8.zip; fi
 
 addons:
   code_climate:

data/README.md

@@ -58,7 +58,11 @@ location.country_code
 
 ## Testing
 
-    $ SXGEO_DB=./SxGeo.dat SXGEO_CITY_DB=./SxGeoCity.dat rspec
+```sh
+$ wget http://sypexgeo.net/files/SxGeoCountry.zip && unzip SxGeoCountry.zip
+$ wget http://sypexgeo.net/files/SxGeoCity_utf8.zip && unzip SxGeoCity_utf8.zip
+$ SXGEO_DB=./SxGeo.dat SXGEO_CITY_DB=./SxGeoCity.dat rspec
+```
 
 ## License
 

data/lib/sypex_geo/database.rb

@@ -47,7 +47,7 @@ module SypexGeo
     end
 
     def inspect
-      "#<#{self.class}:0x#{object_id} @version=#{@version}>"
+      to_s
     end
 
     protected

data/lib/sypex_geo/pack.rb

@@ -1,9 +1,5 @@
 module SypexGeo
   class Pack
-    def self.parse(pack, data)
-      new(pack).parse(data)
-    end
-
     def initialize(pack)
       @pack = pack
     end
@@ -69,12 +65,12 @@ module SypexGeo
 
     def read_int24(chunk)
       raw = read(3)
-      raw = raw + (raw[2].ord >> 7) > 0 ? "\xFF" : "\0"
+      raw += (raw[2].unpack('C')[0] >> 7) > 0 ? "\xFF" : "\x00"
       raw.unpack('l')[0]
     end
 
     def read_uint24(chunk)
-      (read(3) + "\0").unpack('L')[0]
+      (read(3) + "\x00").unpack('L')[0]
     end
 
     def read_int32(chunk)

data/lib/sypex_geo/version.rb

@@ -1,3 +1,3 @@
 module SypexGeo
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/lib/pack_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'sypex_geo'
+
+describe SypexGeo::Pack do
+  describe '#parse' do
+    it 'reads int8' do
+      expect(SypexGeo::Pack.new('t:value').parse("\xff")[:value]).to eq(-1)
+    end
+
+    it 'reads uint8' do
+      expect(SypexGeo::Pack.new('T:value').parse("\xff")[:value]).to eq(255)
+    end
+
+    it 'reads int16' do
+      expect(SypexGeo::Pack.new('s:value').parse("\xff\xff")[:value]).to eq(-1)
+    end
+
+    it 'reads uint16' do
+      expect(SypexGeo::Pack.new('S:value').parse("\xff\xff")[:value]).to eq(65535)
+    end
+
+    it 'reads int24' do
+      expect(SypexGeo::Pack.new('m:value').parse("\xff\xff\xff")[:value]).to eq(-1)
+    end
+
+    it 'reads uint24' do
+      expect(SypexGeo::Pack.new('M:value').parse("\xff\xff\xff")[:value]).to eq(16777215)
+    end
+
+    it 'reads int32' do
+      expect(SypexGeo::Pack.new('i:value').parse("\xff\xff\xff\xff")[:value]).to eq(-1)
+    end
+
+    it 'reads uint32' do
+      expect(SypexGeo::Pack.new('I:value').parse("\xff\x00\x00\x00")[:value]).to eq(255)
+    end
+
+    it 'reads float' do
+      expect(SypexGeo::Pack.new('f:value').parse("\x85\xEBUA")[:value].round(2)).to eq(13.37)
+    end
+
+    it 'reads double' do
+      expect(SypexGeo::Pack.new('d:value').parse("\xF6(\\\x8F\xC25E@")[:value].round(2)).to eq(42.42)
+    end
+
+    it 'reads decimal16' do
+      expect(SypexGeo::Pack.new('n2:value').parse("\x00\xff")[:value]).to eq(-2.56)
+    end
+
+    it 'reads decimal32' do
+      expect(SypexGeo::Pack.new('N2:value').parse("\xff\x00\xff\x00")[:value]).to eq(167119.35)
+    end
+
+    it 'reads chars' do
+      parsed = SypexGeo::Pack.new('c3:val1/c3:val2').parse('foobar')
+
+      expect(parsed[:val1]).to eq('foo')
+      expect(parsed[:val2]).to eq('bar')
+    end
+
+    it 'reads blob' do
+      parsed = SypexGeo::Pack.new('b:val1/b:val2').parse("foo\0bar\0")
+
+      expect(parsed[:val1]).to eq('foo')
+      expect(parsed[:val2]).to eq('bar')
+    end
+  end
+end

data/spec/sypex_geo_spec.rb

@@ -1,20 +1,15 @@
 # coding: utf-8
 
-require './spec/spec_helper'
+require 'spec_helper'
 require 'sypex_geo'
 require 'ipaddr'
 
 describe SypexGeo do
-  let(:demo_ip) do
-    # Random Moscow IP.
-    '80.90.64.1'
-  end
-
-  let(:invalid_db_file) do
-    File.expand_path(__FILE__ + '/../support/invalid.dat')
-  end
-
   shared_examples 'geo db' do
+    let(:invalid_db_file) do
+      File.expand_path(__FILE__ + '/../support/invalid.dat')
+    end
+
     describe '#initialize' do
       it 'raises error if database is invalid' do
         expect do
@@ -43,11 +38,22 @@ describe SypexGeo do
         end.to raise_error(error)
       end
     end
+
+    describe '#inspect' do
+      it 'does not dump whole db' do
+        expect(subject.inspect).to eq(subject.to_s)
+      end
+    end
   end
 
   shared_examples 'city db' do
     it_behaves_like 'geo db'
 
+    let(:demo_ip) do
+      # Random Moscow IP.
+      '80.90.64.1'
+    end
+
     let(:city_info) do
       {
         id: 524901,
@@ -103,8 +109,13 @@ describe SypexGeo do
   shared_examples 'country db' do
     it_behaves_like 'geo db'
 
+    let(:demo_ip) do
+      # Google Public DNS.
+      '8.8.8.8'
+    end
+
     let(:country_code) do
-      'RU'
+      'US'
     end
 
     it { should be_country }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sypex_geo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kolesnikov Danil
@@ -85,6 +85,7 @@ files:
 - lib/sypex_geo/pack.rb
 - lib/sypex_geo/result.rb
 - lib/sypex_geo/version.rb
+- spec/lib/pack_spec.rb
 - spec/spec_helper.rb
 - spec/support/invalid.dat
 - spec/sypex_geo_spec.rb
@@ -109,11 +110,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sypex Geo IP database adapter for Ruby.
 test_files:
+- spec/lib/pack_spec.rb
 - spec/spec_helper.rb
 - spec/support/invalid.dat
 - spec/sypex_geo_spec.rb