gridinit-jmeter 0.1.5 → 0.1.7

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p194
+1.9.3-p385

data/lib/gridinit-jmeter.rb

@@ -100,6 +100,7 @@ require 'gridinit-jmeter/helpers/user-agents'
   require 'gridinit-jmeter/controllers/once_only'
   require 'gridinit-jmeter/controllers/if_controller'
   require 'gridinit-jmeter/controllers/loop_controller'
+  require 'gridinit-jmeter/controllers/throughput'
 
 # SAMPLERS
   require 'gridinit-jmeter/samplers/http_sampler'

data/lib/gridinit-jmeter/controllers/throughput.rb

@@ -0,0 +1,26 @@
+module Gridinit
+  module Jmeter
+
+    class Throughput
+      attr_accessor :doc
+      include Helper
+      def initialize(name, percent, params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="#{percent.to_i}%_#{name}" enabled="true">
+          <intProp name="ThroughputController.style">1</intProp>
+          <boolProp name="ThroughputController.perThread">false</boolProp>
+          <intProp name="ThroughputController.maxThroughput">1</intProp>
+          <FloatProperty>
+            <name>ThroughputController.percentThroughput</name>
+            <value>#{percent.to_f}</value>
+            <savedValue>0.0</savedValue>
+          </FloatProperty>
+        </ThroughputController>
+        EOF
+        update params
+      end
+    end  
+
+  end
+end
+

data/lib/gridinit-jmeter/controllers/transaction.rb

@@ -8,6 +8,7 @@ module Gridinit
         @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
           <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="#{name}" enabled="true">
             <boolProp name="TransactionController.parent">true</boolProp>
+            <boolProp name="TransactionController.includeTimers">false</boolProp>
           </TransactionController>
         EOF
         update params

data/lib/gridinit-jmeter/dsl.rb

@@ -113,6 +113,12 @@ module Gridinit
         self.instance_exec(&block) if block
       end
 
+      def throughput(name="throughput", percent=100.0, params={}, &block)
+        node = Gridinit::Jmeter::Throughput.new(name, percent, params)
+        attach_to_last(node, caller)
+        self.instance_exec(&block) if block
+      end
+
       def If(name="If Controller", params={}, &block)
         node = Gridinit::Jmeter::IfController.new(name, params)
         attach_to_last(node, caller)
@@ -323,6 +329,8 @@ module Gridinit
           '//ThreadGroup/following-sibling::hashTree'
         when 'transaction'
           '//TransactionController/following-sibling::hashTree'
+        when 'throughput'
+          '//ThroughputController/following-sibling::hashTree'
         when 'once'
           '//OnceOnlyController/following-sibling::hashTree'
         when 'exists'

data/lib/gridinit-jmeter/post_processors/regex_extractor.rb

@@ -13,6 +13,7 @@ module Gridinit
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"></stringProp>
             <stringProp name="RegexExtractor.match_number">0</stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
           </RegexExtractor>
         EOF
         update params

data/lib/gridinit-jmeter/samplers/http_sampler.rb

@@ -32,10 +32,15 @@ module Gridinit
         parse_url(url, params) unless url.empty?
         fill_in(params)  if params[:fill_in]
         raw_body(params) if params[:raw_body]
-        params[:params] && params[:params].split('&').each do |param| 
-          name,value = param.split('=')
-          fill_in({ :fill_in => { "#{name}" => value }, :always_encode => params[:always_encode] })
+        if params[:raw_path]
+          params[:path] = url
+        else
+          params[:params] && params[:params].split('&').each do |param| 
+            name,value = param.split('=')
+            fill_in({ :fill_in => { "#{name}" => value }, :always_encode => params[:always_encode] })
+          end
         end
+
         update params
       end
 

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "0.1.5"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -96,6 +96,7 @@ files:
 - lib/gridinit-jmeter/controllers/if_controller.rb
 - lib/gridinit-jmeter/controllers/loop_controller.rb
 - lib/gridinit-jmeter/controllers/once_only.rb
+- lib/gridinit-jmeter/controllers/throughput.rb
 - lib/gridinit-jmeter/controllers/transaction.rb
 - lib/gridinit-jmeter/dsl.rb
 - lib/gridinit-jmeter/helpers/dsl_helper.rb
@@ -155,4 +156,3 @@ test_files:
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
 - spec/stub.rb
-has_rdoc: