gridinit-jmeter 0.0.4 → 0.0.5

data/README.md

@@ -239,6 +239,10 @@ visit 'Google Search', 'http://altentee.com', {
   connect_timeout: '1000',
   response_timeout: '60000',
 }
+visit 'View Login', '/login', {
+  protocol: "https",
+  port: 443
+}
 ```
 
 ### Submitting a Form
@@ -281,7 +285,17 @@ You can use the `extract` method to extract values from a server response using
 extract 'csrf-token', "content='(.+?)' name='csrf-token'"
 ```
 
-This method takes 3 parameters: the extracted value name, the PCRE regular expression and an optional parameters hash. This is based on the [Regular Expression Extractor](http://jmeter.apache.org/usermanual/component_reference.html#Regular_Expression_Extractor). 
+This method takes 4 parameters: the selector (xpath or regex), the extracted value name, the PCRE regular expression and an optional parameters hash. The selector is optional and defaults to regex. You can specify regex or xpath extractors as follows.
+
+```
+visit 'Google', "http://google.com/" do
+  extract 'button_text', 'aria-label="(.+?)"'
+  extract :regex, 'button_text', 'aria-label="(.+?)"'
+  extract :xpath, 'button', '//button'
+end
+```
+
+This is based on the [Regular Expression Extractor](http://jmeter.apache.org/usermanual/component_reference.html#Regular_Expression_Extractor) and [XPath Extractor](http://jmeter.apache.org/usermanual/component_reference.html#XPath_Extractor)
 
 ```ruby
 visit "Altentee", "http://altentee.com" do

data/examples/basic_extract.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gridinit-jmeter'
+
+test do
+
+  threads 100 do
+
+    visit 'Google', "http://google.com/" do
+      extract 'button_text', 'aria-label="(.+?)"'
+      extract :regex, 'button_text', 'aria-label="(.+?)"'
+      extract :xpath, 'button', '//button'
+    end
+
+  end
+
+end.jmx

data/lib/gridinit-jmeter/dsl.rb

@@ -107,8 +107,15 @@ module Gridinit
 
       alias_method :post, :submit
 
-      def extract(name="", regex="", params={}, &block)
-        node = Gridinit::Jmeter::RegexExtractor.new(name, regex, params)
+      def extract(*args, &block)
+        node = case args.first
+        when :regex
+          Gridinit::Jmeter::RegexExtractor.new(*args.last(2))
+        when :xpath
+          Gridinit::Jmeter::XpathExtractor.new(*args.last(2))
+        else
+          Gridinit::Jmeter::RegexExtractor.new(*args)
+        end
         last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end

data/lib/gridinit-jmeter/http_sampler.rb

@@ -44,10 +44,10 @@ module Gridinit
           params[:path] = url # special case for named expressions
         else 
           uri               = parse_uri(url)
-          params[:protocol] = uri.scheme
-          params[:domain]   = uri.host
-          params[:port]     = uri.port
-          params[:path]     = uri.path
+          params[:protocol] ||= uri.scheme
+          params[:domain]   ||= uri.host
+          params[:port]     ||= uri.port
+          params[:path]     ||= uri.path
         end
       end
 

data/lib/gridinit-jmeter/regex_extractor.rb

@@ -5,7 +5,7 @@ module Gridinit
       attr_accessor :doc
       def initialize(name, regex, params={})
         @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="#{name}" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
             <stringProp name="RegexExtractor.refname">#{name}</stringProp>
             <stringProp name="RegexExtractor.regex">#{CGI.escapeHTML regex}</stringProp>

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/gridinit-jmeter/xpath_extractor.rb

@@ -0,0 +1,25 @@
+module Gridinit
+  module Jmeter
+
+    class XpathExtractor
+      attr_accessor :doc
+      def initialize(name, xpath, params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="#{name}" enabled="true">
+            <stringProp name="XPathExtractor.default"></stringProp>
+            <stringProp name="XPathExtractor.refname">#{name}</stringProp>
+            <stringProp name="XPathExtractor.xpathQuery">#{xpath}</stringProp>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+        EOF
+        params.each do |name, value|
+          node = @doc.children.xpath("//*[contains(@name,\"#{name.to_s}\")]")
+          node.first.content = value unless node.empty?
+        end
+      end
+    end
+
+  end
+end

data/lib/gridinit-jmeter.rb

@@ -19,6 +19,7 @@ require 'gridinit-jmeter/once_only'
 require 'gridinit-jmeter/if_controller'
 require 'gridinit-jmeter/http_sampler'
 require 'gridinit-jmeter/regex_extractor'
+require 'gridinit-jmeter/xpath_extractor'
 require 'gridinit-jmeter/user_defined_variable'
 require 'gridinit-jmeter/gaussian_random_timer'
 require 'gridinit-jmeter/response_assertion'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -65,6 +65,7 @@ files:
 - examples/basic_auth.rb
 - examples/basic_cache.rb
 - examples/basic_cookies.rb
+- examples/basic_extract.rb
 - examples/basic_google.rb
 - examples/basic_grid.rb
 - examples/basic_proxy.rb
@@ -95,6 +96,7 @@ files:
 - lib/gridinit-jmeter/transaction.rb
 - lib/gridinit-jmeter/user_defined_variable.rb
 - lib/gridinit-jmeter/version.rb
+- lib/gridinit-jmeter/xpath_extractor.rb
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
 - spec/stub.rb