ruby-jmeter 2.0.3 → 2.0.4

data/lib/ruby-jmeter/dsl.rb

@@ -25,7 +25,9 @@ module RubyJmeter
     # Config Elements
 
     def user_defined_variables(params, &block)
-      params['Argument.name'] = params[:name]
+      if params.is_a?(Hash) 
+        params['Argument.name'] = params[:name]
+      end
       super
     end
 
@@ -53,7 +55,9 @@ module RubyJmeter
     end
 
     def http_header_manager(params, &block)
-      params['Header.name'] = params[:name]
+      if params.is_a?(Hash) 
+        params['Header.name'] = params[:name]
+      end
       super
     end
 

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

@@ -17,9 +17,13 @@ module RubyJmeter
   module Helper
     def update(params)
       params.delete(:name)
-      params.each do |name, value|
-        node = @doc.children.xpath("//*[contains(@name,\"#{name.to_s}\")]")
-        node.first.content = value unless node.empty?
+      if params.class == Array
+        update_collection params
+      else
+        params.each do |name, value|
+          node = @doc.children.xpath("//*[contains(@name,\"#{name.to_s}\")]")
+          node.first.content = value unless node.empty?
+        end
       end
     end
 
@@ -29,6 +33,19 @@ module RubyJmeter
       end
     end
 
+    def update_collection(params)
+      elements = @doc.at_xpath("//collectionProp/elementProp")
+      params.each_with_index do |param, index|
+        param.each do |name, value|
+          element = elements.element_children.xpath("//*[contains(@name,\"#{name}\")]")
+          element.last.content = value
+        end
+        if index != params.size - 1
+           @doc.at_xpath("//collectionProp") << elements.dup
+        end
+      end
+    end
+
     def enabled(params)
       #default to true unless explicitly set to false
       if params.has_key?(:enabled) && params[:enabled] == false

data/lib/ruby-jmeter/idl.rb

@@ -53,12 +53,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= '#{klass}'
+      testname = params.kind_of?(Array) ? '#{klass}' : (params[:name] || '#{klass}')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-#{element.to_xml.gsub /testname=".+?"/, 'testname="#{params[:name]}"'})
+#{element.to_xml.gsub /testname=".+?"/, 'testname="#{testname}"'})
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/dsl_spec.rb

@@ -65,6 +65,28 @@ describe "DSL" do
     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
+      fragment.search(".//stringProp[@name='Header.name']").first.text.should == 'Accept'
+      fragment.search(".//stringProp[@name='Header.value']").first.text.should == '1'
+    end
+
+    it 'should match on accept for fragment_last' do
+      fragment.search(".//stringProp[@name='Header.name']").last.text.should == 'Accept'
+      fragment.search(".//stringProp[@name='Header.value']").last.text.should == '2'
+    end
+  end
+
   describe 'test plan' do
     it 'should allow to take params' do
       test_plan = test({"TestPlan.serialize_threadgroups" => "false"}) {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -78,6 +78,7 @@ files:
 - examples/basic_think_time.rb
 - examples/basic_throughput_controller.rb
 - examples/basic_throughput_shaping_timer.rb
+- examples/basic_user_defined_variables.rb
 - examples/etsy_login_browse.rb
 - lib/ruby-jmeter.rb
 - lib/ruby-jmeter/DSL.md
@@ -245,7 +246,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: []