ruby-deepviz 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44b01fa727f0399b883d01335d5dc16f1fba6fe
-  data.tar.gz: da7bbe5af9c42701c3482bf555c63aa590960d35
+  metadata.gz: 315585d0473d6645a28885fe73792f08ef8b6761
+  data.tar.gz: 28abe1ebaa5fe667e3244ed65f2b65216450ff27
 SHA512:
-  metadata.gz: 00bc1d775013fb84b31dfc056c7a7102193cde2da6caf33ab639db5a42e26708e48e4059da31f87925a0aadc6e2f196d6a7211c76921a0c2ecdba236afe416e3
-  data.tar.gz: c3d5ef4da194adab29d1774c5e5cd830d8be91b3c9d357ed73ecba8f8c180e2f3bc24bded69a003eeb1fb79df4d50ac34a06ff6e1011906b4dacf48041cfdcd7
+  metadata.gz: dd125a0812e4c121986638250f058f3cb09643ca3f9dba303e6150f7bd852c1247ad906995bea146bd0d4a364429509ca7ff8705fe1a23ca2ad6c00204614625
+  data.tar.gz: 1e908fb70c7830624b0d7af1e10425b06ffe7187fda6c98c65bae3525613094c11cb8d90f2328225a8e66ba6c9dd1343ac5a12283cfb97c90c5c0b9845f554fd

data/lib/deepviz/intel.rb

@@ -8,116 +8,65 @@ class Intel
   URL_INTEL_DOMAIN            = 'https://api.deepviz.com/intel/network/domain'
   URL_INTEL_SEARCH_ADVANCED   = 'https://api.deepviz.com/intel/search/advanced'
 
-  def ip_info(api_key, options={})
+  def ip_info(api_key, ip, filters=nil)
     if api_key == nil or api_key == ''
       return Result.new(status=INPUT_ERROR, msg='API key cannot be null or empty String')
     end
 
-    defaults = {
-        :ip => nil,
-        :history => false,
-        :time_delta => nil,
-    }
-
-    options = defaults.merge(options)
-
-    if (!options['ip'].kind_of?(Array) and (options['time_delta'] == nil or options['time_delta'] == '')) or (options['ip'].kind_of?(Array) and options['time_delta'] != nil and options['time_delta'] != '')
-      msg = 'Parameters missing or invalid. You must specify either a list of IPs or time delta'
+    if ip.nil? or ip == ''
+      msg = 'Parameters missing or invalid. You must specify an IP.'
       return Result.new(status=INPUT_ERROR, msg=msg)
     end
 
-    if options['history']
-      _history = 'true'
-    else
-      _history = 'false'
+    if filters != nil and !filters.kind_of?(Array)
+      msg = 'You must provide one or more output filters in a list'
+      return Result.new(status=INPUT_ERROR, msg=msg)
     end
 
-    if options['ip'] != nil and !options['ip'].kind_of?(Array)
-      msg = 'You must provide one or more IPs in a list'
-      return Result.new(status=INPUT_ERROR, msg=msg)
-    else
+    if filters != nil
       body = {
-        :ip => options['ip'],
-        :history => _history,
+        :output_filters => filters,
         :api_key => api_key,
+        :ip => ip,
       }
-    end
-
-    if options['time_delta'] != nil and options['time_delta'] != ''
+    else
       body = {
-          :time_delta => options['time_delta'],
-          :history => _history,
           :api_key => api_key,
+          :ip => ip,
       }
     end
 
     return do_post(body, URL_INTEL_IP)
   end
 
-  def domain_info(api_key, options={})
-    if api_key == nil or api_key == ''
+
+  def domain_info(api_key, domain, filters = nil)
+    if api_key.nil? or api_key == ''
       return Result.new(status=INPUT_ERROR, msg='API key cannot be null or empty String')
     end
 
-    defaults = {
-        :domain => nil,
-        :filters => nil,
-        :history => false,
-        :time_delta => nil,
-    }
-
-    options = defaults.merge(options)
 
-    if (!options['domain'].kind_of?(Array) and (options['time_delta'] == nil or options['time_delta'] == '')) or (options['domain'].kind_of?(Array) and options['time_delta'] != nil and options['time_delta'] != '')
-      msg = 'Parameters missing or invalid. You must specify either a list of domains or time delta'
+    if domain.nil? or domain == ''
+      msg = 'Parameters missing or invalid. You must specify an domain.'
       return Result.new(status=INPUT_ERROR, msg=msg)
     end
 
-    if options['history']
-      _history = 'true'
-    else
-      _history = 'false'
-    end
-
-    if options['filters'] != nil and !options['filters'].kind_of?(Array)
+    if filters != nil and !filters.kind_of?(Array)
       msg = 'You must provide one or more output filters in a list'
       return Result.new(status=INPUT_ERROR, msg=msg)
     end
 
-    body = {}
-
-    if options['domain'].kind_of?(Array)
-      if options['filters'] != nil
-        body = {
-          :output_filters => options['filters'],
-          :domain => options['domain'],
-          :history => _history,
-          :api_key => api_key,
-        }
-      else
-        body = {
-          :domain => options['domain'],
-          :history => _history,
-          :api_key => api_key,
-        }
-      end
-    end
-
-    if options['time_delta'] != nil and options['time_delta'] != ''
-      if options['filters'] != nil
-        body = {
-          :time_delta => options['time_delta'],
-          :output_filters => options['filters'],
-          :history => _history,
+    if filters != nil
+      body = {
+          :output_filters => filters,
           :api_key => api_key,
-        }
-      else
-        body = {
-          :time_delta => options['time_delta'],
-          :history => _history,
+          :domain => domain,
+      }
+    else
+      body = {
           :api_key => api_key,
-        }
-      end
+          :domain => domain,
+      }
     end
 
     return do_post(body, URL_INTEL_DOMAIN)
@@ -299,5 +248,4 @@ class Intel
   end
 
   private :do_post
-end
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-deepviz
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Saferbytes S.r.l.s.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.a
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.a
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: unirest
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ruby-deepviz is a Ruby wrapper for deepviz.com REST APIs