sypex_geo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7561aef15597c229eade88c0f336e86cfc6d2894
-  data.tar.gz: a85ff0572ef6aa59fe54daf3f56cb6413079e125
+  metadata.gz: 779670bdba2a9501832e6abe3f6d7e9af1b06e1d
+  data.tar.gz: 637e7857f219dcb6f253bda4910162a6ce42ad58
 SHA512:
-  metadata.gz: 623a87b4e18f3d4eb85f2739e621337f5aa34f99454bcd36de44a5dc4409a330ec7ba013bc513c947c47609f288dc87f5fe0888dcbbdd70afb3c2f0d97d67055
-  data.tar.gz: 41452d01235f3b3caaa6b444262c24f0698d49d54b1aef93cd5f02a6b6d9edab3a9ae84a2e85b9842715137322b7aae28104615aa1447500f4e2d9d318a40fb2
+  metadata.gz: 81fe140b1d6d9dcc490caa7449c4909fd650458c2f15c64feda9cd242bf93d4c5548c4f4255d52cfaefc9773b2507b24aae6d61ed4500480f2f63f15c4884c7e
+  data.tar.gz: e3e7ff6ed788e1b2837a033ca85d20c75ff094c207a95fe8efc5412721af646b78a4c2a5f5b6452a3ed7d15a1924af5f79ad7e13803b5e1e93dbf863086323e7

data/.travis.yml

@@ -6,12 +6,11 @@ rvm:
   - 2.1.0
 
 env:
-  - SXGEO_DB=SxGeo.dat
-  - SXGEO_CITY_DB=SxGeoCity.dat
+  - SXGEO_DB=SxGeo.dat SXGEO_CITY_DB=SxGeoCity.dat
 
 before_script:
-  - 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
+  - wget http://sypexgeo.net/files/SxGeoCountry.zip && unzip SxGeoCountry.zip
+  - wget http://sypexgeo.net/files/SxGeoCity_utf8.zip && unzip SxGeoCity_utf8.zip
 
 addons:
   code_climate:

data/lib/sypex_geo/pack.rb

@@ -1,108 +1,76 @@
 module SypexGeo
   class Pack
     def initialize(pack)
-      @pack = pack
+      setup_pack(pack)
     end
 
     def parse(data)
-      @data = data
-      @pos = 0
-      result = {}
-
-      @pack.split('/').each do |part|
-        chunk, name = part.split(':')
-        result[name.to_sym] = parse_chunk(chunk)
-      end
-
-      result
+      Hash[@keys.zip(process(data.unpack(@format)))]
     end
 
     protected
 
-    def parse_chunk(chunk)
-      case chunk[0]
-      when 't' then read_int8(chunk)
-      when 'T' then read_uint8(chunk)
-      when 's' then read_int16(chunk)
-      when 'S' then read_uint16(chunk)
-      when 'm' then read_int24(chunk)
-      when 'M' then read_uint24(chunk)
-      when 'i' then read_int32(chunk)
-      when 'I' then read_uint32(chunk)
-      when 'f' then read_float(chunk)
-      when 'd' then read_double(chunk)
-      when 'n' then read_decimal16(chunk)
-      when 'N' then read_decimal32(chunk)
-      when 'c' then read_chars(chunk)
-      when 'b' then read_blob(chunk)
-      end
-    end
-
-    def read(len)
-      @pos += len
-      @data[@pos - len, len]
-    end
-
-    def read_string(len)
-      read(len).strip.force_encoding('UTF-8')
-    end
+    def setup_pack(pack)
+      @keys = []
+      @format = ''
+      @processors = []
 
-    def read_int8(chunk)
-      read(1).unpack('c')[0]
-    end
+      pack.split('/').each do |part|
+        chunk, key = part.split(':')
+        parser = chunk_parser(chunk)
 
-    def read_uint8(chunk)
-      read(1).unpack('C')[0]
-    end
-
-    def read_int16(chunk)
-      read(2).unpack('s')[0]
-    end
-
-    def read_uint16(chunk)
-      read(2).unpack('S')[0]
-    end
-
-    def read_int24(chunk)
-      raw = read(3)
-      raw += (raw[2].unpack('C')[0] >> 7) > 0 ? "\xFF" : "\x00"
-      raw.unpack('l')[0]
-    end
-
-    def read_uint24(chunk)
-      (read(3) + "\x00").unpack('L')[0]
-    end
-
-    def read_int32(chunk)
-      read(4).unpack('l')[0]
-    end
-
-    def read_uint32(chunk)
-      read(4).unpack('L')[0]
+        @keys       << key.to_sym
+        @format     << parser.shift
+        @processors << (parser.empty? ? nil : parser)
+      end
     end
 
-    def read_float(chunk)
-      read(4).unpack('f')[0]
+    def process(vals)
+      vals.each_with_index.map do |val, i|
+        if processor = @processors[i]
+          name = processor.shift
+          args = processor
+          args.unshift(val)
+          send(name, *args)
+        else
+          val
+        end
+      end
     end
 
-    def read_double(chunk)
-      read(8).unpack('d')[0]
+    def chunk_parser(chunk)
+      case chunk[0]
+      when 't' then [ 'c' ]
+      when 'T' then [ 'C' ]
+      when 's' then [ 's' ]
+      when 'S' then [ 'S' ]
+      when 'm' then [ 'a3', :parse_int24 ]
+      when 'M' then [ 'a3', :parse_uint24 ]
+      when 'i' then [ 'l' ]
+      when 'I' then [ 'L' ]
+      when 'f' then [ 'f' ]
+      when 'd' then [ 'D' ]
+      when 'n' then [ 'a2', :parse_decimal, 's', chunk[1] ]
+      when 'N' then [ 'a4', :parse_decimal, 'l', chunk[1] ]
+      when 'c' then [ 'a' + chunk[1], :parse_string ]
+      when 'b' then [ 'Z*', :parse_string ]
+      end
     end
 
-    def read_decimal16(chunk)
-      read(2).unpack('s')[0].to_f / (10 ** chunk[1].to_i)
+    def parse_int24(val)
+      (val + (val[2].ord >> 7 > 0 ? "\xFF" : "\x00").b).unpack('l')[0]
     end
 
-    def read_decimal32(chunk)
-      read(4).unpack('l')[0].to_f / (10 ** chunk[1].to_i)
+    def parse_uint24(val)
+      (val + "\x00").unpack('L')[0]
     end
 
-    def read_chars(chunk)
-      read_string(chunk[1..-1].to_i)
+    def parse_decimal(val, format, fract)
+      val.unpack(format)[0].to_f / (10 ** fract.to_i)
     end
 
-    def read_blob(chunk)
-      read_string(@data.index("\0", @pos) - @pos + 1)
+    def parse_string(val)
+      val.strip.force_encoding('UTF-8')
     end
   end
 end

data/lib/sypex_geo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sypex_geo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kolesnikov Danil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler