ruby-jmeter 2.0.7 → 2.0.8

data/examples/basic_foreach.rb

@@ -0,0 +1,32 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+  threads 1, {
+                rampup: 1, 
+                scheduler: true,
+                duration: 60, 
+                continue_forever: true
+              } do
+
+    defaults  domain: 'altentee.com'
+
+    random_timer 1000, 2000
+
+    transaction '01_GET_home' do
+      visit '/' do
+        extract regex: 'href="(.+?)"', name: 'links', match_number: -1
+      end
+    end
+
+    foreach_controller inputVal: 'links', returnVal: 'link' do
+      transaction '02_GET_random_link' do
+        visit '${link}'
+      end
+    end
+  end
+
+# end.jmx
+# end.flood(ENV['FLOOD_API_TOKEN'])
+# end.run(path: '/usr/share/jmeter/bin/', gui: true)
+end.run(path: '/usr/share/jmeter/bin/')

data/lib/ruby-jmeter/dsl.rb

@@ -6,7 +6,7 @@ module RubyJmeter
     def initialize(params = {})
       @root = Nokogiri::XML(<<-EOF.strip_heredoc)
         <?xml version="1.0" encoding="UTF-8"?>
-        <jmeterTestPlan version="1.2" properties="2.1">
+        <jmeterTestPlan version="1.2" properties="2.4" jmeter="2.9 r1437961">
         <hashTree>
         </hashTree>
         </jmeterTestPlan>

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

@@ -17,8 +17,6 @@ module RubyJmeter
   <stringProp name="ForeachController.inputVal"/>
   <stringProp name="ForeachController.returnVal"/>
   <boolProp name="ForeachController.useSeparator">true</boolProp>
-  <stringProp name="ForeachController.endIndex"/>
-  <stringProp name="ForeachController.startIndex"/>
 </ForeachController>)
       EOS
       update params

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

@@ -15,7 +15,7 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
   <boolProp name="LoopController.continue_forever">true</boolProp>
-  <stringProp name="LoopController.loops">1</stringProp>
+  <intProp name="LoopController.loops">1</intProp>
 </LoopController>)
       EOS
       update params

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

@@ -17,7 +17,7 @@ module RubyJmeter
   <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
   <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
     <boolProp name="LoopController.continue_forever">false</boolProp>
-    <stringProp name="LoopController.loops">1</stringProp>
+    <intProp name="LoopController.loops">1</intProp>
   </elementProp>
   <stringProp name="ThreadGroup.num_threads">1</stringProp>
   <stringProp name="ThreadGroup.ramp_time">1</stringProp>

data/lib/ruby-jmeter/idl.xml

@@ -249,7 +249,7 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <intProp name="LoopController.loops">1</intProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>
@@ -264,8 +264,6 @@
           <stringProp name="ForeachController.inputVal"></stringProp>
           <stringProp name="ForeachController.returnVal"></stringProp>
           <boolProp name="ForeachController.useSeparator">true</boolProp>
-          <stringProp name="ForeachController.endIndex"></stringProp>
-          <stringProp name="ForeachController.startIndex"></stringProp>
         </ForeachController>
         <hashTree/>
         <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
@@ -280,7 +278,7 @@
         <hashTree/>
         <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">true</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <intProp name="LoopController.loops">1</intProp>
         </LoopController>
         <hashTree/>
         <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

data/spec/dsl_spec.rb

@@ -120,7 +120,7 @@ describe "DSL" do
     end
 
     it 'should match on loops' do
-      fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '-1'
+      fragment.search(".//intProp[@name='LoopController.loops']").text.should == '-1'
     end
 
     it 'should match on duration' do
@@ -147,7 +147,7 @@ describe "DSL" do
     end
 
     it 'should match on loops' do
-      fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '-1'
+      fragment.search(".//intProp[@name='LoopController.loops']").text.should == '-1'
     end
 
     it 'should match on duration' do
@@ -372,7 +372,7 @@ describe "DSL" do
     let(:fragment) { doc.search("//LoopController").first }
 
     it 'should match on Loops' do
-      fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '5'
+      fragment.search(".//intProp[@name='LoopController.loops']").text.should == '5'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -67,6 +67,7 @@ files:
 - examples/basic_extract.rb
 - examples/basic_flood.rb
 - examples/basic_flood_real.rb
+- examples/basic_foreach.rb
 - examples/basic_gc_dummy_sampler.rb
 - examples/basic_gc_results.rb
 - examples/basic_google.rb
@@ -249,7 +250,4 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This is a Ruby based DSL for writing JMeter test plans
-test_files:
-- spec/dsl_spec.rb
-- spec/spec_helper.rb
-- spec/stub.rb
+test_files: []