ruby-jmeter 2.12.5 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67256bea2ac70d78ae81cfd385217d5117f6952e
-  data.tar.gz: 416fac8d1209b9f9645f3a3a385ca2e6fd7748eb
+  metadata.gz: 6cfaa73f375f18dcbed1578b3fbe7da0d4272dbf
+  data.tar.gz: ccb0f5f16e5b9078b188f4759bc4cb7a991a0784
 SHA512:
-  metadata.gz: 4a0a01e3eae46e57a288cd7cd6721f1806a0eb2e75b02c2596ad9c741b422425982963fa74bf15f80dc18b38bc48999f88dac947f2e68ee9a7af2288270f95ae
-  data.tar.gz: f004d84a487a028f85094f3e4cc2f838d449c2b99d5aecc0c43dc0a429f4ad42868650f837a0219b7b4fe90d052386cd0a1f8155316d9301b07af2cb0038dce8
+  metadata.gz: 4b2d0839a1e28d74952b202740f3ce8449ca1c18a2351cf0fd4db7888ff2e0d5714f0109ff8a604909105bddd7c64af69ad2029e00faad1b9794af5cbaea8816
+  data.tar.gz: 86866132e9fd56e6537ba3278eb2400817903dea4ce360bc302fe04a0aa502ae271fd55440bfeb6884a83db6c330137d305ae1bce6f83a77e6f787fede245bff

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.0

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.2.0

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## v2.13.0
+
+- Update to JMeter 2.13
+
 ## v2.11.11
 
 - Support for `test_fragment` for use with the `module_controller`. [See example here](https://github.com/flood-io/ruby-jmeter/blob/master/examples/basic_test_fragment.rb).

data/Gemfile

@@ -13,9 +13,6 @@ end
 
 group :development do
   gem 'pry', :require => 'pry'
-  gem 'pry-nav', :require => 'pry-nav'
-  gem 'pry-debugger', :require => 'pry-debugger'
-  gem 'awesome_print', :require => 'ap'
 end
 
 group :test do

data/README.md

@@ -8,6 +8,8 @@ Tired of using the JMeter GUI or looking at hairy XML files?
 
 This gem lets you write test plans for JMeter in your favourite text editor, and optionally run them on [flood.io](http://flood.io).
 
+![](https://flood.io/images/logo-flood-medium.png)
+
 ## Installation
 
 Install it yourself as:
@@ -99,26 +101,41 @@ end.run(
   jtl: 'results.jtl')
 ```
 
-### Running a JMeter Test Plan on flood.io
+### Running a JMeter Test Plan on Flood IO
 
-You can also execute JMeter test plans on flood.io using our API. To do so, you require an account and API token. If you don't know your token, sign in to [flood.io](https://flood.io/api) and check your account settings.
+You can also execute JMeter test plans on Flood IO using our API. To do so, you require an account and API token. If you don't know your token, sign in to [flood.io](https://flood.io/) and check your account settings.
 
-To execute the test on flood.io, call the `grid` method on the test and pass it the API token like this.
+To execute the test on Flood IO, call the `flood` method on the test and pass it the API token like this.
 
 ```ruby
 test do
   threads count: 10 do
     visit name: 'Google Search', url: 'http://google.com'
   end
-end.grid('OxtZ-4v-v0koSz5Y0enEQQ')
+end.flood(
+  ENV['FLOOD_API_TOKEN'],
+  name: 'Demo',
+  privacy_flag: 'public',
+  region: 'ap-southeast-2'
+)
 ```
 
-This will then provide you with a link to the live test results on flood.io like this.
+This will then provide you with a link to the live test results on Flood IO like this.
 
 ```
-Results at: http://prod.flood.io/shared?testguid=73608030311611e2962f123141011033&run_id=339&tags=jmeter&domain=altentee.com&cluster=54.251.48.129&status=running&view=
+I, [2015-02-24T11:15:25.669029 #14010]  INFO -- : Flood results at: https://flood.io/AbRWkFl7VODYCkQuy3ffvA
 ```
 
+Note you will need to provide a `grid` or `region` parameter to the `.flood` method to describe which grid to distribute the flood test to. You can find the Grid ID from the URL of the target grid in your [grids](https://flood.io/dashboard/grids) dashboard e.g.:
+
+![](https://s3.amazonaws.com/flood-io-support/Flood_IO_2015-02-24_11-43-21.jpg)
+
+Flood IO provides a shared grid for free, suitable for 5 minute tests, check your dashboard for the latest grid:
+
+![](https://s3.amazonaws.com/flood-io-support/Flood_IO_2015-02-24_11-44-29.jpg)
+
+Alternatively upgrade to a paid subscription on Flood IO and start your own grids on demand.
+
 ## Advanced Usage
 
 ### Blocks
@@ -352,7 +369,7 @@ end
 
 ## Roadmap
 
-This work is being sponsored by flood.io. Get in touch with us if you'd like to be involved.
+This work is being sponsored by Flood IO. Get in touch with us if you'd like to be involved.
 
 ## Contributing
 

data/examples/basic_browser_headers.rb

@@ -4,4 +4,4 @@ require 'ruby-jmeter'
 test do
   # Simulate user agent, accept and accept-encodings of typical browsers
   with_browser :ie9
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_counter.rb

@@ -12,4 +12,4 @@ test do
       visit name: 'Home Page', url: 'http://google.com/'
     end
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_extract.rb

@@ -8,4 +8,4 @@ test do
       extract regex: 'pattern', name: 'jmeter_variable_regex', variable: 'test'
     end
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_http_request_with_files.rb

@@ -10,4 +10,4 @@ test do
              'DO_MULTIPART_POST' => true
     end
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_json_path_extractor.rb

@@ -8,5 +8,5 @@ test do
      end
   end
 
-# end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+# end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)
 end.flood(ENV['FLOOD_API_TOKEN'])

data/examples/basic_loops.rb

@@ -7,4 +7,4 @@ test do
       visit name: 'Home Page', url: 'http://google.com/'
     end
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_stepping_thread_group.rb

@@ -28,4 +28,4 @@ test do
 
   end
 
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_test_fragment.rb

@@ -11,4 +11,4 @@ test do
     module_controller test_fragment: 'WorkBench/TestPlan/anonymous_user'
   end
 
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/basic_thread_groups.rb

@@ -4,4 +4,4 @@ require 'ruby-jmeter'
 test do
   threads count: 100, rampup: 3600, loops: 10, scheduler: false do
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/real_flood_test.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+  threads count: 10, duration: 180, continue_forever: true do
+    think_time 5_000
+    visit name: 'Google Search', url: 'http://google.com'
+  end
+end.flood(
+  ENV['FLOOD_API_TOKEN'],
+  name: 'Demo',
+  privacy_flag: 'public',
+  grid: 'a3Hf9pIs30DX0pYfitU4AA' # UUID of the target grid
+)

data/examples/real_flood_test_data.rb

@@ -2,10 +2,14 @@ require 'ruby-jmeter'
 
 test do
   threads 1 do
-    get name: '__testdata', url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text' do 
+    get name: '__testdata', url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text' do
       extract name: 'postcode', regex: '^.+?"(\d+)"'
     end
     visit name: 'Search Post Code', url: 'http://google.com/?q=${postcode}'
   end
-# end.flood(ENV['FLOOD_API_TOKEN'], {region: 'us-west-2'})
-end.run(path: '/usr/share/jmeter/bin/', gui: true)
+end.flood(
+  ENV['FLOOD_API_TOKEN'],
+  name: 'Demo',
+  privacy_flag: 'public',
+  region: 'us-west-2' # Region of the target grid
+)

data/examples/real_immi.gov.au_visa.rb

@@ -2,9 +2,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ruby-jmeter'
 
 test do
-  
-  defaults  domain: 'www.immi.gov.au', 
-            protocol: 'http', 
+
+  defaults  domain: 'www.immi.gov.au',
+            protocol: 'http',
             image_parser: true,
             concurrentDwn: true,
             concurrentPool: 4
@@ -15,15 +15,15 @@ test do
 
   with_user_agent :iphone
 
-  header [ 
+  header [
     { name: 'Accept-Encoding', value: 'gzip,deflate,sdch' },
     { name: 'Accept', value: 'text/javascript, text/html, application/xml, text/xml, */*' }
   ]
-  
+
   threads 1, {
-    rampup: 1, 
+    rampup: 1,
     scheduler: true,
-    duration: 300, 
+    duration: 300,
     continue_forever: true
     } do
 
@@ -34,7 +34,7 @@ test do
         extract xpath: "//select[@id='Q1']/option/@value", name: 'q1', tolerant: true
       end
     end
-    # ${__Random(1,${q1_matchNr},n)} 
+    # ${__Random(1,${q1_matchNr},n)}
     # $__V{q1_${n}}
     # $__V{q1_${${__Random(1,${q1_matchNr},)}}}
 
@@ -67,12 +67,12 @@ test do
 
     view_results
 
-    log filename: '/var/log/flood/custom.log', error_logging: true 
+    log filename: '/var/log/flood/custom.log', error_logging: true
 
   end
-end.run(path: '/usr/share/jmeter/bin/', gui: true)
-# end.jmx
-# end.flood ENV['FLOOD_API_TOKEN'], {
-#   region: 'ap-southeast-2',
-#   name: 'Demo for Immi'
-# }
+end.flood(
+  ENV['FLOOD_API_TOKEN'],
+  name: 'Demo',
+  privacy_flag: 'public',
+  region: 'us-west-2' # Region of the target grid
+)

data/examples/real_page_objects.rb

@@ -38,4 +38,4 @@ test do
     home = HomePage.new(self)
     home.visit
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/real_user_objects_github.rb

@@ -42,7 +42,7 @@ class VirtualUser
     pause
   end
 
-  # Searches for a repository. 
+  # Searches for a repository.
   # @param repo [String] the repository to search for
   def search_for_repository(repo)
     visit name: 'Search for project', url: '/search',
@@ -108,5 +108,5 @@ test do
     user.view_branch '/flood-io/ruby-jmeter/tree/v2.11.8'
 
   end
-end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)
 

data/lib/ruby-jmeter/DSL.md

@@ -223,6 +223,8 @@
   `monitor_results`
 - Response Time Graph
   `response_time_graph`
+- Response Time Graph
+  `response_time_graph`
 - Save Responses to a file
   `save_responses_to_a_file`
 - Simple Data Writer

data/lib/ruby-jmeter/dsl.rb

@@ -6,14 +6,14 @@ module RubyJmeter
     def initialize(params = {})
       @root = Nokogiri::XML(<<-EOF.strip_heredoc)
         <?xml version="1.0" encoding="UTF-8"?>
-        <jmeterTestPlan version="1.2" properties="2.7" jmeter="2.12 r1636949">
+        <jmeterTestPlan version="1.2" properties="2.8" jmeter="2.13" ruby-jmeter="2.13.0">
         <hashTree>
         </hashTree>
         </jmeterTestPlan>
       EOF
       node = RubyJmeter::TestPlan.new(params)
 
-      @current_node = @root.at_xpath("//jmeterTestPlan/hashTree")
+      @current_node = @root.at_xpath('//jmeterTestPlan/hashTree')
       @current_node = attach_to_last(node)
     end
 
@@ -29,7 +29,7 @@ module RubyJmeter
 
     alias_method :variables, :user_defined_variables
 
-    def http_request_defaults(params={}, &block)
+    def http_request_defaults(params = {}, &block)
       params[:image_parser] = true if params.keys.include? :download_resources
       params[:concurrentDwn] = true if params.keys.include? :use_concurrent_pool
       params[:concurrentPool] = params[:use_concurrent_pool] if params.keys.include? :use_concurrent_pool
@@ -39,14 +39,14 @@ module RubyJmeter
 
     alias_method :defaults, :http_request_defaults
 
-    def http_cookie_manager(params={}, &block)
+    def http_cookie_manager(params = {}, &block)
       params[:clearEachIteration] = true if params.keys.include? :clear_each_iteration
       super
     end
 
     alias_method :cookies, :http_cookie_manager
 
-    def http_cache_manager(params={}, &block)
+    def http_cache_manager(params = {}, &block)
       params[:clearEachIteration] = true if params.keys.include? :clear_each_iteration
       super
     end
@@ -81,13 +81,13 @@ module RubyJmeter
     def thread_group(*args, &block)
       params = args.shift || {}
       params = { count: params }.merge(args.shift || {}) if params.class == Fixnum
-      params[:num_threads]        = params[:count] || 1
-      params[:ramp_time]          = params[:rampup] || (params[:num_threads]/2.0).ceil
-      params[:start_time]         = params[:start_time] || Time.now.to_i * 1000
-      params[:end_time]           = params[:end_time] || Time.now.to_i * 1000
-      params[:duration]         ||= 60
+      params[:num_threads] = params[:count] || 1
+      params[:ramp_time] = params[:rampup] || (params[:num_threads]/2.0).ceil
+      params[:start_time] = params[:start_time] || Time.now.to_i * 1000
+      params[:end_time] = params[:end_time] || Time.now.to_i * 1000
+      params[:duration] ||= 60
       params[:continue_forever] ||= false
-      params[:loops]              = -1 if params[:continue_forever]
+      params[:loops] = -1 if params[:continue_forever]
       node = RubyJmeter::ThreadGroup.new(params)
       attach_node(node, &block)
     end
@@ -219,7 +219,6 @@ module RubyJmeter
 
     alias_method :ldap_extended, :ldap_extended_request
 
-
     ##
     # Controllers
 
@@ -361,7 +360,7 @@ module RubyJmeter
     alias_method :web_reg_save_param, :extract
 
     def random_timer(delay=0, range=0, &block)
-      params={}
+      params = {}
       params[:delay] = delay
       params[:range] = range
       node = RubyJmeter::GaussianRandomTimer.new(params)
@@ -374,16 +373,16 @@ module RubyJmeter
       params[:value] ||= params[:throughput] || 0.0
 
       node = RubyJmeter::ConstantThroughputTimer.new(params)
-      node.doc.xpath(".//value").first.content = params[:value].to_f
+      node.doc.xpath('.//value').first.content = params[:value].to_f
 
       attach_node(node, &block)
     end
 
     alias_method :ConstantThroughputTimer, :constant_throughput_timer
 
-    def response_assertion(params={}, &block)
+    def response_assertion(params = {}, &block)
       params[:test_type] = parse_test_type(params)
-      params["0"] = params.values.first
+      params['0'] = params.values.first
       node = RubyJmeter::ResponseAssertion.new(params)
       node.doc.xpath("//stringProp[@name='Assertion.scope']").remove if
         params[:scope] == 'main' || params['scope'] == 'main'
@@ -397,79 +396,79 @@ module RubyJmeter
     ##
     # JMeter Plugins
 
-    def response_codes_per_second(name="Response Codes per Second", params={}, &block)
+    def response_codes_per_second(name = 'Response Codes per Second', params = {}, &block)
       node = RubyJmeter::Plugins::ResponseCodesPerSecond.new(name, params)
       attach_node(node, &block)
     end
 
-    def response_times_distribution(name="Response Times Distribution", params={}, &block)
+    def response_times_distribution(name = 'Response Times Distribution', params = {}, &block)
       node = RubyJmeter::Plugins::ResponseTimesDistribution.new(name, params)
       attach_node(node, &block)
     end
 
-    def response_times_over_time(name="Response Times Over Time", params={}, &block)
+    def response_times_over_time(name = 'Response Times Over Time', params = {}, &block)
       node = RubyJmeter::Plugins::ResponseTimesOverTime.new(name, params)
       attach_node(node, &block)
     end
 
-    def response_times_percentiles(name="Response Times Percentiles", params={}, &block)
+    def response_times_percentiles(name = 'Response Times Percentiles', params = {}, &block)
       node = RubyJmeter::Plugins::ResponseTimesPercentiles.new(name, params)
       attach_node(node, &block)
     end
 
-    def transactions_per_second(name="Transactions per Second", params={}, &block)
+    def transactions_per_second(name = 'Transactions per Second', params = {}, &block)
       node = RubyJmeter::Plugins::TransactionsPerSecond.new(name, params)
       attach_node(node, &block)
     end
 
-    def latencies_over_time(name="Response Latencies Over Time", params={}, &block)
+    def latencies_over_time(name = 'Response Latencies Over Time', params = {}, &block)
       node = RubyJmeter::Plugins::LatenciesOverTime.new(name, params)
       attach_node(node, &block)
     end
 
-    def console_status_logger(name="Console Status Logger", params={}, &block)
+    def console_status_logger(name = 'Console Status Logger', params = {}, &block)
       node = RubyJmeter::Plugins::ConsoleStatusLogger.new(name, params)
       attach_node(node, &block)
     end
 
     alias_method :console, :console_status_logger
 
-    def throughput_shaper(name="Throughput Shaping Timer", steps=[], params={}, &block)
+    def throughput_shaper(name = 'Throughput Shaping Timer', steps=[], params = {}, &block)
       node = RubyJmeter::Plugins::ThroughputShapingTimer.new(name, steps)
       attach_node(node, &block)
     end
 
     alias_method :shaper, :throughput_shaper
 
-    def dummy_sampler(name="Dummy Sampler", params={}, &block)
+    def dummy_sampler(name = 'Dummy Sampler', params = {}, &block)
       node = RubyJmeter::Plugins::DummySampler.new(name, params)
       attach_node(node, &block)
     end
 
     alias_method :dummy, :dummy_sampler
 
-    def stepping_thread_group(params={}, &block)
+    def stepping_thread_group(params = {}, &block)
       node = RubyJmeter::Plugins::SteppingThreadGroup.new(params)
       attach_node(node, &block)
     end
 
     alias_method :step, :stepping_thread_group
 
-    def composite_graph(name, params={}, &block)
+    def composite_graph(name, params = {}, &block)
       node = RubyJmeter::Plugins::CompositeGraph.new(name, params)
       attach_node(node, &block)
     end
 
     alias_method :composite, :composite_graph
 
-    def active_threads_over_time(params={}, &block)
+    def active_threads_over_time(params = {}, &block)
       node = RubyJmeter::Plugins::ActiveThreadsOverTime.new(params)
       attach_node(node, &block)
     end
 
     alias_method :active_threads, :active_threads_over_time
 
-    def perfmon_collector(name, params={}, &block)
+    def perfmon_collector(name, params = {}, &block)
       node = RubyJmeter::Plugins::PerfmonCollector.new(name, params)
       attach_node(node, &block)
     end
@@ -478,11 +477,11 @@ module RubyJmeter
 
     # API Methods
 
-    def out(params={})
+    def out(params = {})
       puts doc.to_xml(:indent => 2)
     end
 
-    def jmx(params={})
+    def jmx(params = {})
       file(params)
       logger.info "Test plan saved to: #{params[:file]}"
     end
@@ -495,7 +494,7 @@ module RubyJmeter
       doc.clone
     end
 
-    def run(params={})
+    def run(params = {})
       file(params)
       logger.warn "Test executing locally ..."
       properties = params.has_key?(:properties) ? params[:properties] : "#{File.dirname(__FILE__)}/helpers/jmeter.properties"
@@ -515,21 +514,19 @@ module RubyJmeter
         end
 
         exit_status = wait_thr.value
-        unless exit_status.success?
-          abort "FAILED !!! #{cmd}"
-        end
+        abort "FAILED !!! #{cmd}" unless exit_status.success?
       end
       logger.info "Local Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
     end
 
-    def flood(token, params={})
+    def flood(token, params = {})
       if params[:region] == 'local'
-        logger.info "Starting test ..."
+        logger.info 'Starting test ...'
         params[:started] = Time.now
         run params
         params[:stopped] = Time.now
-        logger.info "Completed test ..."
-        logger.debug "Uploading results ..." if params[:debug]
+        logger.info 'Completed test ...'
+        logger.debug 'Uploading results ...' if params[:debug]
       end
       RestClient.proxy = params[:proxy] if params[:proxy]
       begin
@@ -549,7 +546,7 @@ module RubyJmeter
         response = RestClient.post "#{params[:endpoint] ? params[:endpoint] : 'https://api.flood.io'}/floods?auth_token=#{token}",
         {
           :flood => {
-            :tool => 'jmeter-2.12',
+            :tool => 'jmeter',
             :url => params[:url],
             :name => params[:name],
             :notes => params[:notes],
@@ -598,11 +595,11 @@ module RubyJmeter
       ht            = attach_to_last(node)
       previous      = @current_node
       @current_node = ht
-      self.instance_exec(&block) if block
+      instance_exec(&block) if block
       @current_node = previous
     end
 
-    def file(params={})
+    def file(params = {})
       params[:file] ||= 'jmeter.jmx'
       File.open(params[:file], 'w') { |file| file.write(doc.to_xml(:indent => 2)) }
     end
@@ -616,7 +613,6 @@ module RubyJmeter
       @log.level = Logger::DEBUG
       @log
     end
-
   end
 end
 

data/lib/ruby-jmeter/dsl/jdbc_postprocessor.rb

@@ -22,6 +22,7 @@ module RubyJmeter
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
   <stringProp name="queryTimeout"/>
+  <stringProp name="resultSetHandler">Store as String</stringProp>
 </JDBCPostProcessor>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jdbc_preprocessor.rb

@@ -22,6 +22,7 @@ module RubyJmeter
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
   <stringProp name="queryTimeout"/>
+  <stringProp name="resultSetHandler">Store as String</stringProp>
 </JDBCPreProcessor>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jdbc_request.rb

@@ -22,6 +22,7 @@ module RubyJmeter
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
   <stringProp name="queryTimeout"/>
+  <stringProp name="resultSetHandler">Store as String</stringProp>
 </JDBCSampler>)
       EOS
       update params

data/lib/ruby-jmeter/idl.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.7" jmeter="2.12 r1636949">
+<jmeterTestPlan version="1.2" properties="2.8" jmeter="2.13 r1665067">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -91,7 +91,6 @@
         <boolProp name="HTTPSampler.image_parser">true</boolProp>
         <boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
         <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
-        <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
       </ConfigTestElement>
       <hashTree/>
       <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
@@ -264,7 +263,6 @@
           <stringProp name="ForeachController.inputVal"></stringProp>
           <stringProp name="ForeachController.returnVal"></stringProp>
           <boolProp name="ForeachController.useSeparator">true</boolProp>
-          <stringProp name="ForeachController.endIndex"/>
         </ForeachController>
         <hashTree/>
         <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
@@ -426,6 +424,7 @@
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
           <stringProp name="queryTimeout"></stringProp>
+          <stringProp name="resultSetHandler">Store as String</stringProp>
         </JDBCPreProcessor>
         <hashTree/>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
@@ -592,6 +591,7 @@
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
           <stringProp name="queryTimeout"></stringProp>
+          <stringProp name="resultSetHandler">Store as String</stringProp>
         </JDBCSampler>
         <hashTree/>
         <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
@@ -846,6 +846,7 @@
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
           <stringProp name="queryTimeout"></stringProp>
+          <stringProp name="resultSetHandler">Store as String</stringProp>
         </JDBCPostProcessor>
         <hashTree/>
         <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.12.5"
+  VERSION = '2.13.0'
 end

data/spec/dsl_spec.rb

@@ -1,8 +1,7 @@
-require "spec_helper"
-require "pry-debugger"
-
-describe "DSL" do
+require 'spec_helper'
+require 'pry'
 
+describe 'DSL' do
   describe 'aliased DSL methods' do
     it "test plan should respond to aliased methods" do
       test {}.should respond_to :variables
@@ -14,7 +13,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'write to stdout and file' do
     it "should output a test plan to stdout" do
       $stdout.should_receive(:puts).with(/jmeterTestPlan/i)
@@ -22,16 +20,15 @@ describe "DSL" do
       end.out
     end
 
-    it "should output a test plan to jmx file" do
+    it 'should output a test plan to jmx file' do
       file = double('file')
-      File.should_receive(:open).with("jmeter.jmx", "w").and_yield(file)
+      File.should_receive(:open).with('jmeter.jmx', 'w').and_yield(file)
       file.should_receive(:write).with(/jmeterTestPlan/i)
       test do
       end.jmx
     end
   end
 
-
   describe 'user agent' do
     let(:doc) do
       test do
@@ -40,7 +37,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HeaderManager").first }
+    let(:fragment) { doc.search('//HeaderManager').first }
 
     it 'should match on user_agent' do
       fragment.search(".//stringProp[@name='Header.name']").text.should == 'User-Agent'
@@ -49,7 +46,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'http request defaults' do
     let(:doc) do
       test do
@@ -65,8 +61,8 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:config_fragment) { doc.search("//ConfigTestElement").first }
-    let(:sampler_fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:config_fragment) { doc.search('//ConfigTestElement').first }
+    let(:sampler_fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on implementation' do
       sampler_fragment.search(".//stringProp[@name='HTTPSampler.implementation']").text.should == ''
@@ -83,7 +79,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'disabled elements' do
     let(:doc) do
       test do
@@ -91,14 +86,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) {  doc.search("//HeaderManager") }
+    let(:fragment) {  doc.search('//HeaderManager') }
 
     it 'should be disabled' do
       fragment.first.attributes['enabled'].value.should == 'false'
     end
   end
 
-
   describe 'header manager' do
     let(:doc) do
       test do
@@ -106,7 +100,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HeaderManager").first }
+    let(:fragment) { doc.search('//HeaderManager').first }
 
     it 'should match on accept' do
       fragment.search(".//stringProp[@name='Header.name']").text.should == 'Accept'
@@ -114,7 +108,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'header manager multiple values' do
     let(:doc) do
       test do
@@ -122,7 +115,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HeaderManager") }
+    let(:fragment) { doc.search('//HeaderManager') }
 
 
     it 'should match on accept for fragment_first' do
@@ -136,7 +129,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'the clear_each_iteration option should be respected' do
     let(:doc) do
       test do
@@ -154,7 +146,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'test plan' do
     it 'should allow to take params' do
       test_plan = test({"TestPlan.serialize_threadgroups" => "false"}) {}
@@ -165,7 +156,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'thread groups' do
     let(:doc) do
       test do
@@ -196,7 +186,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'thread groups old syntax' do
     let(:doc) do
       test do
@@ -223,7 +212,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'transaction controller' do
     let(:doc) do
       test do
@@ -253,7 +241,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'throughput controller' do
     let(:doc) do
       test do
@@ -278,7 +265,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'visit' do
     let(:doc) do
       test do
@@ -290,7 +276,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on path' do
       fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home'
@@ -301,7 +287,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'visit old syntax' do
     let(:doc) do
       test do
@@ -311,14 +296,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on path' do
       fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home'
     end
   end
 
-
   describe 'visit raw_path' do
     let(:doc) do
       test do
@@ -330,15 +314,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on path' do
       fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home?location=melbourne'
     end
-
   end
 
-
   describe 'get_with_parameterized_domain' do
     let(:doc) do
       test do
@@ -350,7 +332,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on path' do
       fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home'
@@ -361,7 +343,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'https' do
     let(:doc) do
       test do
@@ -373,14 +354,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on protocol' do
       fragment.search(".//stringProp[@name='HTTPSampler.protocol']").text.should == 'https'
     end
   end
 
-
   describe 'user_parameters' do
     let(:doc) do
       test do
@@ -419,7 +399,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'xhr' do
     let(:doc) do
       test do
@@ -433,20 +412,19 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HeaderManager").first }
+    let(:fragment) { doc.search('//HeaderManager').first }
 
     it 'should match on XHR' do
       fragment.search(".//stringProp[@name='Header.value']").text.should == 'XMLHttpRequest'
     end
   end
 
-
   describe 'gzip' do
     let(:doc) do
       test do
         threads do
-          transaction name: "TC_02", parent: true, include_timers: true do
-            visit url: "/" do
+          transaction name: 'TC_02', parent: true, include_timers: true do
+            visit url: '/' do
               with_gzip
             end
           end
@@ -454,26 +432,25 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HeaderManager").first }
+    let(:fragment) { doc.search('//HeaderManager').first }
 
     it 'should match on Acept Encoding' do
       fragment.search(".//stringProp[@name='Header.value']").text.should == 'gzip, deflate'
     end
   end
 
-
   describe 'submit' do
     let(:doc) do
       test do
         threads do
-          transaction name: "TC_03", parent: true, include_timers: true do
+          transaction name: 'TC_03', parent: true, include_timers: true do
             submit url: "/", fill_in: { username: 'tim', password: 'password' }
           end
         end
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'should match on POST' do
       fragment.search(".//stringProp[@name='HTTPSampler.method']").text.should == 'POST'
@@ -482,10 +459,8 @@ describe "DSL" do
     it 'should have no files' do
       fragment.search(".//elementProp[@name='HTTPsampler.Files']").length.should == 0
     end
-
   end
 
-
   describe 'submit_with_files' do
     let(:doc) do
       test do
@@ -510,7 +485,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'If' do
     let(:doc) do
       test do
@@ -529,7 +503,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'exists' do
     let(:doc) do
       test do
@@ -548,7 +521,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'While' do
     let(:doc) do
       test do
@@ -560,14 +532,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//WhileController").first }
+    let(:fragment) { doc.search('//WhileController').first }
 
     it 'should match on While' do
       fragment.search(".//stringProp[@name='WhileController.condition']").text.should == 'true'
     end
   end
 
-
   describe 'Loop' do
     let(:doc) do
       test do
@@ -579,14 +550,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//LoopController").first }
+    let(:fragment) { doc.search('//LoopController').first }
 
     it 'should match on Loops' do
       fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '5'
     end
   end
 
-
   describe 'Counter' do
     let(:doc) do
       test do
@@ -598,14 +568,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//CounterConfig").first }
+    let(:fragment) { doc.search('//CounterConfig').first }
 
     it 'should match on 5 Loops' do
       fragment.search(".//boolProp[@name='CounterConfig.per_user']").text.should == 'true'
     end
   end
 
-
   describe 'Switch' do
     let(:doc) do
       test do
@@ -617,14 +586,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//SwitchController").first }
+    let(:fragment) { doc.search('//SwitchController').first }
 
     it 'should match on Switch' do
       fragment.search(".//stringProp[@name='SwitchController.value']").text.should == 'cat'
     end
   end
 
-
   describe 'regex extract' do
     let(:doc) do
       test do
@@ -632,14 +600,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//RegexExtractor").first }
+    let(:fragment) { doc.search('//RegexExtractor').first }
 
     it 'should match on refname' do
       fragment.search(".//stringProp[@name='RegexExtractor.refname']").text.should == 'my_regex'
     end
   end
 
-
   describe 'regex extract with variable' do
     let(:doc) do
       test do
@@ -647,7 +614,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//RegexExtractor").first }
+    let(:fragment) { doc.search('//RegexExtractor').first }
 
     it 'should match on refname' do
       fragment.search(".//stringProp[@name='Scope.variable']").text.should == 'test'
@@ -662,14 +629,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//XPathExtractor").first }
+    let(:fragment) { doc.search('//XPathExtractor').first }
 
     it 'should match on refname' do
       fragment.search(".//stringProp[@name='XPathExtractor.refname']").text.should == 'my_xpath'
     end
   end
 
-
   describe 'json extract' do
     let(:doc) do
       test do
@@ -685,7 +651,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'testdata extract' do
     let(:doc) do
       test do
@@ -693,16 +658,14 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//RegexExtractor").first }
+    let(:fragment) { doc.search('//RegexExtractor').first }
 
     it 'should match on refname' do
       fragment.search(".//stringProp[@name='RegexExtractor.refname']").text.should == 'testdata'
     end
   end
 
-
   describe 'assertions' do
-
     describe 'scope all' do
       let(:doc) do
         test do
@@ -736,7 +699,7 @@ describe "DSL" do
         end.to_doc
       end
 
-      let(:fragment) { doc.search("//ResponseAssertion").first }
+      let(:fragment) { doc.search('//ResponseAssertion').first }
 
       it 'should match on scope' do
         fragment.search(".//stringProp[@name='Assertion.scope']").text.should == ""
@@ -744,7 +707,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'Nested controllers' do
     let(:doc) do
       test do
@@ -785,10 +747,8 @@ describe "DSL" do
         node1_2.previous.previous.should == node1_1
       end
     end
-
   end
 
-
   describe 'raw body containing xml entities' do
     let(:doc) do
       test do
@@ -798,14 +758,13 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+    let(:fragment) { doc.search('//HTTPSamplerProxy').first }
 
     it 'escape raw_body' do
       fragment.search(".//stringProp[@name='Argument.value']").text.should == 'username=my_name&password=my_password&email="my name <test@example.com>"'
     end
   end
 
-
   describe 'constant_throughput_timer' do
     let(:doc) do
       test do
@@ -827,7 +786,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'run' do
     let(:deflate_properties) {
       File.expand_path('../../lib/ruby-jmeter/helpers/jmeter.properties', __FILE__)
@@ -872,10 +830,8 @@ describe "DSL" do
       test do
       end.run(properties: nil, remote_hosts: ['192.168.1.1', '192.168.1.2'])
     end
-
   end
 
-
   describe 'module controllers' do
     let(:doc) do
       test name: 'tests' do
@@ -906,7 +862,6 @@ describe "DSL" do
     end
   end
 
-
   describe 'module controllers with test fragment' do
     let(:doc) do
       test do

data/spec/spec_helper.rb

@@ -7,4 +7,4 @@ $LOAD_PATH.unshift test_dir unless $LOAD_PATH.include?(test_dir)
 lib_dir = File.join(File.dirname(test_dir), 'lib')
 $LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-require 'ruby-jmeter'
+require 'ruby-jmeter'

data/spec/stub.rb

@@ -28,4 +28,4 @@ __END__
 %div.title Hello world.
 
 @@ magic
-%div.title Magic happens
+%div.title Magic happens

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.13.0
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -97,6 +97,7 @@ files:
 - examples/basic_user_defined_variables.rb
 - examples/demo.csv
 - examples/etsy_login_browse.rb
+- examples/real_flood_test.rb
 - examples/real_flood_test_data.rb
 - examples/real_immi.gov.au_visa.rb
 - examples/real_page_objects.rb
@@ -268,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby based DSL for writing JMeter test plans