china_ad_ip 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9bc78627bbd6e04faac3df9f93c7b18ea6f5582
-  data.tar.gz: 02be7d286c72a6478df85af793a5011c529f3a42
+  metadata.gz: 5a244dc776c275d808565a05f45e8ef3df31093c
+  data.tar.gz: 3a882d4bc95435917038b4785197613fba222fab
 SHA512:
-  metadata.gz: 6c994bfd73e03f14b7ea4f75c4a87c61fc1432553cb7ce8e1f0248c017284f37fa1869fb4d5a8d65d8561552ae4269f6a2129dbca30fd2859d085696c5ece70e
-  data.tar.gz: c1300750e77897772acfa2e91c98c18adf820a862970657f2be5a8c334c172f99e91b8e016653180114b4bab948745f9e1964b10cb5b6f10d7a0e93fffc70a33
+  metadata.gz: bd3d64a95e9c0b3f28b54f4b2696a9b9d7b96c664a1234516a5926ef588cd7934129060613304934ed37ab100fcb28c18e2990f691aba0e6a94c54b208d78643
+  data.tar.gz: eb18e99aec59bd2f85c1faa57854dd1f1fd8ef6a628dde7d5fac339ace4e88cb1bf0db8c9ab540059f656423af924bc57408420ff64022337bff140d272bb001

data/README.md

@@ -6,6 +6,7 @@ TODO: Write a gem description
 
 Add this line to your application's Gemfile:
 
+    gem 'ffi'
     gem 'china_ad_ip'
 
 And then execute:

data/lib/china_ad_ip/version.rb

@@ -1,3 +1,3 @@
 module ChinaAdIp
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/china_ad_ip.rb

@@ -63,7 +63,11 @@ module ChinaAdIp
       if @ip_sections.nil?
         @ip_sections = CSV.read(path) 
         @ip_sections.reject!{|ip_section| ChinaAdIp::IPv4.new(ip_section[0]).to_i==0 }.map! { |ip_section|  [ChinaAdIp::IPv4.new(ip_section[0]).to_i,ChinaAdIp::IPv4.new(ip_section[1]).to_i,ip_section[2],ip_section[3]]  }
+        ip_arr
+        ip_arr_length
+        arr_pointer
       end
+      true
     end
   end
 
@@ -73,9 +77,10 @@ module ChinaAdIp
       raise(::ArgumentError, "not exists: #{path}")
     else
       if @locations.nil?
-        @locations = CSV.read(path) 
+        @locations = CSV.read(path,:encoding=>"utf-8") 
         @locations = Hash[@locations.map {|location| id = location.shift; [id,location << !!id.match(/^1156/)] }]
       end
+      true
     end
   end
 
@@ -85,7 +90,7 @@ module ChinaAdIp
     ip_addr = ChinaAdIp::IPv4.new(addr)
 
     if @ip_sections && @locations
-      index =  ChinaAdIp.binarysearch(self.arr_pointer,ip_addr.to_i,ip_arr.length)
+      index =  ChinaAdIp.binarysearch(self.arr_pointer,ip_addr.to_i,ip_arr_length)
       @locations[@ip_sections[index][2]]
     else
       raise(::ArgumentError, "not exists csv data")    
@@ -93,6 +98,9 @@ module ChinaAdIp
 
   end
 
+  def self.ip_arr_length
+    @ip_arr_length ||= ip_arr.length
+  end
 
   def self.ip_arr
     @ip_arr ||= @ip_sections.collect{|ip_section| ip_section[0]}.to_a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: china_ad_ip
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - suezhen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler