[core] update parser to better handle whitespace

Author: geemus

benchs/parse_vs_push.rb

@@ -16,6 +16,7 @@ def reset
   end
 
   def characters(string)
+    @value ||= ''
     @value << string.strip
   end
 
@@ -29,10 +30,14 @@ def end_element(name)
       @response[:items] << @item
       @item = {}
     when 'key'
-      @item[:key] = @value
+      @item[:key] = value
     end
   end
 
+  def value
+    @value.dup
+  end
+
 end
 
 data = <<-DATA
@@ -43,18 +48,22 @@ def end_element(name)
 </items>
 DATA
 
-COUNT = 100
+COUNT = 10_000
 
 Benchmark.bmbm(25) do |bench|
   bench.report('parse') do
-    parser = Parser.new
-    Nokogiri::XML::SAX::Parser.new(parser).parse(data)
-    parser.response
+    COUNT.times do
+      parser = Parser.new
+      Nokogiri::XML::SAX::Parser.new(parser).parse(data)
+      parser.response
+    end
   end
 
   bench.report('push') do
-    parser = Parser.new
-    Nokogiri::XML::SAX::PushParser.new(parser).write(data, true)
-    parser.response
+    COUNT.times do
+      parser = Parser.new
+      Nokogiri::XML::SAX::PushParser.new(parser).write(data, true)
+      parser.response
+    end
   end
 end

lib/fog/aws/parsers/cloud_formation/create_stack.rb

@@ -8,7 +8,7 @@ class CreateStack < Fog::Parsers::Base
           def end_element(name)
             case name
             when 'RequestId', 'StackId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb

@@ -13,14 +13,14 @@ def reset
           def end_element(name)
             case name
             when 'EventId', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceProperties', 'ResourceStatus', 'ResourceStatusReason', 'ResourceType', 'StackId', 'StackName'
-              @event[name] = @value
+              @event[name] = value
             when 'member'
               @response['StackEvents'] << @event
               @event = {}
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'Timestamp'
-              @event[name] = Time.parse(@value)
+              @event[name] = Time.parse(value)
             end
           end
 

lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb

@@ -13,14 +13,14 @@ def reset
           def end_element(name)
             case name
             when 'StackId', 'StackName', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceType', 'ResourceStatus'
-              @resource[name] = @value
+              @resource[name] = value
             when 'member'
               @response['StackResources'] << @resource
               @resource = {}
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'Timestamp'
-              @resource[name] = Time.parse(@value)
+              @resource[name] = Time.parse(value)
             end
           end
 

lib/fog/aws/parsers/cloud_formation/describe_stacks.rb

@@ -26,7 +26,7 @@ def end_element(name)
             if @in_outputs
               case name
               when 'OutputKey', 'OutputValue'
-                @output[name] = @value
+                @output[name] = value
               when 'member'
                 @stack['Outputs'] << @output
                 @output = {}
@@ -36,7 +36,7 @@ def end_element(name)
             elsif @in_parameters
               case name
               when 'ParameterKey', 'ParameterValue'
-                @parameter[name] = @value
+                @parameter[name] = value
               when 'member'
                 @stack['Parameters'] << @parameter
                 @parameter = {}
@@ -49,18 +49,18 @@ def end_element(name)
                 @response['Stacks'] << @stack
                 @stack = { 'Outputs' => [], 'Parameters' => [] }
               when 'RequestId'
-                @response[name] = @value
+                @response[name] = value
               when 'CreationTime'
-                @stack[name] = Time.parse(@value)
+                @stack[name] = Time.parse(value)
               when 'DisableRollback'
-                case @value
+                case value
                 when 'false'
                   @stack[name] = false
                 when 'true'
                   @stack[name] = true
                 end
               when 'StackName', 'StackId', 'StackStatus'
-                @stack[name] = @value
+                @stack[name] = value
               end
             end
           end

lib/fog/aws/parsers/cloud_formation/get_template.rb

@@ -8,7 +8,7 @@ class GetTemplate < Fog::Parsers::Base
           def end_element(name)
             case name
             when 'RequestId', 'TemplateBody'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

lib/fog/aws/parsers/cloud_formation/validate_template.rb

@@ -21,20 +21,20 @@ def start_element(name, attrs = [])
           def end_element(name)
             case name
             when 'DefaultValue', 'ParameterKey'
-              @parameter[name] = @value
+              @parameter[name] = value
             when 'Description'
               if @in_parameters
-                @parameter[name] = @value
+                @parameter[name] = value
               else
-                @response[name] = @value
+                @response[name] = value
               end
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'member'
               @response['Parameters'] << @parameter
               @parameter = {}
             when 'NoEcho'
-              case @value
+              case value
               when 'false'
                 @parameter[name] = false
               when 'true'

lib/fog/aws/parsers/elb/configure_health_check.rb

@@ -17,15 +17,15 @@ def start_element(name, attrs = [])
           def end_element(name)
             case name
             when 'Target'
-              @health_check[name] = @value
+              @health_check[name] = value
             when 'Interval', 'Timeout', 'UnhealthyThreshold', 'HealthyThreshold'
-              @health_check[name] = @value.to_i
+              @health_check[name] = value.to_i
 
             when 'HealthCheck'
               @response['ConfigureHealthCheckResult'][name] = @health_check
 
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/create_load_balancer.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'DNSName'
-              @response['CreateLoadBalancerResult'][name] = @value
+              @response['CreateLoadBalancerResult'][name] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/delete_load_balancer.rb

@@ -12,7 +12,7 @@ def reset
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'InstanceId'
-              @response['DeregisterInstancesFromLoadBalancerResult']['Instances'] << {name => @value}
+              @response['DeregisterInstancesFromLoadBalancerResult']['Instances'] << {name => value}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/describe_instance_health.rb

@@ -13,12 +13,12 @@ def reset
           def end_element(name)
             case name
             when 'Description', 'State', 'InstanceId', 'ReasonCode'
-              @instance_state[name] = @value
+              @instance_state[name] = value
             when 'member'
               @response['DescribeInstanceHealthResult']['InstanceStates'] << @instance_state
               @instance_state = {}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/describe_load_balancers.rb

@@ -49,9 +49,9 @@ def end_element(name)
             case name
             when 'member'
               if @in_policy_names
-                @listener_description['PolicyNames'] << @value
+                @listener_description['PolicyNames'] << value
               elsif @in_availability_zones
-                @load_balancer['AvailabilityZones'] << @value
+                @load_balancer['AvailabilityZones'] << value
               elsif @in_listeners
                 @load_balancer['ListenerDescriptions'] << @listener_description
                 reset_listener_description
@@ -67,23 +67,23 @@ def end_element(name)
               end
 
             when 'LoadBalancerName', 'DNSName'
-              @load_balancer[name] = @value
+              @load_balancer[name] = value
             when 'CreatedTime'
-              @load_balancer[name] = Time.parse(@value)
+              @load_balancer[name] = Time.parse(value)
 
             when 'ListenerDescriptions'
               @in_listeners = false
             when 'PolicyNames'
               @in_policy_names = false
             when 'Protocol'
-              @listener_description['Listener'][name] = @value
+              @listener_description['Listener'][name] = value
             when 'LoadBalancerPort', 'InstancePort'
-              @listener_description['Listener'][name] = @value.to_i
+              @listener_description['Listener'][name] = value.to_i
 
             when 'Instances'
               @in_instances = false
             when 'InstanceId'
-              @load_balancer['Instances'] << @value
+              @load_balancer['Instances'] << value
 
             when 'AvailabilityZones'
               @in_availability_zones = false
@@ -96,17 +96,17 @@ def end_element(name)
               @in_lb_cookies = false
 
             when 'Interval', 'HealthyThreshold', 'Timeout', 'UnhealthyThreshold'
-              @load_balancer['HealthCheck'][name] = @value.to_i
+              @load_balancer['HealthCheck'][name] = value.to_i
             when 'Target'
-              @load_balancer['HealthCheck'][name] = @value
+              @load_balancer['HealthCheck'][name] = value
 
             when 'PolicyName', 'CookieName'
-              @policy[name] = @value
+              @policy[name] = value
             when 'CookieExpirationPeriod'
-              @policy[name] = @value.to_i
+              @policy[name] = value.to_i
 
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
 
             when 'DescribeLoadBalancersResponse'
               @response['DescribeLoadBalancersResult'] = @results

lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'member'
-              @response['DisableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+              @response['DisableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/empty.rb

@@ -16,7 +16,7 @@ def start_element(name, attrs = [])
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'member'
-              @response['EnableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+              @response['EnableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'InstanceId'
-              @response['RegisterInstancesWithLoadBalancerResult']['Instances'] << {name => @value}
+              @response['RegisterInstancesWithLoadBalancerResult']['Instances'] << {name => value}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 

lib/fog/aws/parsers/iam/basic.rb

@@ -8,7 +8,7 @@ class Basic < Fog::Parsers::Base
           def end_element(name)
             case name
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

lib/fog/aws/parsers/iam/create_access_key.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'AccessKeyId', 'UserName', 'SecretAccessKey', 'Status'
-              @response['AccessKey'][name] = @value
+              @response['AccessKey'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

lib/fog/aws/parsers/iam/create_group.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'Arn', 'GroupId', 'GroupName', 'Path'
-              @response['Group'][name] = @value
+              @response['Group'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

lib/fog/aws/parsers/iam/create_user.rb

@@ -12,9 +12,9 @@ def reset
           def end_element(name)
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
-              @response['User'][name] = @value
+              @response['User'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end