china_ad_ip 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2843375b1e8d8c3774555b89c6a013a1a3c72e6
-  data.tar.gz: 451511841770b5b769eaa81cfce5e69c3d0cbc7d
+  metadata.gz: 51894aa7d843175da120f97cd8bd4620b0f4989e
+  data.tar.gz: bd66c0b0f995b967dae4ce8745de0b114a659819
 SHA512:
-  metadata.gz: 877f77cb9f8d8fe03e4d811728a4d5d974ca379055d704e5c6395aaf85fcd2a9b0a7a66d9022de69bd8ddf261ea0d52ac8b58b49e93e793d6b6152f91f9e6846
-  data.tar.gz: b5dce2b00f9cc63b43cf0e7b59b28c2090e0e38691145f267ab988191d680c63c30a3e51447340b252c959b6b695c601f7ae2a14989c5cb43205a1c0f3430dfc
+  metadata.gz: 36ce4628c8d63a91d529ebea2e9782daedb965d4f9c4cb2760c15362970ddd367e20af97e59bee97ad92fe7051de5f693df93b2588df4dcbbe89b6a8fa98731a
+  data.tar.gz: a11d9901788adb08187d903fae7e94c698c1e63bf9f5c89352a0f8c083b990a97bf4529f63a7ae9e0f654f107cb5478191584b42544dbafee92b096730d58759

data/lib/china_ad_ip/version.rb

@@ -1,3 +1,3 @@
 module ChinaAdIp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/china_ad_ip.rb

@@ -60,9 +60,9 @@ module ChinaAdIp
     unless FileTest::exist?(path)
       raise(::ArgumentError, "not exists: #{path}")
     else
-      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]]  }
+      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]]  }
       end
     end
   end
@@ -72,9 +72,9 @@ module ChinaAdIp
     unless FileTest::exist?(path)
       raise(::ArgumentError, "not exists: #{path}")
     else
-      if $locations.nil?
-        $locations = CSV.read(path,:encoding=>"utf-8") 
-        $locations = Hash[$locations.map {|location| id = location.shift; [id,location << !!id.match(/^1156/)] }]
+      if @locations.nil?
+        @locations = CSV.read(path,:encoding=>"utf-8") 
+        @locations = Hash[@locations.map {|location| id = location.shift; [id,location << !!id.match(/^1156/)] }]
       end
     end
   end
@@ -84,9 +84,9 @@ module ChinaAdIp
 
     ip_addr = ChinaAdIp::IPv4.new(addr)
 
-    if $ip_sections && $locations
+    if @ip_sections && @locations
       index =  ChinaAdIp.binarysearch(self.arr_pointer,ip_addr.to_i,ip_arr.length)
-      $locations[$ip_sections[index][2]]
+      @locations[@ip_sections[index][2]]
     else
       raise(::ArgumentError, "not exists csv data")    
     end
@@ -95,12 +95,12 @@ module ChinaAdIp
 
 
   def self.ip_arr
-    @@ip_arr ||= $ip_sections.collect{|ip_section| ip_section[0]}.to_a
+    @ip_arr ||= @ip_sections.collect{|ip_section| ip_section[0]}.to_a
   end
 
   def self.arr_pointer
     buffer = LibC.malloc(ip_arr.first.size * ip_arr.size)
-    buffer.write_array_of_long ip_arr
+    @pointer ||=  buffer.write_array_of_long ip_arr
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: china_ad_ip
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - suezhen