opendns-dnsdb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ffc6fbdbd3300935d4bbedcfa0a9c6fabb2c2d
-  data.tar.gz: 5636e568eee7c925f5b2a2713f5394df5a3a4ce3
+  metadata.gz: b5557f34b1a5f2b37ec112510b02da914879a503
+  data.tar.gz: 8fc27e7efdb8dc0c71082fc09052e4f57205bf24
 SHA512:
-  metadata.gz: 2e0e80f6dba1e3445af8f10d8a8a46c3368a3e015624279d98bdd9902f49bd4c1f210640ec8a91ba384f4b773a9b99c8d378d0ff4a94c10aee355d25c2e0e21a
-  data.tar.gz: 70985d6a478bf5248520c316ec6b51642133fce350f4b51357b9c17804f39fc93a374c3b48d3affed9668fa85fb392c626dda626947b571a5f25593d6fd5ffec
+  metadata.gz: 15c19e88e6af7cd5295d32a1c641245b784ba4e6854065df759c132ff51a415861a0997cd737e0a1f9d25ca15c10a8585c5cade8a6edea4d58bf3cd0e0c8241e
+  data.tar.gz: 76b28419430338f5cb1f2ea7ed17b70c150715ff2ac8ea88a34e299171af20c350d6aeb177f6fb7749ab5ca24155503f78aa67da42df1d3b5bfc9a1d939ed8c1

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'descriptive_statistics'
-gem 'ethon'
 gem 'hashie'
 gem 'multi_json'
+gem 'typhoeus'
 
 gemspec

data/docs/index.rst

@@ -86,7 +86,7 @@ Supported options:
 * ``sslcert``: path to the SSL certificate
 * ``sslcerttype``: SSL certificate type, defaults to ``pem``.
 * ``sslcertpasswd``: SSL certificate password
-* ``maxconnects``: max number of parallel operations (default: 10)
+* ``max_concurrency``: max number of parallel operations (default: 10)
 
 Note on certificates format
 ===========================

data/lib/opendns-dnsdb/dnsdb.rb

@@ -1,6 +1,6 @@
 
 require 'date'
-require 'ethon'
+require 'typhoeus'
 require 'hashie'
 require 'multi_json'
 
@@ -21,22 +21,22 @@ module OpenDNS
     include OpenDNS::DNSDB::Traffic
     
     DEFAULT_TIMEOUT = 15
-    DEFAULT_MAXCONNECTS = 10
+    DEFAULT_MAX_CONCURRENCY = 10
     SGRAPH_API_BASE_URL = 'https://sgraph.umbrella.com'
 
     attr_reader :timeout
     attr_reader :sslcert
     attr_reader :sslcerttype
     attr_reader :sslcertpasswd
-    attr_reader :maxconnects
+    attr_reader :max_concurrency
 
     def initialize(params = { })
       raise UsageError, 'Missing certificate file' unless params[:sslcert]
       @sslcert = params[:sslcert]
       @timeout = DEFAULT_TIMEOUT
       @timeout = params[:timeout].to_f if params[:timeout]
-      @maxconnects = DEFAULT_MAXCONNECTS
-      @maxconnects = params[:maxconnects].to_i if params[:maxconnects]
+      @max_concurrency = DEFAULT_MAX_CONCURRENCY
+      @max_concurrency = params[:max_concurrency].to_i if params[:max_concurrency]
       @sslcerttype = params[:sslcerttype] || 'pem'
       @sslcertpasswd = params[:sslcertpasswd] || 'opendns'
       @options = {
@@ -44,15 +44,20 @@ module OpenDNS
         timeout: @timeout,
         sslcert: @sslcert,
         sslcerttype: @sslcerttype,
-        sslcertpasswd: @sslcertpasswd,
-        maxconnects: @maxconnects
+        sslcertpasswd: @sslcertpasswd
       }
     end
 
+    def query_multi
+      Typhoeus::Hydra.new(max_concurrency: @max_concurrency)
+    end
+    
     def query_handler(endpoint, method = :get, options = { })
       url = SGRAPH_API_BASE_URL + endpoint
-      query = Ethon::Easy.new(@options)
-      query.http_request(url, method, options)
+      options = options.merge(@options)
+      options.merge!(method: method)
+      query = Typhoeus::Request.new(url,
+        @options.merge(options).merge(method: method))
       query
     end
   end

data/lib/opendns-dnsdb/dnsdb/by_ip.rb

@@ -21,19 +21,19 @@ module OpenDNS
       def history_by_ip(ips, type)
         ips_is_array = ips.kind_of?(Enumerable)
         ips = [ ips ] unless ips_is_array
-        multi = Ethon::Multi.new
+        multi = query_multi
         queries = { }
         ips.each do |ip|
           next if queries[ip]
           url = "/dnsdb/ip/#{type}/#{ip}.json"
           query = query_handler(url)
-          multi.add(query)
+          multi.queue(query)
           queries[ip] = query
         end
-        multi.perform
+        multi.run
         responses = { }
         queries.each_pair do |ip, query|
-          obj = MultiJson.load(query.response_body)
+          obj = MultiJson.load(query.response.body)
           responses[ip] = Response::Raw.new(obj).rrs
         end
         responses = Response::HashByIP[responses]

data/lib/opendns-dnsdb/dnsdb/by_name.rb

@@ -21,19 +21,19 @@ module OpenDNS
       def history_by_name(names, type)
         names_is_array = names.kind_of?(Enumerable)
         names = [ names ] unless names_is_array
-        multi = Ethon::Multi.new
+        multi = query_multi
         queries = { }
         names.each do |name|
           next if queries[name]
           url = "/dnsdb/name/#{type}/#{name}.json"
           query = query_handler(url)
-          multi.add(query)
+          multi.queue(query)
           queries[name] = query
         end
-        multi.perform
+        multi.run
         responses = { }
         queries.each_pair do |name, query|
-          obj = MultiJson.load(query.response_body)
+          obj = MultiJson.load(query.response.body)
           responses[name] = Response::Raw.new(obj).rrs_tf
         end
         responses = Response::HashByName[responses]

data/lib/opendns-dnsdb/dnsdb/label.rb

@@ -14,14 +14,14 @@ module OpenDNS
       def labels_by_name(names)
         names_is_array = names.kind_of?(Enumerable)
         names = [ names ] unless names_is_array
-        multi = Ethon::Multi.new
+        multi = query_multi
         names_json = MultiJson.dump(names)
         cacheid = SipHash::digest(CACHE_KEY, names_json).to_s(16)
         url = "/infected/names/#{cacheid}.json"
         query = query_handler(url, :get, { body: names_json })
-        multi.add(query)
-        multi.perform
-        responses = MultiJson.load(query.response_body)
+        multi.queue(query)
+        multi.run
+        responses = MultiJson.load(query.response.body)
         responses = responses['scores']
         responses.each_pair do |name, label|
           responses[name] = [:suspicious, :unknown, :benign][label + 1]

data/lib/opendns-dnsdb/dnsdb/related.rb

@@ -9,28 +9,28 @@ module OpenDNS
       def related_names_with_score(names, &filter)
         names_is_array = names.kind_of?(Enumerable)
         names = [ names ] unless names_is_array
-        multi = Ethon::Multi.new
+        multi = query_multi
         queries_links = { }
         queries_coocs = { }
         names.each do |name|
           url_links = "/links/name/#{name}.json"
           query_links = query_handler(url_links)
-          multi.add(query_links)
+          multi.queue(query_links)
           queries_links[name] = query_links
 
           url_coocs = "/recommendations/name/#{name}.json"
           query_coocs = query_handler(url_coocs)
-          multi.add(query_coocs)
+          multi.queue(query_coocs)
           queries_coocs[name] = query_coocs
         end
-        multi.perform
+        multi.run
         responses = { }
         queries_coocs.each_pair do |name, query|
-          if query.response_body.empty?
+          if query.response.body.empty?
             responses[name] ||= { }
             next
           end
-          obj = MultiJson.load(query.response_body)
+          obj = MultiJson.load(query.response.body)
           if pfs2 = Response::Raw.new(obj).pfs2
             responses[name] = Hash[*pfs2.flatten]
           else
@@ -39,10 +39,10 @@ module OpenDNS
         end
         queries_links.each_pair do |name, query|
           responses[name] ||= { }          
-          if query.response_body.empty?
+          if query.response.body.empty?
             next
           end
-          obj = MultiJson.load(query.response_body)          
+          obj = MultiJson.load(query.response.body)          
           if tb1 = Response::Raw.new(obj).tb1          
             upper = [1.0, tb1.map { |x| x[1] }.max].max
             responses[name] = Hash[*tb1.map { |x| [x[0], x[1] / upper] }.flatten]

data/lib/opendns-dnsdb/dnsdb/traffic.rb

@@ -11,7 +11,7 @@ module OpenDNS
       def daily_traffic_by_name(names, options = { })
         names_is_array = names.kind_of?(Enumerable)
         names = [ names ] unless names_is_array
-        multi = Ethon::Multi.new
+        multi = query_multi
         date_end = options[:start] || Date.today
         date_end_s = CGI::escape("#{date_end.year}/#{date_end.month}/#{date_end.day}/23")
         days_back = options[:days_back] || DEFAULT_DAYS_BACK
@@ -25,13 +25,13 @@ module OpenDNS
           url_traffic = "/appserver/?v=1&function=domain2-system&domains=#{name0}" +
           "&locations=&start=#{date_start_s}&stop=#{date_end_s}"
           query_traffic = query_handler(url_traffic)
-          multi.add(query_traffic)
+          multi.queue(query_traffic)
           queries_traffic[name] = query_traffic
         end
-        multi.perform
+        multi.run
         responses = { }
         queries_traffic.each_pair do |name, query|
-          obj = MultiJson.load(query.response_body)
+          obj = MultiJson.load(query.response.body)
           tc = obj['response']
           tc = tc.group_by { |x| x[0].split('/')[0...3].join('/') }
           tc.each_key do |date_s|

data/lib/opendns-dnsdb/version.rb

@@ -1,5 +1,5 @@
 module OpenDNS
   class DNSDB
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opendns-dnsdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Frank Denis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake