pear_warranty 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d02cfd647347b554ae3f5cadbaa2112026de3565
-  data.tar.gz: 0301c37701a36369fcb8f6fc85626f98c9297995
+  metadata.gz: 178340311308b99dcbcbb034367ad6f0a04b2a2a
+  data.tar.gz: 1044186ab6a3c52c516f49733ac78e54a65339d9
 SHA512:
-  metadata.gz: 74f6407b991dae65ebeceb6523cb78598927189163516242f88f857c8b920bc04d51320afb35475700c44cb0757232132dbaeb9a0915e9259a7e8c5c50c6d27d
-  data.tar.gz: a50b83b0c678485c22548f5fae3864518cdfbdc6e7a706a93f28169c59743516b5a49033ca64b35b337451d070152714c5ccf6a9376bc72eeea1233a1a04c0a6
+  metadata.gz: fb592fb527fe268121d98c9a884273ff2128ccef256950167885073a368c4231b1ccc5224e5bafd37a2b35836da31eb20075a6981365f036254990f933ed7c68
+  data.tar.gz: 34a5b2234776489d73fce21ef662686411cd4613bc6c73d49f48a705a48b262199c92d61c0de45defbf49be2274aff5e4f283ae2853172d9b787538ed4d25d2e

data/README.md

@@ -41,6 +41,37 @@ PearWarranty.check('your IMEI here', 0)
 ```
 Proxy index must be in range of 0 and `PearWarranty::PROXIES.size`. If it goes out randomly chosen will be used.
 
+### Available proxies:
+
+* 0 - Canada East
+* 1 - Germany
+* 2 - France (Strasbourg)
+* 3 - Netherlands
+* 4 - France (Roubaix)
+* 5 - France (Gravelines)
+* 6 - United States Central (TX)
+* 7 - United States East (NJ)
+* 8 - United States Central (IL)
+* 9 - United States East (GA)
+
+To improve speed your should to test which of proxies works for you most frequently. For my location (Ukraine) speed test show that result (each one is for 50 requests):
+
+Proxy index | Location | Speed
+:----------:|:--------:|:----:
+0 | Canada | 94.452161
+1 | Germany | 138.392749
+2 | Strasbourg | 79.161559
+3 | Netherlands | 133.401920
+4 | Roubaix | 70.684222
+5 | Gravelines | 71.803946
+6 | TX | 83.853322
+7 | NJ | 75.568946
+8 | IL | 103.772447
+9 | GA | 75.414354
+- | random | 114.406067
+
+That`s why I prefer to use France (Roubaix) - 4th proxy.
+
 ## Dependencies
 
 - mechanize

data/lib/pear_warranty.rb

@@ -9,33 +9,42 @@ module PearWarranty
 
   def self.check(serial, proxy_index = nil)
     agent = Mechanize.new
-    proxy_index ||= rand(PROXIES.size)
+    proxies = [0,1,2,3,4,5,6,7,8,9]
+    unless proxy_index
+      proxy_index = rand(PROXIES.size)
+    else
+      proxies -= [proxy_index]
+    end
     page = nil
     error = true
     apple_url = "https://selfsolve.apple.com/wcResults.do?sn=#{serial}&Continue=Continue&num=0"
+    correct_reg = /warrantyPage\.warrantycheck\.displayHWSupportInfo/
+    invalid_reg = [/but this serial number is not valid/, /but the serial number you have provided cannot be found in our records/]
     TRIES.times do
       form = get_form(proxy_index, apple_url, agent)
       set_cookie(agent)
       begin
         page = agent.submit(form)
       rescue Net::HTTP::Persistent::Error
-        proxy_index = rand(PROXIES.size)
+        proxy_index = proxies[rand(proxies.size)]
+        proxies -= [proxy_index]
         next
       end
       page = page.body
-      unless page =~ /pferror/
+      if page =~ correct_reg or page =~ invalid_reg[1] or page =~ invalid_reg[0]
         error = false
         break
       end
-      proxy_index = rand(PROXIES.size)
+      proxy_index = proxies[rand(proxies.size)]
+      proxies -= [proxy_index]
     end
     if error
       {error: 'Problem with proxy'}
     else
-      if page =~ /(but this serial number is not valid)|(but the serial number you have provided cannot be found in our records)/
+      unless page =~ correct_reg
         { error: 'There is no such imei or service is not available at this moment' }
       else
-        text = page.split('warrantyPage.warrantycheck.displayPHSupportInfo')[1].scan(/\(.*\)/)[0].delete('()')
+        text = page.split(correct_reg)[1].scan(/\(.*\)/)[0].delete('()')
         params = text.split(', ')
         warranty = to_boolean(params.first.delete ' ')
         {

data/lib/pear_warranty/version.rb

@@ -1,3 +1,3 @@
 module PearWarranty
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/pear_warranty.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["moranibaca@gmail.com"]
   spec.summary       = %q{Get IPhone warranty information}
   spec.description   = %q{Get IPhone warranty information form  https://selfsolve.apple.com by device imei}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/imdrasil/pear_warranty"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/pear_warranty_spec.rb

@@ -82,7 +82,7 @@ RSpec.describe PearWarranty do
   end
 
   context :check, type: :request do
-    let(:date) { Date.new(2015, 9, 9)}
+    let(:date) { Date.new(2016, 6, 10)}
     before :all do
       @without_imei = '013896000639712'
       @with_imei = '013977000323877'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pear_warranty
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Roman Kalnytsky
@@ -116,7 +116,7 @@ files:
 - spec/support/uncorrect_warranty.html
 - spec/support/with_warranty.html
 - spec/support/without_warranty.html
-homepage: ''
+homepage: https://github.com/imdrasil/pear_warranty
 licenses:
 - MIT
 metadata: {}