blekko-search 0.0.1 → 0.0.2

data/lib/blekko-search/blekko.rb

@@ -1,12 +1,15 @@
 class Blekko
-  HOST = "www.blekko.com"
+  HOST = "blekko.com"
   DEFAULT_MAX_FREQUENCY_PER_SECOND = 1
+  SECURE_PROTOCOL = "https://"
+  NON_SECURE_PROTOCOL = "http://"
       
-  attr_accessor :protocol, :api_key, :max_frequency_per_second, :username, :password, :login_cookie
+  attr_accessor :protocol, :api_key, :max_frequency_per_second, :username, :password, :login_cookie,
+  :last_request_at
       
   def initialize(args={})
     @api_key = args[:api_key]
-    @protocol = args[:secure] ? "https://" : "http://"
+    @protocol = args[:secure] ? SECURE_PROTOCOL : NON_SECURE_PROTOCOL
     @username = args[:username]
     @password = args[:password]
     @max_frequency_per_second = args[:max_frequency_per_second] || DEFAULT_MAX_FREQUENCY_PER_SECOND
@@ -25,14 +28,20 @@ class Blekko
     Blekko::Slashtag.new(self, name, args)
   end
   
+  def request(url)
+    sleep(seconds_until_next_request)
+    self.last_request_at = Time.now
+    open(url, headers)
+  end
+  
   def login_uri
-    URI("https://blekko.com/login?u=#{CGI.escape(username)}&p=#{CGI.escape(password)}&auth=#{api_key}")
+    URI("#{SECURE_PROTOCOL}#{HOST}/login?u=#{CGI.escape(username)}&p=#{CGI.escape(password)}&auth=#{api_key}")
   end
   
   def headers
     { 
-      "Cookie" => "A=AfGTtGoSio7Hnc1xiaSrwkJX4ggMfcFiBXufPUPQXZvB5TRe36Q6tPI4woK6SKO8%2Bh8qeD7z0qEk%2B4Ceg5N9HA95UTpznKUvuuEfb04GiwhAlKARpLnp18%2BI6EYQfes1PB0QNnhHwEAC3kLjyJqCZbsxVw8ud4Z6F%2Fbg6BvJj28L;",
-      "User-Agent" => "Ruby"
+      "Cookie" => login_cookie,
+      "User-Agent" => "blekko-search-#{BlekkoSearch::VERSION}"
     }
   end
   
@@ -44,5 +53,17 @@ class Blekko
     end
   end
   
+  def delay_between_requests
+    1 / max_frequency_per_second.to_f
+  end
+  
+  def earliest_next_request
+    last_request_at ? last_request_at + delay_between_requests : Time.now
+  end
+  
+  def seconds_until_next_request
+    [earliest_next_request - Time.now, 0].max
+  end
+  
   
 end

data/lib/blekko-search/search.rb

@@ -6,7 +6,7 @@ class Blekko
     PREFIX = "/ws/?q="
     RESPONSE_FORMAT = "/json+/"
     
-    attr_accessor :query, :slashtags, :results
+    attr_accessor :query, :slashtags, :results, :blekko
     
     def initialize(blekko, query, args={})
       args = {page_size: DEFAULT_PAGE_SIZE }.merge(args)
@@ -24,7 +24,7 @@ class Blekko
     def search
       page_number = 0
       number_of_searches.times do
-        response = JSON.load(open(url(page_number)))
+        response = JSON.load(blekko.request(url(page_number)))
         if response['RESULT']
           self.results += response['RESULT'].collect { |r| Blekko::SearchResult.new(r) }
         else
@@ -40,7 +40,7 @@ class Blekko
     end
     
     def escaped_query
-      CGI.escape(query + " ") + @slashtags.join("+") + "+"
+      CGI.escape(query + " ") + @slashtags.collect { |s| CGI.escape(s) }.join("+") + "+"
     end
         
     def page_size_param
@@ -48,11 +48,11 @@ class Blekko
     end
     
     def page_number_param(page_number)
-      "p=#{page_number}"
+      "p=#{page_number}" if page_number > 0
     end
     
     def auth_param
-      @blekko.api_key ? "auth=#{@blekko.api_key}" : nil
+      blekko.api_key ? "auth=#{blekko.api_key}" : nil
     end
     
     def params(page_number)
@@ -60,7 +60,7 @@ class Blekko
     end
     
     def url(page_number)
-      @blekko.protocol + @blekko.host + PREFIX + escaped_query + RESPONSE_FORMAT + params(page_number)
+      blekko.protocol + blekko.host + PREFIX + escaped_query + RESPONSE_FORMAT + params(page_number)
     end
         
   end

data/lib/blekko-search/slashtag.rb

@@ -8,7 +8,7 @@ class Blekko
       @blekko = blekko
       @name = name
       @urls = *args[:urls]
-      if args[:eager_load] && !@urls
+      if args[:eager_load] && urls.empty?
         self.urls = saved_urls
       end
     end
@@ -19,7 +19,7 @@ class Blekko
     
     def saved_urls
       url = blekko.protocol + blekko.host + "/tag/view?name=" + CGI.escape(name) + "&format=text&auth=#{blekko.api_key}"
-      lines = open(url).collect { |line| line.strip }
+      lines = open(url, blekko.headers).collect { |line| line.strip }
       unless lines.first.scan(" ").any?
         lines.collect { |line| line }
       end
@@ -37,35 +37,34 @@ class Blekko
     end
     
     def remove_urls!(target_urls)
-      open(remove_url(target_urls), blekko.headers)
+      blekko.request(remove_url(target_urls))
       true
     end
 
     
     def create!
-      open(save_url("create"), blekko.headers)
+      blekko.request(save_url("create"))
     end
     
     def update!
-      open(save_url("update"), blekko.headers)      
+      blekko.request(save_url("update"))      
     end
     
-    
     def save_url(method, target_urls=urls)
-      "https://" + blekko.host + "/tag/add?name=#{name}&submit=#{method}&urls=#{urls.join("%0A")}&auth=#{blekko.api_key}"
+      blekko.protocol + blekko.host + "/tag/add?name=#{name}&submit=#{method}&urls=#{urls.join("%0A")}&auth=#{blekko.api_key}"
     end
     
     def remove_url(target_urls)
-      "https://" + blekko.host + "/tag/edit?submit=1&type=del&name=#{name}&urls=#{target_urls.join("%0A")}&auth=#{blekko.api_key}"
+      blekko.protocol + blekko.host + "/tag/edit?submit=1&type=del&name=#{name}&urls=#{target_urls.join("%0A")}&auth=#{blekko.api_key}"
     end
     
     def delete_url
-      "https://blekko.com/tag/delete?submit=1&name=#{name}&auth=#{blekko.api_key}"
+      blekko.protocol + blekko.host + "/tag/delete?submit=1&name=#{name}&auth=#{blekko.api_key}"
     end
     
     def delete!
       return ArgumentError, "This is not implemented by blekko yet"
-      open(delete_url, blekko.headers)
+      blekko.reqeust(delete_url)
     end
         
   end

data/lib/blekko-search/version.rb

@@ -1,3 +1,3 @@
 module BlekkoSearch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blekko-search
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: