ruby-jmeter 2.1.1 → 2.1.2

data/lib/ruby-jmeter/helpers/jmeter.properties

@@ -25,4 +25,4 @@ jmeter.save.saveservice.idle_time=false
 jmeter.save.saveservice.timestamp_format=ms
 jmeter.save.saveservice.default_delimiter=|
 jmeter.save.saveservice.print_field_names=false
-sample_variables=testguid
+sample_variables=uuid

data/lib/ruby-jmeter/helpers/parser.rb

@@ -2,13 +2,13 @@ module RubyJmeter
   module Parser
 
     def parse_http_request(params)
-      parse_url(params) unless params[:url].empty?
-      
       if params[:raw_path]
         params[:path] = params[:url]
+        parse_url(params)
       else
+        parse_url(params)
         params[:fill_in] ||= {}
-        params[:params] && params[:params].split('&').each do |param| 
+        params[:params] && params[:params].split('&').each do |param|
           name,value = param.split('=')
           params[:fill_in][name] = value
         end
@@ -19,9 +19,10 @@ module RubyJmeter
     end
 
     def parse_url(params)
+      return if params[:url].empty?
       if params[:url] =~ /https?:\/\/\$/ || params[:url][0] == '$'
         params[:path] = params[:url] # special case for named expressions
-      else 
+      else
         uri = parse_uri(params[:url])
         params[:port]     ||= uri.port unless URI.parse(URI::encode(params[:url])).scheme.nil?
         params[:protocol] ||= uri.scheme unless URI.parse(URI::encode(params[:url])).scheme.nil?
@@ -33,9 +34,9 @@ module RubyJmeter
     end
 
     def parse_uri(uri)
-      URI.parse(URI::encode(uri)).scheme.nil? ? 
-        URI.parse(URI::encode("http://#{uri}")) : 
-        URI.parse(URI::encode(uri))   
+      URI.parse(URI::encode(uri)).scheme.nil? ?
+        URI.parse(URI::encode("http://#{uri}")) :
+        URI.parse(URI::encode(uri))
     end
 
     def fill_in(params)
@@ -68,7 +69,7 @@ module RubyJmeter
 
       params[:update_at_xpath] << {
         :xpath => '//collectionProp',
-        :value => Nokogiri::XML(<<-EOF.strip_heredoc).children  
+        :value => Nokogiri::XML(<<-EOF.strip_heredoc).children
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
             <stringProp name="Argument.value">#{params[:raw_body]}</stringProp>
@@ -101,6 +102,6 @@ module RubyJmeter
         2
       end
     end
-    
+
   end
 end

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/dsl_spec.rb

@@ -44,7 +44,7 @@ describe "DSL" do
 
     it 'should match on user_agent' do
       fragment.search(".//stringProp[@name='Header.name']").text.should == 'User-Agent'
-      fragment.search(".//stringProp[@name='Header.value']").text.should == 
+      fragment.search(".//stringProp[@name='Header.value']").text.should ==
         'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.46 Safari/536.5'
     end
   end
@@ -53,8 +53,8 @@ describe "DSL" do
   describe 'http request defaults' do
     let(:doc) do
       test do
-        defaults domain: 'example.com', 
-            protocol: 'https', 
+        defaults domain: 'example.com',
+            protocol: 'https',
             image_parser: true,
             implementation: 'HttpClient3.1',
             concurrentDwn: true,
@@ -271,6 +271,25 @@ describe "DSL" do
     end
   end
 
+  describe 'visit raw_path' do
+    let(:doc) do
+      test do
+        threads do
+          transaction name: "TC_02" do
+            post url: "/home?location=melbourne", raw_path: true
+          end
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+
+    it 'should match on path' do
+      fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home?location=melbourne'
+    end
+
+  end
+
 
   describe 'https' do
     let(:doc) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client