pagespeedhelper 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5110042bea6a93493b44a485133f4e57ce5dee5d
-  data.tar.gz: 688de312a32498747b26ecfdc5a82395287e31aa
+  metadata.gz: 8e2d33727ae481ad8eea2d8bf9ab79e758ea20ca
+  data.tar.gz: 5385ef3013641f3b4382cf4982a56e49435d8d5b
 SHA512:
-  metadata.gz: 7abc65dcdab8d4b290330eb6d305170a28257ac91d20d693082474763bf549a96f042694f9f647c9a5760a327bba60a327e638237a909c5364201777a32ff71f
-  data.tar.gz: 0dc2a47cdaba059686b7f7634f5efc8f88417fc949ff0da7826e9fac589facd6c976c5248da8414049f481a78702fe0395b51f3241fb8c368b49b4efc131d296
+  metadata.gz: 28f738beae2467d992cf97e74613de0bd947560129814d4bd658e23b59692fe6a7405c2df4d389ed2dd6ad6e6fe1ee39bddd39bdf1e4d4e616ca5fecc3ea4725
+  data.tar.gz: 6e325e6c392825a2c4746e4f735d9a833e0e8379fd6b21f894247711a72a9af8bac944cba5d221e4e9852bee336f5e712a5e2d9ad9c7edf184e7e572525ef08e

data/lib/pagespeedhelper.rb

@@ -6,9 +6,10 @@ class PagespeedHelper
   
   Pagespeedonline = Google::Apis::PagespeedonlineV2
   
-  def initialize(key, debug=false)
+  def initialize(key, limit=32, debug=false)
     @psservice = Pagespeedonline::PagespeedonlineService.new
     @psservice.key = key
+    @wait_limit = limit
 
     if debug
       Google::Apis.logger = Logger.new(STDERR)
@@ -16,20 +17,40 @@ class PagespeedHelper
     end
   end
 
-  def query(urls, secure=false, strategy="desktop")
+  def query(urls, strategy="desktop", secure="false")
+    @wait_time = 1
     data = Array.new 
 
     urls = [urls] if !urls.is_a?(Array)
     urls = urls.each { |url| add_protocol_if_absent!(url, secure) }
     
     urls.each_slice(20).to_a.each do |url_list|
-      data.concat send_request(url_list, strategy)
-      sleep(0.5)
-    end
+     
+      begin
+        results = send_request(url_list, strategy)
+      end while rate_error?(results)
 
+      data.concat results
+      sleep(3)
+    end
+    
     data
   end
 
+  def rate_error?(data)
+    data.each do |d|
+      if d.is_a?(Hash)
+        if d["error"].include?("rateLimitExceeded") or d["error"].include?("userRateLimitExceeded")
+          puts "RATE ERROR OCCURRED: Waiting #{@wait_time} seconds"
+          sleep(@wait_time)
+          @wait_time < @wait_limit ? @wait_time *= 2 : @wait_limit
+          return true
+        end
+      end
+    end
+    return false
+  end
+
   def self.parse(data) 
     results = Array.new
     
@@ -85,17 +106,25 @@ class PagespeedHelper
 
   private
 
+  def time_throttle
+    finish = Time.now
+    puts finish - @start
+    if finish - @start < 100
+      sleep(100 - (finish - @start))
+    end
+    @start = Time.now
+  end
+
   def send_request(urls, strategy="desktop")
     data = Array.new
     
     @psservice.batch do |ps|
       urls.each do |url|
         ps.run_pagespeed(url, strategy: strategy) do |result, err|
-          err.nil? ? data.push(result) : data.push({ "url" => url, "error" => err })
+          err.nil? ? data.push(result) : data.push({ "url" => url, "error" => err.to_s })
         end
       end
     end
-    
     data
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagespeedhelper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Kirk Stennett