gridinit-jmeter 0.1.3 → 0.1.4

data/examples/jbhifi_now_search.rb

@@ -5,19 +5,16 @@ require 'open-uri'
 test do
  
    defaults(
-    :domain => 'now.jbhifi.com.au',
-    :protocol => 'https',
-    :image_parser => true,
-    :concurrentDwn => true,
+    :domain          => 'now.jbhifi.com.au',
+    :protocol        => 'https',
+    :image_parser    => true,
+    :concurrentDwn   => true,
     :embedded_url_re => '.+?now.((?!\$\{).)*$',
-    :concurrentPool => 4
-  )
-
-  header(
-    'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.27 (KHTML, like Gecko) Chrome/26.0.1386.0 Safari/537.27',
-    'Accept' => '*/*'
+    :concurrentPool  => 4
   )
 
+  with_user_agent :iphone, 'Accept' => '*/*'
+  
   cache :clear_each_iteration => true
 
   cookies
@@ -29,14 +26,13 @@ test do
     transaction 'jbhifi_home' do
       visit 'home', '/'
       visit 'choose', '/music/Home/Choose/?_=${__time(,)}', {
-        :follow_redirects => false,
-        :image_parser => true,
-        :embedded_url_re => 'none',
+          :follow_redirects => false,
+          :image_parser     => true,
+          :embedded_url_re  => 'none',
         } do
-        header('X-Requested-With' => 'XMLHttpRequest')
-        assert 'contains', 'WELCOME TO JB HI-FI NOW'
+          with_xhr
+          assert 'contains', 'WELCOME TO JB HI-FI NOW'
       end
-
     end
 
     transaction 'jbhifi_search_xhr' do
@@ -48,7 +44,7 @@ test do
           vars.put("search_value", varArray[idx]);
         EOS
         get 'tgsearch', '/tgsearch/predictSearch.aspx?id=MD84-225&k=${search_value}' do
-          header('X-Requested-With' => 'XMLHttpRequest')
+          with_xhr
         end
       end
     end
@@ -61,10 +57,10 @@ test do
           'numRecords'  => 25
         }
       } do 
-        header('X-Requested-With' => 'XMLHttpRequest')
+        with_xhr
         extract 'id', '"c":"(.+?)"', {
           :match_number => 0,
-          :template => '$1$'
+          :template     => '$1$'
         }
       end
     end
@@ -75,7 +71,7 @@ test do
           'id'  => '${id}'
         }
       } do 
-        header('X-Requested-With' => 'XMLHttpRequest')
+        with_xhr
         extract 'mp3', '"mp3":"(.+?)"', {
           :match_number => 0,
           :template => '$1$'
@@ -93,6 +89,6 @@ test do
 
   end
 
-end.grid ENV['API_TOKEN']
-# end.jmx
+# end.grid ENV['API_TOKEN']
+end.jmx
 # end.run(path: '/usr/share/jmeter/bin/')

data/lib/gridinit-jmeter.rb

@@ -10,6 +10,7 @@ require 'gridinit-jmeter/helpers/fallback_content_proxy'
 require 'gridinit-jmeter/helpers/dsl_helper'
 require 'gridinit-jmeter/helpers/logger-colors'
 require 'gridinit-jmeter/helpers/strip-heredoc'
+require 'gridinit-jmeter/helpers/user-agents'
 
 # TEST PLAN
   require 'gridinit-jmeter/test_plan/test_plan'

data/lib/gridinit-jmeter/dsl.rb

@@ -31,100 +31,116 @@ module Gridinit
         @root.at_xpath("//jmeterTestPlan/hashTree") << node.doc.children << hash_tree
         
         variables(
-          :name => 'testguid',
-          :value => '${__P(testguid,${__time(,)})}',
+          :name     => 'testguid',
+          :value    => '${__P(testguid,${__time(,)})}',
           :comments => 'The testguid variable is mandatory when running on the Grid.') {}
       end
 
       def variables(params={}, &block)
         node = Gridinit::Jmeter::UserDefinedVariable.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def defaults(params={}, &block)
         node = Gridinit::Jmeter::RequestDefaults.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def cookies(params={}, &block)
         node = Gridinit::Jmeter::CookieManager.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def cache(params={}, &block)
         node = Gridinit::Jmeter::CacheManager.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def header(params={}, &block)
         node = Gridinit::Jmeter::HeaderManager.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
+        self.instance_exec(&block) if block
+      end
+
+      def with_xhr(params={}, &block)
+        node = Gridinit::Jmeter::HeaderManager.new(
+          params.merge('X-Requested-With' => 'XMLHttpRequest')
+        )
+        attach_to_last(node, caller)
+        self.instance_exec(&block) if block
+      end
+
+      def with_user_agent(device, params={}, &block)
+        node = Gridinit::Jmeter::HeaderManager.new(
+          params.merge('User-Agent' => Gridinit::Jmeter::UserAgent.new(device).string)
+        )
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def auth(params={}, &block)
         node = Gridinit::Jmeter::AuthManager.new(params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def threads(num_threads=1, params={}, &block)
         node = Gridinit::Jmeter::ThreadGroup.new(num_threads, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def transaction(name="Transaction Contoller", params={}, &block)
         node = Gridinit::Jmeter::Transaction.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def exists(var, params={}, &block)
         params[:condition] = "'${#{var}}'.length > 0"
         node = Gridinit::Jmeter::IfController.new("if #{var}", params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def once(name="do once", params={}, &block)
         node = Gridinit::Jmeter::OnceOnly.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def If(name="If Controller", params={}, &block)
         node = Gridinit::Jmeter::IfController.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def Loop(loops=1, params={}, &block)
         node = Gridinit::Jmeter::LoopController.new(loops, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def counter(name="counter", params={}, &block)
         node = Gridinit::Jmeter::CounterConfig.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def bsh_pre(script, params={}, &block)
         node = Gridinit::Jmeter::BeanShellPreProcessor.new(script, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def visit(name="HTTP Request", url="", params={}, &block)
         params[:method] = 'GET'
         node = Gridinit::Jmeter::HttpSampler.new(name, url, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -133,7 +149,7 @@ module Gridinit
       def submit(name="HTTP Request", url="", params={}, &block)
         params[:method] = 'POST'
         node = Gridinit::Jmeter::HttpSampler.new(name, url, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -148,7 +164,7 @@ module Gridinit
         else
           Gridinit::Jmeter::RegexExtractor.new(*args)
         end
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -156,7 +172,7 @@ module Gridinit
 
       def random_timer(delay=0, range=0, &block)
         node = Gridinit::Jmeter::GaussianRandomTimer.new(delay, range)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -164,52 +180,15 @@ module Gridinit
 
       def assert(match="contains", pattern="", params={}, &block)
         node = Gridinit::Jmeter::ResponseAssertion.new(match, pattern, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       alias_method :web_reg_find, :assert
 
-      def out(params={})
-        puts doc.to_xml(:indent => 2)
-      end
-
-      def jmx(params={})
-        file(params)
-        logger.info "JMX saved to: #{params[:file]}"
-      end
-
-      def run(params={})
-        file(params)
-        logger.warn "Test executing locally ..."
-        cmd = "#{params[:path]}jmeter -n -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' }"
-        logger.info cmd
-        `#{cmd}`
-        logger.info "Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
-      end
-
-      def grid(token, params={})
-        RestClient.proxy = params[:proxy] if params[:proxy]
-        begin
-          file = Tempfile.new('jmeter')
-          file.write(doc.to_xml(:indent => 2))
-          file.rewind
-          response = RestClient.post "http://#{params[:endpoint] ? params[:endpoint] : 'gridinit.com'}/api?token=#{token}&region=#{params[:region]}", 
-          {
-            :name => 'attachment', 
-            :attachment => File.new("#{file.path}", 'rb'),
-            :multipart => true,
-            :content_type => 'application/octet-stream'
-          }
-          logger.info "Results at: #{JSON.parse(response)["results"]}" if response.code == 200
-        rescue => e
-          logger.fatal "There was an error: #{e.message}"
-        end
-      end
-
       def view_results_full_visualizer(name="View Results Tree", params={}, &block)
         node = Gridinit::Jmeter::ViewResultsFullVisualizer.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -217,25 +196,25 @@ module Gridinit
 
       def table_visualizer(name="View Results in Table", params={}, &block)
         node = Gridinit::Jmeter::TableVisualizer.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def graph_visualizer(name="Graph Results", params={}, &block)
         node = Gridinit::Jmeter::GraphVisualizer.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def stat_visualizer(name="Stat Results", params={}, &block)
         node = Gridinit::Jmeter::StatVisualizer.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def response_time_graph_visualizer(name="Reponse Time Graph", params={}, &block)
         node = Gridinit::Jmeter::ResponseTimeGraphVisualizer.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
@@ -243,51 +222,88 @@ module Gridinit
 
       def summary_report(name="Summary Report", params={}, &block)
         node = Gridinit::Jmeter::SummaryReport.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def ldap_ext(name="LDAPExtSampler", params={}, &block)
         node = Gridinit::Jmeter::LDAPExtSampler.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_response_codes_per_second(name="jp@gc - Response Codes per Second", params={}, &block)
         node = Gridinit::Jmeter::GCResponseCodesPerSecond.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_response_times_distribution(name="jp@gc - Response Times Distribution", params={}, &block)
         node = Gridinit::Jmeter::GCResponseTimesDistribution.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_response_times_over_time(name="jp@gc - Response Times Over Time", params={}, &block)
         node = Gridinit::Jmeter::GCResponseTimesOverTime.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_response_times_percentiles(name="jp@gc - Response Times Percentiles", params={}, &block)
         node = Gridinit::Jmeter::GCResponseTimesPercentiles.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_transactions_per_second(name="jp@gc - Transactions per Second", params={}, &block)
         node = Gridinit::Jmeter::GCTransactionsPerSecond.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
 
       def gc_latencies_over_time(name="jp@gc - Response Latencies Over Time", params={}, &block)
         node = Gridinit::Jmeter::GCLatenciesOverTime.new(name, params)
-        last_node_from(caller) << node.doc.children << hash_tree
+        attach_to_last(node, caller)
         self.instance_exec(&block) if block
       end
+
+      def out(params={})
+        puts doc.to_xml(:indent => 2)
+      end
+
+      def jmx(params={})
+        file(params)
+        logger.info "JMX saved to: #{params[:file]}"
+      end
+
+      def run(params={})
+        file(params)
+        logger.warn "Test executing locally ..."
+        cmd = "#{params[:path]}jmeter -n -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' }"
+        logger.info cmd
+        `#{cmd}`
+        logger.info "Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
+      end
+
+      def grid(token, params={})
+        RestClient.proxy = params[:proxy] if params[:proxy]
+        begin
+          file = Tempfile.new('jmeter')
+          file.write(doc.to_xml(:indent => 2))
+          file.rewind
+          response = RestClient.post "http://#{params[:endpoint] ? params[:endpoint] : 'gridinit.com'}/api?token=#{token}&region=#{params[:region]}", 
+          {
+            :name => 'attachment', 
+            :attachment => File.new("#{file.path}", 'rb'),
+            :multipart => true,
+            :content_type => 'application/octet-stream'
+          }
+          logger.info "Results at: #{JSON.parse(response)["results"]}" if response.code == 200
+        rescue => e
+          logger.fatal "There was an error: #{e.message}"
+        end
+      end
       
       private
 
@@ -295,10 +311,10 @@ module Gridinit
         Nokogiri::XML::Node.new("hashTree", @root)
       end
 
-      def last_node_from(calling_method)
+      def attach_to_last(node, calling_method)
         xpath = xpath_from(calling_method)
-        node  = @root.xpath(xpath).last
-        node
+        last_node  = @root.xpath(xpath).last
+        last_node << node.doc.children << hash_tree
       end
 
       def xpath_from(calling_method)
@@ -353,7 +369,5 @@ module Gridinit
 end
 
 def test(&block)
-  t = Gridinit.dsl_eval(Gridinit::Jmeter::DSL.new, &block)
-  t.out
-  t
+  Gridinit.dsl_eval(Gridinit::Jmeter::DSL.new, &block)
 end

data/lib/gridinit-jmeter/helpers/user-agents.rb

@@ -0,0 +1,29 @@
+module Gridinit
+  module Jmeter
+    class UserAgent
+      def initialize(device)
+        @common_devices = {
+          :iphone     => 'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3',
+          :ipod       => 'Mozilla/5.0 (iPod; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B176 Safari/7534.48.3',
+          :ipad       => 'Mozilla/5.0 (iPad; CPU OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B176 Safari/7534.48.3',
+          :safari_osx => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25',
+          :safari_win => 'Mozilla/5.0 (Windows; Windows NT 6.1) AppleWebKit/534.57.2 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+          :ie7        => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)',
+          :ie8        => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)',
+          :ie9        => 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
+          :chrome_osx => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.46 Safari/536.5',
+          :chrome_win => 'Mozilla/5.0 (Windows; Windows NT 6.1) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.46 Safari/536.5',
+          :ff_osx     => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:11.0) Gecko/20100101 Firefox/11.0',
+          :ff_win     => 'Mozilla/5.0 (Windows NT 6.1; rv:11.0) Gecko/20100101 Firefox/11.0',
+          :opera_osx  => 'Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.62',
+          :opera_win  => 'Opera/9.80 (Windows NT 6.1; U; en) Presto/2.10.229 Version/11.62'
+        }
+        @device = device
+      end
+
+      def string
+        @common_devices[@device] || @common_devices[:chrome_osx]
+      end
+    end
+  end
+end

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -102,6 +102,7 @@ files:
 - lib/gridinit-jmeter/helpers/fallback_content_proxy.rb
 - lib/gridinit-jmeter/helpers/logger-colors.rb
 - lib/gridinit-jmeter/helpers/strip-heredoc.rb
+- lib/gridinit-jmeter/helpers/user-agents.rb
 - lib/gridinit-jmeter/listeners/gc_latencies_over_time.rb
 - lib/gridinit-jmeter/listeners/gc_response_codes_per_second.rb
 - lib/gridinit-jmeter/listeners/gc_response_times_distribution.rb