fofa 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b606d3c74e7a72421fbed9e71bbfca25c6d6d04f
-  data.tar.gz: 43e5737e0f67c22e92521e7fd33f73b9d46328a0
+  metadata.gz: 3ce6f70d71b8ce5f95639e85ec14c4be632d37fa
+  data.tar.gz: 5aa510e4d45309d56ac7e1b3e53c604000c602b7
 SHA512:
-  metadata.gz: 2760f21dd6300a39d30e58688c08651390542ceac468fff5b0cebf500f316c761880fc944f143229ad6b8843067c6123afb3444f7d7cf3491505d7aefb17ab85
-  data.tar.gz: 0b8fccd0f3fdd6a47c67714cc366489cfd1330c04c5112021f25deb2b3f32f337192339e39da75a5d1ffab76775b87c9f2146b45a23480eee83ecd4f090325e0
+  metadata.gz: 7a4ed37b9e7182f1d4efa45910174f53512c02b8166c02fef7d67830597428fbf357f3e29b74e6787378c99220130edbaea3221c2e5848343b4f30adc76f08b7
+  data.tar.gz: c1210f6b9c8a85e554caeeb6db49941a5c2a8995ef10d601574e1e883c9058d099ac87935ac7c193db17e0a539180f359876fa8dc59e5a921ea79af46639de5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.4)
+    fofa (0.3.6)
 
 GEM
   remote: https://rubygems.org/
@@ -34,4 +34,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/lib/fofa.rb

@@ -15,11 +15,11 @@ module Fofa
   	# Search page results from fofa
   	#
   	# Example 1:
-  	#   >> Fofa::API.new(email,apikey).search("host==baidu.com")
+  	#   >> Fofa::API.new(email,apikey).search("host=baidu.com")
   	#   => {size:1, results:['1.1.1.1']}
     #
     # Example 2:
-    #   >> Fofa::API.new(email,apikey).search("host==baidu.com", fields:'host,title,ip')
+    #   >> Fofa::API.new(email,apikey).search("host=baidu.com", fields:'host,title,ip')
     #   => {size:1, results:[['1.1.1.1:81', 'title', '1.1.1.1']]}
   	#
   	# Arguments:
@@ -47,17 +47,27 @@ module Fofa
     #   >> Fofa::API.new(email,apikey).search_all("domain==baidu.com") {|results, page| ... }
     #   => {size:1, results:['1.1.1.1:80']}
     #
+    # Example:
+    #   >> Fofa::API.new(email,apikey).search_all("domain==baidu.com", fields:'host,title,ip') {|results, page| ... }
+    #   => {size:1, results:[['1.1.1.1:81', 'title', '1.1.1.1']]}
+    #
     # Arguments:
     #   query: (String) fofa query string
-    def search_all(query)
+    def search_all(query, options={})
+      all_size = options.delete :size # do not pass to search
       all_res = []
       page = 0
       loop do
         page += 1
-        res = search(query, {page:page})
+        res = search(query, {page:page}.merge(options))
         if !res['error'] && res['results'].size > 0
           all_res += res['results']
           yield(res['results'], page) if block_given?
+
+          if all_size && all_res.size > all_size.to_i
+            all_res = all_res[0..all_size-1]
+            break
+          end
         else
           break
         end

data/lib/fofa/version.rb

@@ -1,5 +1,5 @@
-# 0.3.5
+# 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - fofa