ruby-jmeter 2.1.5 → 2.1.6

data/CHANGES.md

@@ -0,0 +1,59 @@
+# Changes
+
+## v2.1.5
+
+- HTTP Request Defaults now have more intuitive key names:
+
+```ruby
+defaults domain: 'example.com', 
+      protocol: 'https',
+      download_resources: true,
+      use_concurrent_pool: 5,
+      urls_must_match: 'http.+?example.com'
+```
+
+- There's a new `with_gzip` header manager alias:
+
+```ruby
+test do
+  threads do
+    transaction name: "TC_02", parent: true, include_timers: true do
+      visit url: "/" do
+        with_gzip
+      end
+    end
+  end
+end
+```
+
+- There's a new `test_data` helper method to simplify getting test data from the flood.io shared data URL. Including ability to stub, set defaults, get all values or explicit values :
+
+```ruby
+test do
+  threads 1 do
+
+    # populate ${testdata} array with all results from shared data url
+    test_data 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text'
+
+    # populate named ${postcodes} array  with all results from shared data url
+    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
+              name: 'postcodes'
+
+    # populate named ${postcode} with random result from shared data url
+    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
+              name: 'postcode_random', match_num: 0
+
+
+    # populate named ${postcode} with exact match from shared data url
+    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
+              name: 'postcode_exact', regex: '^(\d+)', match_num: 1
+
+    # populate named ${postcode} with exact match from a stubbed data url
+    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
+              name: 'postcode_stub', regex: '^(\d+)', match_num: 1, default: '2010', stub: true
+
+    debug_sampler
+    view_results
+  end
+end.run(path: '/usr/share/jmeter/bin/', gui: true)
+```

data/examples/basic_testdata.rb

@@ -4,25 +4,55 @@ require 'ruby-jmeter'
 test do
   threads 1 do
 
-    # populate ${testdata} array with all results from shared data url
-    test_data 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text'
+    # populate ${testdata} array with *all* results from shared data url
+    # using default match number -1
+    test_data :postcodes
+
+    # testdata now populated with:
+    #testdata_1=NSW
+    #testdata_1_g=1
+    #testdata_1_g0="NSW"
+    #testdata_1_g1=NSW
+    #testdata_2=nsw-sydney-2000
+    #testdata_2_g=1
+    #testdata_2_g0="nsw-sydney-2000"
+    #testdata_2_g1=nsw-sydney-2000
+    #testdata_matchNr=2
+
+    # visit first column match
+    visit 'http://example.com/?${testdata_1}'
+
+    # visit second column match
+    visit 'http://example.com/?${testdata_2}'
 
     # populate named ${postcodes} array  with all results from shared data url
-    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
-              name: 'postcodes'
-
-    # populate named ${postcode} with random result from shared data url
-    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
-              name: 'postcode_random', match_num: 0
-
-
-    # populate named ${postcode} with exact match from shared data url
-    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
-              name: 'postcode_exact', regex: '^(\d+)', match_num: 1
-
-    # populate named ${postcode} with exact match from a stubbed data url
-    test_data url: 'http://54.252.206.143:8080/SRANDMEMBER/postcodes?type=text',
-              name: 'postcode_stub', regex: '^(\d+)', match_num: 1, default: '2010', stub: true
+    # using specific key, command and host
+    test_data key: 'postcodes',
+      command: 'SRANDMEMBER',
+      host: '54.252.206.143'
+
+    # populate named ${postcode_random} from shared data url
+    # using random result, match number 0 and override name
+    test_data :postcodes, 
+      name: 'postcode_random', 
+      match_num: 0
+
+
+    # populate named ${postcode} from shared data url
+    # using exact result, match number 1 and override name
+    test_data 'postcodes', 
+      name: 'postcode_exact', 
+      regex: '^(\d+)', 
+      match_num: 1
+
+    # populate named ${postcode} from a stubbed data url
+    # with stub = true and default value 2010
+    test_data 'postcodes', 
+      name: 'postcode_stub', 
+      regex: '^(\d+)', 
+      match_num: 1, 
+      default: '2010', 
+      stub: true
 
     debug_sampler
     view_results

data/lib/ruby-jmeter/dsl.rb

@@ -144,12 +144,23 @@ module RubyJmeter
 
     def test_data(*args, &block)
       params = args.shift || {}
-      params = { url: params }.merge(args.shift || {}) if params.class == String
+      params = { key: params.to_s }.merge(args.shift || {}) if(params.class == String || params.class == Symbol)
+      params[:command] ||= 'SRANDMEMBER'
       params[:name] ||= 'testdata'
       params[:regex] ||= '"(.+?)"'
       params[:match_num] ||= -1
       params[:default] ||= ''
+
+      params[:host] ||= '54.252.206.143'
+
+      params[:url] = params[:key] if URI.parse(URI::encode(params[:key])).scheme
+
+      params[:url] = if params[:host]
+        "http://#{params[:host]}:8080/#{params[:command]}/#{params[:key]}?type=text"
+      end
+
       params[:url] = 'http://54.252.206.143:8080/' if params[:stub]
+
       get name: '__testdata', url: params[:url] do
         extract name: params[:name], 
           regex: params[:regex], 

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -55,6 +55,7 @@ files:
 - .gitignore
 - .rspec
 - .ruby-version
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -254,7 +255,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: []