ruby-jmeter 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 772ee2dfcf52c692ffec45df1b2e60606a956a0d
-  data.tar.gz: e0ac22cc8dc878b602e4fd3d04f7fb31fa5290d3
+  metadata.gz: 0154d7de05f20976f59d4bcc0fedd22bf90d97b8
+  data.tar.gz: 64c43a74aeb7d37b0c0872a5a2fdbcf485d1dd3c
 SHA512:
-  metadata.gz: 0f62a829fbb77d6c9cee1ed96604d77c46e1db689f687981041ff3b193f82b36bfeb1cfc8da228b6a48477266c320e33c8869b5f909101b92f4e98129a4d2340
-  data.tar.gz: b1759f5c5aefcaeab0b450f3be90a5b9f49d2093e98edd242400ee33790d6527717487f9a6a49024fcbd2ddf46d3c6ef5011a520824a6ddd6448c3ced644e393
+  metadata.gz: e7c38420938a8fbb9927a4fa0c4f57ed4a351a2428caa6fb149c3fbb202302e15b66fd20a60e57516be8acb7ed3bacfa79a9057cbc2c217a6a045c35d4321661
+  data.tar.gz: 5c831a2f1c8b5775efe4fdf4486bbe0b140feb6caeea8938ccae9a4c4aa1f90ed708876b040ece6a96ef0d5484bf5268a086ca8e7013c5519f69c8c70ee24b4b

data/lib/ruby-jmeter/extend/config_elements/http_request_defaults.rb

@@ -18,6 +18,17 @@ module RubyJmeter
           EOS
         ) if params[:md5]
 
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="HTTPSampler.proxyHost">#{params[:proxy_host]}</stringProp>
+          EOS
+        ) if params[:proxy_host]
+
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="HTTPSampler.proxyPort">#{params[:proxy_port]}</stringProp>
+          EOS
+        ) if params[:proxy_port]
       end
 
       attach_node(node, &block)

data/lib/ruby-jmeter/extend/controllers/foreach_controller.rb

@@ -20,6 +20,8 @@ module RubyJmeter
           )
         end
       end
+
+      attach_node(node, &block)
     end
   end
 end

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

@@ -29,7 +29,8 @@ module RubyJmeter
             duration: params[:duration],
             override_parameters: params[:override_parameters],
             started: params[:started],
-            stopped: params[:stopped]
+            stopped: params[:stopped],
+            privacy_flag: params[:privacy_flag] || 'private',
           },
           flood_files: flood_files,
           region: params[:region],

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/http_request_defaults_spec.rb

@@ -9,7 +9,9 @@ describe 'regular_expression_extractor' do
             implementation: 'HttpClient3.1',
             download_resources: true,
             use_concurrent_pool: 5,
-            urls_must_match: 'http.+?example.com'
+            urls_must_match: 'http.+?example.com',
+            proxy_host: 'proxy',
+            proxy_port: 8080
       end.to_doc
     end
 
@@ -43,5 +45,13 @@ describe 'regular_expression_extractor' do
     it 'matches on embedded url regex' do
       expect(config_fragment.search(".//stringProp[@name='HTTPSampler.embedded_url_re']").text).to eq 'http.+?example.com'
     end
+
+    it 'matches on proxy_host' do
+      expect(config_fragment.search(".//stringProp[@name='HTTPSampler.proxyHost']").text).to eq 'proxy'
+    end
+
+    it 'matches on proxy_port' do
+      expect(config_fragment.search(".//stringProp[@name='HTTPSampler.proxyPort']").text).to eq '8080'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client