ruby-jmeter 2.13.10 → 3.0.0

data/lib/ruby-jmeter/extend/misc/with_helpers.rb

@@ -0,0 +1,27 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def with_user_agent(device)
+      http_header_manager name: 'User-Agent', value: RubyJmeter::UserAgent.new(device).string
+    end
+
+    def with_browser(device)
+      http_header_manager name: 'User-Agent', value: RubyJmeter::UserAgent.new(device).string
+      http_header_manager [
+        { name: 'Accept-Encoding', value: 'gzip,deflate,sdch' },
+        { name: 'Accept', value: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' }
+      ]
+    end
+
+    def with_xhr
+      http_header_manager name: 'X-Requested-With', value: 'XMLHttpRequest'
+    end
+
+    def with_gzip
+      http_header_manager name: 'Accept-Encoding', value: 'gzip, deflate'
+    end
+
+    def with_json
+      http_header_manager name: 'Accept', value: 'text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8, application/json'
+    end
+  end
+end

data/lib/ruby-jmeter/extend/plugins/jmeter_plugins.rb

@@ -0,0 +1,115 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    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)
+      node = RubyJmeter::Plugins::ResponseTimesDistribution.new(name, params)
+      attach_node(node, &block)
+    end
+
+    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)
+      node = RubyJmeter::Plugins::ResponseTimesPercentiles.new(name, params)
+      attach_node(node, &block)
+    end
+
+    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)
+      node = RubyJmeter::Plugins::LatenciesOverTime.new(name, params)
+      attach_node(node, &block)
+    end
+
+    def console_status_logger(name = 'Console Status Logger', params = {}, &block)
+      node = RubyJmeter::Plugins::ConsoleStatusLogger.new(name, params)
+      attach_node(node, &block)
+    end
+
+    alias console console_status_logger
+
+    def throughput_shaper(name = 'Throughput Shaping Timer', steps=[], params = {}, &block)
+      node = RubyJmeter::Plugins::ThroughputShapingTimer.new(name, steps)
+      attach_node(node, &block)
+    end
+
+    alias shaper throughput_shaper
+
+    def dummy_sampler(name = 'Dummy Sampler', params = {}, &block)
+      node = RubyJmeter::Plugins::DummySampler.new(name, params)
+      attach_node(node, &block)
+    end
+
+    alias dummy dummy_sampler
+
+    def stepping_thread_group(params = {}, &block)
+      node = RubyJmeter::Plugins::SteppingThreadGroup.new(params)
+      attach_node(node, &block)
+    end
+
+    alias step stepping_thread_group
+
+    def ultimate_thread_group(threads = [], params = {}, &block)
+      node = RubyJmeter::Plugins::UltimateThreadGroup.new(params)
+
+      threads.each_with_index do |group, index|
+        node.doc.at_xpath('//collectionProp') <<
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <collectionProp name="index">
+              <stringProp name="#{group[:start_threads]}">#{group[:start_threads]}</stringProp>
+              <stringProp name="#{group[:initial_delay]}">#{group[:initial_delay]}</stringProp>
+              <stringProp name="#{group[:start_time]}">#{group[:start_time]}</stringProp>
+              <stringProp name="#{group[:hold_time]}">#{group[:hold_time]}</stringProp>
+              <stringProp name="#{group[:stop_time]}">#{group[:stop_time]}</stringProp>
+            </collectionProp>
+          EOS
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias ultimate ultimate_thread_group
+
+    def composite_graph(name, params = {}, &block)
+      node = RubyJmeter::Plugins::CompositeGraph.new(name, params)
+      attach_node(node, &block)
+    end
+
+    alias composite composite_graph
+
+    def active_threads_over_time(params = {}, &block)
+      node = RubyJmeter::Plugins::ActiveThreadsOverTime.new(params)
+      attach_node(node, &block)
+    end
+
+    alias active_threads active_threads_over_time
+
+    def perfmon_collector(params = {}, &block)
+      node = RubyJmeter::Plugins::PerfmonCollector.new(params)
+      attach_node(node, &block)
+    end
+
+    alias perfmon perfmon_collector
+
+    def loadosophia_uploader(name = "Loadosophia.org Uploader", params = {}, &block)
+      node = RubyJmeter::Plugins::LoadosophiaUploader.new(name, params)
+      attach_node(node, &block)
+    end
+
+    alias loadosophia loadosophia_uploader
+
+    def redis_data_set(params = {}, &block)
+      node = RubyJmeter::Plugins::RedisDataSet.new(params)
+      attach_node(node, &block)
+    end
+  end
+end

data/lib/ruby-jmeter/extend/processors/extract.rb

@@ -0,0 +1,28 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def extract(params, &block)
+      node = if params[:regex]
+        params[:refname] = params[:name]
+        params[:regex] = params[:regex] #CGI.escapeHTML
+        params[:template] = params[:template] || "$1$"
+        RubyJmeter::RegularExpressionExtractor.new(params)
+      elsif params[:xpath]
+        params[:refname] = params[:name]
+        params[:xpathQuery] = params[:xpath]
+        RubyJmeter::XpathExtractor.new(params)
+      elsif params[:json]
+        params[:VAR] = params[:name]
+        params[:JSONPATH] = params[:json]
+        RubyJmeter::Plugins::JsonPathExtractor.new(params)
+      elsif params[:css]
+        params[:refname] = params[:name]
+        params[:expr] = params[:css]
+        RubyJmeter::CssjqueryExtractor.new(params)
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias web_reg_save_param extract
+  end
+end

data/lib/ruby-jmeter/extend/processors/regular_expression_extractor.rb

@@ -0,0 +1,25 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def regular_expression_extractor(params, &block)
+      params[:refname] = params[:name]
+      params[:regex] = params[:pattern]
+      params[:template] = params[:template] || "$1$"
+
+      node = RubyJmeter::RegularExpressionExtractor.new(params).tap do |node|
+        if params[:variable]
+          node.doc.xpath("//stringProp[@name='Sample.scope']").first.content = 'variable'
+
+          node.doc.children.first.add_child (
+            Nokogiri::XML(<<-EOS.strip_heredoc).children
+              <stringProp name="Scope.variable">#{params[:variable]}</stringProp>
+            EOS
+          )
+        end
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias regex regular_expression_extractor
+  end
+end

data/lib/ruby-jmeter/extend/samplers/http_request.rb

@@ -0,0 +1,47 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def http_request(*args, &block)
+      params = args.shift || {}
+      params = { url: params }.merge(args.shift || {}) if params.class == String
+
+      params[:method] ||= case __callee__.to_s
+      when 'visit'
+        'GET'
+      when 'submit'
+        'POST'
+      else
+        __callee__.to_s.upcase
+      end
+
+      params[:name] ||= params[:url]
+
+      parse_http_request(params)
+
+      node = RubyJmeter::HttpRequest.new(params).tap do |node|
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="HTTPSampler.implementation">#{params[:implementation]}</stringProp>
+          EOS
+        ) if params[:implementation]
+
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="TestPlan.comments">#{params[:comments]}</stringProp>
+          EOS
+        ) if params[:comments]
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias request http_request
+    alias get http_request
+    alias visit http_request
+    alias post http_request
+    alias submit http_request
+    alias delete http_request
+    alias patch http_request
+    alias put http_request
+    alias head http_request
+  end
+end

data/lib/ruby-jmeter/extend/samplers/soapxmlrpc_request.rb

@@ -0,0 +1,9 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def soapxmlrpc_request(params, &block)
+      params[:method] ||= 'POST'
+
+      super
+    end
+  end
+end

data/lib/ruby-jmeter/extend/threads/setup_thread_group.rb

@@ -0,0 +1,18 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def setup_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[:continue_forever] ||= false
+      params[:loops] = -1 if params[:continue_forever]
+      node = RubyJmeter::SetupThreadGroup.new(params)
+
+      attach_node(node, &block)
+    end
+  end
+end

data/lib/ruby-jmeter/extend/threads/thread_group.rb

@@ -0,0 +1,19 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    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[:continue_forever] ||= false
+      params[:loops] = -1 if params[:continue_forever]
+      node = RubyJmeter::ThreadGroup.new(params)
+      attach_node(node, &block)
+    end
+
+    alias threads thread_group
+  end
+end

data/lib/ruby-jmeter/extend/timers/constant_throughput_timer.rb

@@ -0,0 +1,12 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def constant_throughput_timer(params, &block)
+      params[:value] ||= params[:throughput] || 0.0
+
+      node = RubyJmeter::ConstantThroughputTimer.new(params)
+      node.doc.xpath('.//value').first.content = params[:value].to_f
+
+      attach_node(node, &block)
+    end
+  end
+end

data/lib/ruby-jmeter/extend/timers/random_timer.rb

@@ -0,0 +1,14 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def random_timer(delay=0, range=0, &block)
+      params = {}
+      params[:delay] = delay
+      params[:range] = range
+      node = RubyJmeter::GaussianRandomTimer.new(params)
+
+      attach_node(node, &block)
+    end
+
+    alias think_time random_timer
+  end
+end

data/lib/ruby-jmeter/helpers/helper.rb

@@ -1,5 +1,4 @@
 module RubyJmeter
-
   def dsl_eval(dsl, &block)
     block_context = eval("self", block.binding)
     proxy_context = RubyJmeter::FallbackContextProxy.new(dsl, block_context)
@@ -24,7 +23,7 @@ module RubyJmeter
         params.each do |name, value|
           node = @doc.children.xpath("//*[contains(@name,\"#{name.to_s}\")]")
           if value.class == Nokogiri::XML::Builder
-            node.first << value.doc.at_xpath('//builder').children
+            node.first.children = value.doc.at_xpath('//builder').children
           else
             node.first.content = value unless node.empty?
           end

data/lib/ruby-jmeter/idl.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.8" jmeter="2.13 r1665067">
+<jmeterTestPlan version="1.2" properties="2.9" jmeter="3.0 r1743807">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -395,8 +395,8 @@
         <hashTree/>
         <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
         <hashTree/>
-        <ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="HTML Parameter Mask" enabled="true">
-          <elementProp name="ParamModifier.mask" elementType="ParamMask">
+        <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="HTML Parameter Mask" enabled="true">
+          <elementProp name="ParamModifier.mask" elementType="ConfigTestElement">
             <stringProp name="ParamModifier.field_name"></stringProp>
             <stringProp name="ParamModifier.prefix"></stringProp>
             <longProp name="ParamModifier.lower_bound">0</longProp>
@@ -404,7 +404,7 @@
             <longProp name="ParamModifier.increment">1</longProp>
             <stringProp name="ParamModifier.suffix"></stringProp>
           </elementProp>
-        </ParamModifier>
+        </ConfigTestElement>
         <hashTree/>
         <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
           <stringProp name="argument_name"></stringProp>
@@ -643,6 +643,8 @@
               </elementProp>
             </collectionProp>
           </elementProp>
+          <stringProp name="jms.expiration"></stringProp>
+          <stringProp name="jms.priority"></stringProp>
         </PublisherSampler>
         <hashTree/>
         <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '2.13.10'
+  VERSION = '3.0.0'
 end

data/ruby-jmeter.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ruby-jmeter/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "ruby-jmeter"
+  gem.name          = 'ruby-jmeter'
   gem.version       = RubyJmeter::VERSION
-  gem.authors       = ["Tim Koopmans"]
-  gem.email         = ["support@flood.io"]
+  gem.authors       = ['Tim Koopmans']
+  gem.email         = ['support@flood.io']
   gem.description   = %q{Ruby based DSL for writing JMeter test plans}
   gem.summary       = %q{Ruby based DSL for writing JMeter test plans}
-  gem.homepage      = "http://flood-io.github.io/ruby-jmeter/"
-  gem.add_dependency("rest-client")
-  gem.add_dependency("nokogiri")
+  gem.homepage      = 'http://flood-io.github.io/ruby-jmeter/'
+  gem.add_dependency('rest-client')
+  gem.add_dependency('nokogiri')
   gem.add_runtime_dependency('json-jruby') if RUBY_PLATFORM == 'java'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   << 'flood'
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.require_paths = ['lib']
 
   gem.license       = 'MIT'

data/spec/constant_throughput_timer_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'constant_throughput_timer' do
+  let(:doc) do
+    test do
+      threads do
+        constant_throughput_timer value: 60.0
+        constant_throughput_timer throughput: 70.0
+      end
+    end.to_doc
+  end
+
+  let(:fragment) { doc.search("//ConstantThroughputTimer").first }
+
+  it 'should match on throughput using value' do
+    expect(fragment.search("//doubleProp/value").first.text).to eq '60.0'
+  end
+
+  it 'should match on throughput using throughput' do
+    expect(fragment.search("//doubleProp/value").last.text).to eq '70.0'
+  end
+end

data/spec/header_manager_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'header manager' do
+  let(:doc) do
+    test do
+      header name: 'Accept', value: '*'
+    end.to_doc
+  end
+
+  let(:fragment) { doc.search('//HeaderManager').first }
+
+  it 'should match on accept' do
+    expect(fragment.search(".//stringProp[@name='Header.name']").text).to eq 'Accept'
+    expect(fragment.search(".//stringProp[@name='Header.value']").text).to eq '*'
+  end
+end
+
+describe 'header manager multiple values' do
+  let(:doc) do
+    test do
+      header [ { name: 'Accept', value: '1' }, { name: 'Accept', value: '2' }]
+    end.to_doc
+  end
+
+  let(:fragment) { doc.search('//HeaderManager') }
+
+
+  it 'should match on accept for fragment_first' do
+    expect(fragment.search(".//stringProp[@name='Header.name']").first.text).to eq 'Accept'
+    expect(fragment.search(".//stringProp[@name='Header.value']").first.text).to eq '1'
+  end
+
+  it 'should match on accept for fragment_last' do
+    expect(fragment.search(".//stringProp[@name='Header.name']").last.text).to eq 'Accept'
+    expect(fragment.search(".//stringProp[@name='Header.value']").last.text).to eq '2'
+  end
+end