ruby-jmeter 2.11.6 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10676650fd31cdb67abc4b35df98b96095c811a4
-  data.tar.gz: 20ac434469c62af4f9ed6e9ad860bdeeb9b67f61
+  metadata.gz: 292b0362da06efe27eef6c870a97d1d6765f9ee9
+  data.tar.gz: e5cc75c8bae12aefbbc43472a09d74ab7a7ee09d
 SHA512:
-  metadata.gz: 69ac56b3fa3ecca4e3efccc08e7273f08d2072327c91864425bd674a75e106a985c0f7d1faf8ab491117764669e8d661fa8290538fa4e3b2d1ce8ce4264845a9
-  data.tar.gz: 2e07aa6cc60feb4b693d12039dd2843ef5b57b51c7e499279d7f4a82cb09e51dda592fb1187618cc0c21097528192e268a246192f1072ee6ac30e0c641874cd5
+  metadata.gz: d46aabc1687ceea00fffb3d056027a94e668412f716987c39dc1f4ed59f3d0140b61358dbb82056c91af4b21936792aa6bc86aa3e2c3445892ff3228e41d14e3
+  data.tar.gz: 181e7695085cc948f84dfdc3d6f2b2ba9775bb2d1dd58ae4d58b53b1c59fab0327f7f27748d3ad8bf24bcf54061251f3b22b7caba136250dc604468543e31471

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/flood-io/ruby-jmeter.png)](https://travis-ci.org/flood-io/ruby-jmeter)
 [![Code Climate](https://codeclimate.com/github/flood-io/ruby-jmeter.png)](https://codeclimate.com/github/flood-io/ruby-jmeter)
+[![Gem Version](https://badge.fury.io/rb/ruby-jmeter.svg)](http://badge.fury.io/rb/ruby-jmeter)
 
 Tired of using the JMeter GUI or looking at hairy XML files?
 
@@ -256,12 +257,12 @@ This method makes a single request. The fill_in parameter lets you specify key/v
 ### POST JSON
 
 ```ruby
-  header [ 
+  header [
     { name: 'Content-Type', value: 'application/json' }
-  ] 
-  
+  ]
+
   person = { name: "Tom" }
-  
+
   post name: 'Create Person',
         url: "https://example.com/people.json",
         raw_body: person.to_json do

data/lib/ruby-jmeter/dsl.rb

@@ -254,6 +254,20 @@ module RubyJmeter
     ##
     # Other Elements
 
+    def module_controller(params, &block)
+      node = RubyJmeter::ModuleController.new(params)
+
+      node_path = params.kind_of?(Array) ? [] : (params[:node_path] || [])
+      node_path.each_with_index do |node_name, index|
+        node.doc.at_xpath('//collectionProp') <<
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="node_#{index}">#{node_name}</stringProp>
+          EOS
+      end
+
+      attach_node(node, &block)
+    end
+
     def user_parameters(params, &block)
       if params.is_a?(Hash)
         params['Argument.name'] = params[:name]

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

@@ -13,7 +13,9 @@ module RubyJmeter
     def initialize(params={})
       testname = params.kind_of?(Array) ? 'ModuleController' : (params[:name] || 'ModuleController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="#{testname}" enabled="true"/>)
+<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="#{testname}" enabled="true">
+  <collectionProp name="ModuleController.node_path"/>
+</ModuleController>)
       EOS
       update params
       update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]

data/lib/ruby-jmeter/idl.xml

@@ -279,7 +279,9 @@
           <stringProp name="LoopController.loops">1</stringProp>
         </LoopController>
         <hashTree/>
-        <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+        <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true">
+          <collectionProp name="ModuleController.node_path" />
+        </ModuleController>
         <hashTree/>
         <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
         <hashTree/>

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.11.6"
+  VERSION = "2.11.7"
 end

data/spec/dsl_spec.rb

@@ -517,7 +517,7 @@ describe "DSL" do
     let(:fragment) { doc.search("//IfController").first }
 
     it 'should match on exists' do
-      fragment.search(".//stringProp[@name='IfController.condition']").text.should == "'${apple}'.length > 0"
+      fragment.search(".//stringProp[@name='IfController.condition']").text.should == '"${apple}" != "\${apple}"'
     end
   end
 
@@ -813,4 +813,35 @@ describe "DSL" do
 
   end
 
+  describe 'module controllers' do
+    let(:doc) do
+      test name: 'tests' do
+        threads 1, name: 'threads' do
+          Simple name: 'controller_to_call'
+        end
+        threads 1 do
+          module_controller name: 'modules', node_path: [
+            'WorkBench',
+            'tests',
+            'threads',
+            'controller_to_call'
+          ]
+        end
+      end.to_doc
+    end
+
+    let(:simple_controller) { doc.search("//GenericController").first }
+    let(:test_module) { doc.search("//ModuleController").first }
+    let(:nodes) { test_module.search(".//stringProp") }
+
+
+    it 'should have a node path' do
+      nodes.length.should == 4
+      nodes[0].text.should == 'WorkBench'
+      nodes[1].text.should == 'tests'
+      nodes[2].text.should == 'threads'
+      nodes[3].text.should == 'controller_to_call'
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 2.11.7
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client