lib/siege/results.rb in bombard-0.0.6 vs lib/siege/results.rb in bombard-0.1.0

@@ -27,32 +27,32 @@
     alias_method :shortest, :shortest_request
     alias_method :longest,  :longest_request
     alias_method :response, :response_time
 
     def initialize(results)
-      @transactions         = Integer parse(:transactions)
-      @availability         = Float   parse(:availability)
-      @elapsed_time         = Float   parse(:elapsed_time)
-      @data_transferred     = Float   parse(:data_transferred)
-      @response_time        = Float   parse(:response_time)
-      @transaction_rate     = Float   parse(:transaction_rate)
-      @throughput           = Float   parse(:throughput)
-      @concurrency          = Float   parse(:concurrency)
-      @failed_requests      = Integer parse(:failed_requests)
-      @longest_request      = Float   parse(:longest_request)
-      @shortest_request     = Float   parse(:shortest_request)
       @results              = results
+      @transactions         = Integer parse(:TRANSACTIONS)
+      @availability         = Float   parse(:AVAILABILITY)
+      @elapsed_time         = Float   parse(:ELAPSED_TIME)
+      @data_transferred     = Float   parse(:DATA_TRANSFERRED)
+      @response_time        = Float   parse(:RESPONSE_TIME)
+      @transaction_rate     = Float   parse(:TRANSACTION_RATE)
+      @throughput           = Float   parse(:THROUGHPUT)
+      @concurrency          = Float   parse(:CONCURRENCY)
+      @failed_requests      = Integer parse(:FAILED_REQUESTS)
+      @longest_request      = Float   parse(:LONGEST_REQUEST)
+      @shortest_request     = Float   parse(:SHORTEST_REQUEST)
     rescue ArgumentError => e
       (e.message.include?('invalid value')) ? dump_results : raise(e)
     end
 
     def[](key)
       to_h.fetch(key)
     end
 
     def to_s
-      @results
+      @to_s ||= @results
     end
 
     def to_h
       {
         transactions:         @transactions,
@@ -68,14 +68,14 @@
         shortest_request:     @shortest_request
       }
     end
 
     def parse(const)
-      dump_results unless match = Results.const_get(const).match(results)
+      dump_results unless match = self.class.const_get(const).match(to_s)
       match[1]
     end
 
     def dump_results
-      abort "A Siege error occurred:\n#@results"
+      abort "A Siege error occurred:\n#{to_s}"
     end
   end
 end