mu 5.7.20 → 5.7.21

data/lib/mu/har.rb

@@ -103,15 +103,25 @@ class Har
                 # Build the hosts list
                 host                 = nil
                 m                    = entry["musl"] = {}
-                m["url_object"]      = URI.parse entry["request"]["url"]
                 m["url"]             = {}
+                # Put this rescue in place for when a url doesn't parse correctly, which is a fairly rare corner case
+                # Example: http://online.wsj.com/api-video/get_video_info.asp?guid={65EDE7D2-9261-4C47-BB01-DB841CBA209A}&fields=all&dojo.preventCache=1304591152604
+                # The example fails because of the {} so in this rare case I escape the url to pull out the relevant parts and then restore it
+                begin
+                    m["url_object"]      = URI.parse entry["request"]["url"]
+                    m["url"]["search"]   = m["url_object"].query    || ''
+                    # The m["url_object"].query doesn't return the leading ? for a search string so we have to add it
+                    m["url"]["search"]   = "?" + m["url"]["search"] unless m["url"]["search"] == ''
+                    m["url"]["hash"]     = m["url_object"].fragment || ''
+                rescue => e
+                    m["url_object"]      = URI.parse URI.escape entry["request"]["url"]
+                    m["url"]["search"]   = URI.unescape m["url_object"].query    || ''
+                    m["url"]["search"]   = "?" + m["url"]["search"] unless m["url"]["search"] == ''
+                    m["url"]["hash"]     = URI.unescape m["url_object"].fragment || ''
+                end
                 m['url']['port']     = m["url_object"].port || (m["url_object"].scheme === 'http' ? 80 : 443)
                 m['url']['pathname'] = m['url_object'].path || '/'
-                m["url"]["search"]   = m["url_object"].query    || ''
-                m["url"]["hash"]     = m["url_object"].fragment || ''
-                require 'pp'
-                #pp entry if entry['request']['headers'].length < 1
-                #raise "die" if entry['request']['headers'].length < 1
+                
 
                 # Create the host entry hash with underscores instead of dots for the host value
                 entry['request']['headers'].each do |header|
@@ -149,7 +159,7 @@ class Har
             end
         rescue Exception => e
             puts e.message
-            puts e.backtrace.inspect
+            puts e.backtrace
             raise e
         end
 
@@ -275,7 +285,6 @@ class Har
             # Create the xport options in the scenario
             if(@options.skip_ssl_passthru)
                 xklass = 'tcp' if xklass == 'ssl' 
-                xopts['dst_port'] = 80 if xopts['dst_port'] === 443
             end
             steps.xport("xport#{entry_count}", xklass, xopts)
 

data/version.rb

@@ -1 +1 @@
-VERSION='5.7.20'
+VERSION='5.7.21'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mu
 version: !ruby/object:Gem::Version
-  version: 5.7.20
+  version: 5.7.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-04 00:00:00.000000000 -07:00
+date: 2011-05-05 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18904220 !ruby/object:Gem::Requirement
+  requirement: &16410060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *18904220
+  version_requirements: *16410060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &18903720 !ruby/object:Gem::Requirement
+  requirement: &16409500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *18903720
+  version_requirements: *16409500
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &18903180 !ruby/object:Gem::Requirement
+  requirement: &16408820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *18903180
+  version_requirements: *16408820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18902800 !ruby/object:Gem::Requirement
+  requirement: &16408320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18902800
+  version_requirements: *16408320
 - !ruby/object:Gem::Dependency
   name: hexy
-  requirement: &18902120 !ruby/object:Gem::Requirement
+  requirement: &16407580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *18902120
+  version_requirements: *16407580
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &18901600 !ruby/object:Gem::Requirement
+  requirement: &16406880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *18901600
+  version_requirements: *16406880
 description: ! "The Mu gem allows users to include mu libraries within scripts\n    that
   interact with mu appliance software. The gem also supplies command line interfaces\n
   \   to many of these same libraries"