passivetotal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466cf1dbb64b1dd6a08c99f7fe7b704abd5174f7
-  data.tar.gz: 7d83f321c9d76c14fa90ab614a44a60dbb2aa1bf
+  metadata.gz: ba999440914765150f5879f7e1477360c8004395
+  data.tar.gz: 4c5af19bed80397c721e95908500993825d15675
 SHA512:
-  metadata.gz: 30b2003a7f8a0336eb11110e3fbce59a9a0ddeb62493c0ad9c1244d1f44226d16a8f8fafeda08296e5e34b756baf0cfea7cabde3792d9ea311f8fdf6b88cc63f
-  data.tar.gz: 3b0127725ccba2de6fe62a8baf99aefaa18f4dc032fa5b32a47a9160398e37f1e905c280f7b4e24971589ef26ca3fbcd7d24f9212a3b058fe8959e9a6d49f760
+  metadata.gz: 3ab4e9de47859d9a39ff2529701fdeb7bd71f625dfa62643a2ab043bca552c0e51a796401b008f7a1024a8f1f6acbe1aaec1e9c7c27e6f67338f5b6898130289
+  data.tar.gz: e7b9320ce2cd7638ee222220ed314de0c7044c5675273bc5be2b6e2fed643f568c36a324161a302cf3250b85f5d01207c95777275ba2095c57e79c18a4761a69

data/lib/passivetotal/api.rb

@@ -10,6 +10,10 @@ module PassiveTotal # :nodoc:
   
   class InvalidAPIKeyError < ArgumentError; end
   
+  class Transaction < Struct.new(:query, :response, :response_time); end
+  class Query < Struct.new(:api, :query, :set, :url, :parameters); end
+  class Response < Struct.new(:json, :success, :request_time, :raw_query, :error, :result_count, :results); end
+  
   # The API class wraps the PassiveTotal.org web API for all the verbs that it supports
   # See https://www.passivetotal.org/api/docs for the API documentation.
   class API
@@ -273,7 +277,14 @@ module PassiveTotal # :nodoc:
 			response = http.request(request)
 			delta = (Time.now - t1).to_f
       data = JSON.parse(response.body)
-      return data
+      
+      obj = Transaction.new(
+        Query.new(method, params['query'], params[method] || params['tag'], url, params),
+        Response.new(response.body, data['success'], data['request_time'], data['raw_query'], data['error'], data['result_count'], data['results']),
+        delta
+      )
+
+      return obj
     end
     
     # tests an item to see if it matches a valid type

data/lib/passivetotal/cli.rb

@@ -148,7 +148,8 @@ module PassiveTotal # :nodoc:
         else
           data = pt.send(options[:method], options[:query])
         end
-        return JSON.pretty_generate(data['results'])
+        data.response.results['response_time'] = data.query.response_time
+        return JSON.pretty_generate(data.response.results)
       end
       return ''
     end

data/lib/passivetotal/version.rb

@@ -1,3 +1,3 @@
 module PassiveTotal
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivetotal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json