Event Driven Support

Gemfile

@@ -6,3 +6,5 @@ gem 'rspec'
 gem 'vcr'
 gem 'webmock'
 gem 'timecop'
+gem 'eventmachine'
+gem 'em-http-request'

lib/serp_metrics/command_sets/base.rb

@@ -1,3 +1,6 @@
+require 'eventmachine'
+require 'em-http'
+require 'fiber'
 require 'httpclient'
 
 module SerpMetrics
@@ -9,6 +12,40 @@ def initialize(client)
         self.client = client
       end
 
+      private
+
+      def get path, query=nil
+        if EM.reactor_thread?
+          f = Fiber.current
+          http = EventMachine::HttpRequest.new(path).get(:query => query)
+          http.errback {f.resume(http.response)}
+          http.callback {f.resume(http.response)}
+          return Fiber.yield
+        else
+          return HTTPClient.get(path, {
+            :query => (to_query(query) unless query.empty?)
+            } ).body
+        end
+      end
+
+      def post path, query
+        if EM.reactor_thread?
+          f = Fiber.current
+          http = EventMachine::HttpRequest.new(path).post(:body => query)
+          http.errback {f.resume(http.response)}
+          http.callback {f.resume(http.response)}
+          return Fiber.yield
+        else
+          inner_res = HTTPClient.post(path, {
+            :body => (to_query(query) unless query.empty?)
+          })
+          if inner_res.redirect?
+            inner_res = HTTPClient.get(inner_res.http_header['Location'].first)
+          end
+          return inner_res.body
+        end
+      end
+
       protected
 
       def transact(method, path, options = {})
@@ -17,24 +54,19 @@ def transact(method, path, options = {})
         query = signature_hash
         query = query.merge(:params => options.to_json) unless options.empty?
 
-        res = case method
+        body = case method
         when :get
-          HTTPClient.get(SerpMetrics::API_URI + path, {
-            :query => (to_query(query) unless query.empty?)
-          })
+          get(SerpMetrics::API_URI + path, query)
         when :post
-          inner_res = HTTPClient.post(SerpMetrics::API_URI + path, {
-            :body => (to_query(query) unless query.empty?)
-          })
-
-          if inner_res.redirect?
-            inner_res = HTTPClient.get(inner_res.http_header['Location'].first)
-          end
-
-          inner_res
+          post(SerpMetrics::API_URI + path, query)
         end
 
-        JSON.parse(res.body)
+        begin
+          result = JSON.parse(body)
+        rescue => e
+          result = {'status'=>"error: #{e.message}", 'raw'=>body}
+        end
+        result
       end
 
       private

lib/serp_metrics/command_sets/keywords.rb

@@ -33,8 +33,12 @@ def serp(check_id, domain = nil)
         transact(:post, '/keywords/serp', transaction_options)
       end
 
-      def all
-        transact(:post, '/keywords/all')
+      def all page=1, limit=100
+        transaction_options = {
+          :page => page,
+          :limit => limit
+        }
+        transact(:post, '/keywords/all', transaction_options)
       end
     end
   end

lib/serp_metrics/version.rb

@@ -1,3 +1,3 @@
 module SerpMetrics
-  VERSION = '0.1.0'
+  VERSION = '0.1.3'
 end

serp_metrics.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'multi_json', '~> 1.3'
   gem.add_runtime_dependency 'httpclient', '~> 2.3'
+  gem.add_runtime_dependency 'eventmachine'
+  gem.add_runtime_dependency 'em-http-request'
 end