celluloid-benchmark 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 5d6ca6a307e6c743b6024e66193242e30daebf58
-  data.tar.gz: 13a15f647b8b7fb852f92930e6f16ed3d23019fb
+  metadata.gz: b1bcbca7e7bf8b09222882ba6621285dd3911c71
+  data.tar.gz: 8fcfae1dd2a0df63f90b3fe084996f6389b9cda9
 SHA512: 
-  metadata.gz: fafc822aa34fbde4808ec16a08d3752621bdb5d8c10eb2333c78e2414a00b04a303a3981c14c129ce956f3e4cd12950f114fc0cba90d01792aa3f462536a5cf1
-  data.tar.gz: 03fd8a7cc021d5a1ef7f77c9abd647b752b762a5a7c8c98b6b1e3ac47e250263e71615e7c1c28e0dddd2d4a5f819d7b97c0597d400fc1c110d6fad0d2c2133e2
+  metadata.gz: dc3e53e6134b1f12a360eb617252042e421ca94e30e89633db3396602f5f79bc1d1bc1813f74318f765d861166d2a7bd7de170596a4f0cb7d64be0fa0d340d4b
+  data.tar.gz: f2ddb5969d564c83a20a793387fe8917dd3ddf91f02f9da3728a086fec5dfd7606fcf67de8fbf761b60803bad6b16106484eab58384990404b409d929df0910b

data/README.md

@@ -133,3 +133,8 @@ Develop
     rvm gemset use celluloid-benchmark --create
     bundle
     rake
+
+CI
+==
+    https://travis-ci.org/scottwillson/celluloid-benchmark
+    

data/lib/celluloid_benchmark/benchmark_run.rb

@@ -44,9 +44,9 @@ module CelluloidBenchmark
     end
   
     def requests
-      response_times.values.compact.map(&:size).reduce(&:+) || 0
+      response_times.values.compact.map(&:size).reduce(0, &:+)
     end
-  
+    
     def benchmarks
       response_times.map do |label, response_times|
         CelluloidBenchmark::Benchmark.new label, thresholds[label], response_times, response_codes[label]

data/lib/celluloid_benchmark/data_sources.rb

@@ -0,0 +1,22 @@
+module CelluloidBenchmark
+  module DataSources
+    def random_data(key)
+      data_source(key).sample
+    end
+    
+    def data_sources
+      @data_sources ||= Hash.new do |hash, key|
+        hash[key] = File.readlines("tmp/data/#{key}s.csv")
+      end
+    end
+    
+    def data_sources=(hash)
+      @data_sources = hash
+    end
+
+    def data_source(key)
+      data_sources[key]
+    end
+  end
+end
+

data/lib/celluloid_benchmark/version.rb

@@ -1,3 +1,3 @@
 module CelluloidBenchmark
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/celluloid_benchmark/visitor.rb

@@ -1,10 +1,13 @@
 require "mechanize"
+require_relative "data_sources"
 
 module CelluloidBenchmark
   # Actor that models a person using a web browser. Runs a test scenario. Delegates web browsing to 
   # instance of a Mechanize Agent.
   class Visitor
     include Celluloid
+    include CelluloidBenchmark::DataSources
+    
     extend Forwardable
 
     def_delegators :@browser, :add_auth, :get, :submit, :transact
@@ -18,15 +21,7 @@ module CelluloidBenchmark
 
     def initialize(browser = Mechanize.new)
       @browser = browser
-
-      browser.pre_connect_hooks << proc do |agent, request|
-        self.request_start_time = Time.now
-      end
-
-      browser.post_connect_hooks << proc do |agent, uri, response, body|
-        self.request_end_time = Time.now
-        benchmark_run.async.log response.code, request_start_time, request_end_time, current_request_label, current_request_threshold
-      end
+      add_browser_timing_hooks
     end
 
     def run_session(session, benchmark_run, duration)
@@ -38,14 +33,7 @@ module CelluloidBenchmark
         begin
           instance_eval session
         rescue Mechanize::ResponseCodeError => e
-          self.request_end_time = Time.now
-          benchmark_run.async.log(
-            e.response_code, 
-            request_start_time, 
-            request_end_time, 
-            current_request_label, 
-            current_request_threshold
-          )
+          log_response_code_error e
         end
         
         elapsed_time = Time.now - started_at
@@ -57,23 +45,30 @@ module CelluloidBenchmark
       self.current_request_label = label
       self.current_request_threshold = threshold
     end
-
-    def random_data(key)
-      data_source(key).sample
-    end
     
-    def data_sources
-      @data_sources ||= Hash.new do |hash, key|
-        hash[key] = File.readlines("tmp/data/#{key}s.csv")
+    
+    private
+    
+    def add_browser_timing_hooks
+      browser.pre_connect_hooks << proc do |agent, request|
+        self.request_start_time = Time.now
+      end
+
+      browser.post_connect_hooks << proc do |agent, uri, response, body|
+        self.request_end_time = Time.now
+        benchmark_run.async.log response.code, request_start_time, request_end_time, current_request_label, current_request_threshold
       end
     end
     
-    def data_sources=(hash)
-      @data_sources = hash
-    end
-
-    def data_source(key)
-      data_sources[key]
+    def log_response_code_error(error)
+      self.request_end_time = Time.now
+      benchmark_run.async.log(
+        e.response_code, 
+        request_start_time, 
+        request_end_time, 
+        current_request_label, 
+        current_request_threshold
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celluloid-benchmark
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Scott Willson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-09 00:00:00 Z
+date: 2014-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: celluloid
@@ -58,6 +58,7 @@ files:
 - lib/celluloid_benchmark.rb
 - lib/celluloid_benchmark/benchmark.rb
 - lib/celluloid_benchmark/benchmark_run.rb
+- lib/celluloid_benchmark/data_sources.rb
 - lib/celluloid_benchmark/runner.rb
 - lib/celluloid_benchmark/version.rb
 - lib/celluloid_benchmark/visitor.rb
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure Ruby, realistic, website load test tool