gridinit-jmeter 0.0.3 → 0.0.4

data/README.md

@@ -2,7 +2,7 @@
 
 Tired of using the JMeter GUI or looking at hairy XML files?
 
-This gem lets you write test plans for JMeter in your favourite text editor, and optionally run them on [Gridinit.com](http://gridinit.com). Here's some background on [why we think](http://www.slideshare.net/90kts/gridinit-jmeter) a DSL is necessary. 
+This gem lets you write test plans for JMeter in your favourite text editor, and optionally run them on [Gridinit.com](http://gridinit.com). Here's some background on [why we think](http://www.slideshare.net/90kts/gridinit-jmeter) a DSL is necessary. Don't have Ruby? No problems, you can try out this DSL online in our [sandbox](http://sandbox.gridinit.com)
 
 ## Installation
 

data/examples/basic_testplan.rb

@@ -39,6 +39,6 @@ test do
 
   end
 
-# end.jmx
+end.jmx
 # end.run(path: '/usr/share/jmeter/bin/')
-end.grid '4dy-zJLEIgpYkKe6p6JhSQ', { endpoint: endpoint }
+# end.grid '4dy-zJLEIgpYkKe6p6JhSQ', { endpoint: endpoint }

data/examples/etsy_login_browse.rb

@@ -0,0 +1,64 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gridinit-jmeter'
+
+test do
+
+  defaults domain: 'www.etsy.com'
+
+  cache clear_each_iteration: true
+
+  cookies
+  
+  threads 1, {loops: 10} do
+
+    random_timer 1000, 3000
+
+    transaction '01_etsy_home' do
+      visit 'home', 'http://www.etsy.com/' do
+        assert 'contains', 'Etsy - Your place to buy and sell all things handmade, vintage, and supplies'
+      end
+    end
+
+    once do
+      transaction '02_etsy_signin' do
+        submit 'signin', 'https://www.etsy.com/signin', {
+          fill_in: {
+            username:   'tim.koops@gmail.com',
+            password:   ARGV[0],
+            persistent: 1,
+            from_page:  'http://www.etsy.com/',
+            from_action: '',
+            from_overlay: 1
+          }
+        } do
+          assert 'contains', 'Tim'
+          extract 'random_category', 'a href="(/browse.+?)"'
+        end
+      end
+    end   
+
+    exists 'random_category' do
+
+      transaction '03_etsy_browse_random_category' do
+        visit 'browse', '${random_category}' do
+          extract 'random_sub_category', 'a href="(http.+?subcat.+?)"'
+        end
+      end
+
+      transaction '04_etsy_browse_random_sub_category' do
+        visit 'browse', '${random_sub_category}' do
+          extract 'random_listing', 'a href="(/listing.+?)"'
+        end
+      end
+
+      transaction '05_etsy_view_random_listing' do
+        visit 'view', '${random_listing}'
+      end
+
+    end
+
+  end
+
+end.grid ARGV[1]
+# end.jmx
+# end.run(path: '/usr/share/jmeter/bin/')

data/lib/gridinit-jmeter.rb

@@ -9,11 +9,14 @@ require 'gridinit-jmeter/logger-colors'
 require 'gridinit-jmeter/strip-heredoc'
 require 'gridinit-jmeter/version'
 require 'gridinit-jmeter/test_plan'
+require 'gridinit-jmeter/request_defaults'
 require 'gridinit-jmeter/auth_manager'
 require 'gridinit-jmeter/cookie_manager'
 require 'gridinit-jmeter/cache_manager'
 require 'gridinit-jmeter/thread_group'
 require 'gridinit-jmeter/transaction'
+require 'gridinit-jmeter/once_only'
+require 'gridinit-jmeter/if_controller'
 require 'gridinit-jmeter/http_sampler'
 require 'gridinit-jmeter/regex_extractor'
 require 'gridinit-jmeter/user_defined_variable'

data/lib/gridinit-jmeter/dsl.rb

@@ -38,51 +38,70 @@ module Gridinit
 
       def variables(params={}, &block)
         node = Gridinit::Jmeter::UserDefinedVariable.new(params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
+        self.instance_exec(&block) if block
+      end
+
+      def defaults(params={}, &block)
+        node = Gridinit::Jmeter::RequestDefaults.new(params)
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def cookies(params={}, &block)
         node = Gridinit::Jmeter::CookieManager.new(params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def cache(params={}, &block)
         node = Gridinit::Jmeter::CacheManager.new(params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def auth(params={}, &block)
         node = Gridinit::Jmeter::AuthManager.new(params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def threads(num_threads=1, params={}, &block)
         node = Gridinit::Jmeter::ThreadGroup.new(num_threads, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def transaction(name="Transaction Contoller", params={}, &block)
         node = Gridinit::Jmeter::Transaction.new(name, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
+        self.instance_exec(&block) if block
+      end
+
+      def exists(var, params={}, &block)
+        params[:condition] = "'${#{var}}'.length > 0"
+        node = Gridinit::Jmeter::IfController.new("if #{var}", params)
+        last_node_from(caller) << node.doc.children << hash_tree
+        self.instance_exec(&block) if block
+      end
+
+      def once(name="do once", params={}, &block)
+        node = Gridinit::Jmeter::OnceOnly.new(name, params)
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def visit(name="HTTP Request", url="", params={}, &block)
         params[:method] = 'GET'
         node = Gridinit::Jmeter::HttpSampler.new(name, url, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
       def submit(name="HTTP Request", url="", params={}, &block)
         params[:method] = 'POST'
         node = Gridinit::Jmeter::HttpSampler.new(name, url, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
@@ -90,7 +109,7 @@ module Gridinit
 
       def extract(name="", regex="", params={}, &block)
         node = Gridinit::Jmeter::RegexExtractor.new(name, regex, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
@@ -98,7 +117,7 @@ module Gridinit
 
       def random_timer(delay=0, range=0, &block)
         node = Gridinit::Jmeter::GaussianRandomTimer.new(delay, range)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
@@ -106,7 +125,7 @@ module Gridinit
 
       def assert(match="contains", pattern="", params={}, &block)
         node = Gridinit::Jmeter::ResponseAssertion.new(match, pattern, params)
-        @root.at_xpath(xpath_from(caller)) << node.doc.children << hash_tree
+        last_node_from(caller) << node.doc.children << hash_tree
         self.instance_exec(&block) if block
       end
 
@@ -155,20 +174,30 @@ module Gridinit
         Nokogiri::XML::Node.new("hashTree", @root)
       end
 
+      def last_node_from(calling_method)
+        xpath = xpath_from(calling_method)
+        node  = @root.xpath(xpath).last
+        node
+      end
+
       def xpath_from(calling_method)
         case calling_method.grep(/dsl/)[1][/`.*'/][1..-2]
         when 'threads'
-          '//ThreadGroup[last()]/following-sibling::hashTree'
+          '//ThreadGroup/following-sibling::hashTree'
         when 'transaction'
-          '//TransactionController[last()]/following-sibling::hashTree'
+          '//TransactionController/following-sibling::hashTree'
+        when 'once'
+          '//OnceOnlyController/following-sibling::hashTree'
+        when 'exists'
+          '//IfController/following-sibling::hashTree'
         when 'visit'
-          '//HTTPSamplerProxy[last()]/following-sibling::hashTree'
+          '//HTTPSamplerProxy/following-sibling::hashTree'
         when 'submit'
-          '//HTTPSamplerProxy[last()]/following-sibling::hashTree'
+          '//HTTPSamplerProxy/following-sibling::hashTree'
         when 'extract'
-          '//RegexExtractor[last()]/following-sibling::hashTree'
+          '//RegexExtractor/following-sibling::hashTree'
         when 'random_timer'
-          '//GaussianRandomTimer[last()]/following-sibling::hashTree'
+          '//GaussianRandomTimer/following-sibling::hashTree'
         else 
           '//TestPlan/following-sibling::hashTree'
         end

data/lib/gridinit-jmeter/http_sampler.rb

@@ -40,10 +40,15 @@ module Gridinit
       end
 
       def parse_url(url, params)
-        uri             = parse_uri(url)
-        params[:domain] = uri.host
-        params[:port]   = uri.port
-        params[:path]   = uri.path
+        if url[0] == '$'
+          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
+        end
       end
 
       def fill_in(params)
@@ -65,4 +70,4 @@ module Gridinit
     end  
 
   end
-end
+end

data/lib/gridinit-jmeter/if_controller.rb

@@ -0,0 +1,21 @@
+module Gridinit
+  module Jmeter
+
+    class IfController
+      attr_accessor :doc
+      def initialize(name, params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="#{name}" enabled="true">
+            <stringProp name="IfController.condition">/stringProp>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+        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/once_only.rb

@@ -0,0 +1,19 @@
+module Gridinit
+  module Jmeter
+
+    class OnceOnly
+      attr_accessor :doc
+      def initialize(name, params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="#{name}" enabled="true">
+          </OnceOnlyController>
+        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/request_defaults.rb

@@ -0,0 +1,30 @@
+module Gridinit
+  module Jmeter
+
+    class RequestDefaults
+      attr_accessor :doc
+      def initialize(params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.port"></stringProp>
+            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+            <stringProp name="HTTPSampler.response_timeout"></stringProp>
+            <stringProp name="HTTPSampler.protocol"></stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+            <stringProp name="HTTPSampler.path"></stringProp>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+        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/transaction.rb

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

data/lib/gridinit-jmeter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -73,6 +73,7 @@ files:
 - examples/basic_testplan.jmx
 - examples/basic_testplan.rb
 - examples/basic_think_time.rb
+- examples/etsy_login_browse.rb
 - gridinit-jmeter.gemspec
 - lib/gridinit-jmeter.rb
 - lib/gridinit-jmeter/auth_manager.rb
@@ -82,8 +83,11 @@ files:
 - lib/gridinit-jmeter/fallback_content_proxy.rb
 - lib/gridinit-jmeter/gaussian_random_timer.rb
 - lib/gridinit-jmeter/http_sampler.rb
+- lib/gridinit-jmeter/if_controller.rb
 - lib/gridinit-jmeter/logger-colors.rb
+- lib/gridinit-jmeter/once_only.rb
 - lib/gridinit-jmeter/regex_extractor.rb
+- lib/gridinit-jmeter/request_defaults.rb
 - lib/gridinit-jmeter/response_assertion.rb
 - lib/gridinit-jmeter/strip-heredoc.rb
 - lib/gridinit-jmeter/test_plan.rb