resat 0.7.4 → 0.7.5

data/lib/api_request.rb

@@ -13,34 +13,36 @@ module Resat
     attr_reader :request, :response, :send_count, :failures
 
     # Prepare request so 'send' can be called
-    def prepare
+    def prepare(variables, config)
       @format ||= 'xml'
       @failures = []
       @send_count = 0
+      @config_delay = config.delay
+      @config_use_ssl = config.use_ssl
 
       # 1. Normalize call fields
       @headers ||= []
       @params ||= []
       # Clone config values so we don't mess with them when expanding variables
-      Config.headers.each do |h| 
+      config.headers.each do |h| 
         @headers << { 'name' => h['name'].dup, 'value' => h['value'].dup }
-      end if Config.headers
-      Config.params.each do |p|
+      end if config.headers
+      config.params.each do |p|
         @params << { 'name' => p['name'].dup, 'value' => p['value'].dup }
-      end if Config.params && request_class.REQUEST_HAS_BODY
-      Variables.substitute!(@params)
-      Variables.substitute!(@headers)
+      end if config.params && request_class.REQUEST_HAS_BODY
+      variables.substitute!(@params)
+      variables.substitute!(@headers)
 
       # 2. Build URI
-      Variables.substitute!(@id) if @id
-      uri_class = (@use_ssl || @use_ssl.nil? && Config.use_ssl) ? URI::HTTPS : URI::HTTP
-      port = @port || Config.port || uri_class::DEFAULT_PORT
-      Variables.substitute!(port)
-      host = @host || Config.host
-      Variables.substitute!(host)
+      variables.substitute!(@id) if @id
+      uri_class = (@use_ssl || @use_ssl.nil? && config.use_ssl) ? URI::HTTPS : URI::HTTP
+      port = @port || config.port || uri_class::DEFAULT_PORT
+      variables.substitute!(port)
+      host = @host || config.host
+      variables.substitute!(host)
       @uri = uri_class.build( :host => host, :port => port )
-      base_url = "/#{@base_url || Config.base_url}/".squeeze('/')
-      Variables.substitute!(base_url)
+      base_url = "/#{@base_url || config.base_url}/".squeeze('/')
+      variables.substitute!(base_url)
       path = @path
       unless path
         path = "#{base_url}#{@resource}"
@@ -48,7 +50,7 @@ module Resat
         path = "#{path}.#{@format}" if @format && !@format.empty? && !@custom
         path = "#{path}#{@custom.separator}#{@custom.name}" if @custom
       end
-      Variables.substitute!(path)
+      variables.substitute!(path)
       @uri.merge!(path)
 
       # 3. Build request
@@ -71,10 +73,10 @@ module Resat
         end
       end
       @request = request_class.new(@uri.to_s)
-      username = @username || Config.username
-      Variables.substitute!(username) if username
-      password = @password || Config.password
-      Variables.substitute!(password) if password
+      username = @username || config.username
+      variables.substitute!(username) if username
+      password = @password || config.password
+      variables.substitute!(password) if password
       if username && password 
         @request.basic_auth(username, password)
       end
@@ -93,7 +95,7 @@ module Resat
     def send
       sleep(delay_seconds) # Delay request if needed
       http = Net::HTTP.new(@uri.host, @uri.port)
-      http.use_ssl = Config.use_ssl
+      http.use_ssl = @config_use_ssl
       begin
         res = http.start { |http| @response = http.request(@request) }
       rescue Exception => e
@@ -134,7 +136,7 @@ module Resat
     # Calculate number of seconds to wait before sending request
     def delay_seconds
       seconds = nil
-      if delay = @delay || Config.delay
+      if delay = @delay || @config_delay
         min_delay = max_delay = nil
         if delay =~ /([\d]+)\.\.([\d]+)/
           min_delay = Regexp.last_match[1].to_i

data/lib/config.rb

@@ -43,8 +43,8 @@ module Resat
       'variables' => {}
     }
 
-    def Config.init(filename, schemasdir)
-      (Config.methods - (Object.methods + [ 'init', 'valid?', 'method_missing' ])).each { |m| class << Config;self;end.send :remove_method, m.to_sym }
+    def initialize(filename, schemasdir)
+      (self.methods - (Object.instance_methods + [ 'init', 'valid?', 'method_missing' ])).each { |m| self.class.send(:remove_method, m.to_sym) }
       schemafile = File.join(schemasdir || DEFAULT_SCHEMA_DIR, 'config.yaml')
       unless File.exists?(schemafile)
         Log.error("Missing configuration file schema '#{schemafile}'")
@@ -66,10 +66,8 @@ module Resat
           @config.merge!(config)
           # Dynamically define the methods to forward to the config hash
           @config.each_key do |meth|
-            (class << self; self; end).class_eval do
-              define_method meth do |*args|
-                @config[meth] || DEFAULTS[meth]
-              end
+            self.class.send(:define_method, meth) do |*args|
+              @config[meth] || DEFAULTS[meth]
             end
           end
         end
@@ -82,11 +80,11 @@ module Resat
       end
     end
 
-    def Config.valid?
+    def valid?
       @valid
     end
     
-    def self.method_missing(*args)
+    def method_missing(*args)
       nil
     end
 

data/lib/engine.rb

@@ -17,6 +17,8 @@ module Resat
     attr_accessor :skipped_count  # Total number of skipped YAML files
     attr_accessor :failures       # Hash of error messages (string arrays)
                                   # indexed by scenario filename
+    attr_accessor :variables      # Hash of variables hashes indexed by
+                                  # scenario filename
 
     def initialize(options)
       @options        = options
@@ -25,6 +27,7 @@ module Resat
       @ignored_count  = 0
       @requests_count = 0
       @skipped_count  = 0
+      @variables      = Hash.new
     end
     
     # Was test run successful?
@@ -55,7 +58,11 @@ module Resat
             runner.run
             @run_count += 1
             @requests_count += runner.requests_count
-            @failures[file] = runner.failures unless runner.failures.empty?
+            if runner.succeeded?
+              @variables[file] = runner.variables
+            else
+              @failures[file] = runner.failures
+            end
           else
             unless runner.valid?
               Log.info "Skipping '#{file}' (#{runner.parser_errors})"

data/lib/filter.rb

@@ -11,9 +11,10 @@ module Resat
     include Kwalify::Util::HashLike
     attr_accessor :failures
     
-    def prepare
+    def prepare(variables)
       @is_empty ||= false
       @failures = []
+      @variables = variables
       Log.info("Running filter '#{@name}'")
     end
 
@@ -55,7 +56,7 @@ module Resat
         if @request.has_response_field?(v.field, @target)
           field = @request.get_response_field(v.field, @target)
           if v.pattern
-            Variables.substitute!(v.pattern)
+            @variables.substitute!(v.pattern)
             unless Regexp.new(v.pattern).match(field)
               @failures << "Validator /#{v.pattern} failed on '#{field}' from #{@target} field '#{v.field}'."
             end
@@ -72,22 +73,22 @@ module Resat
     # Extract elements from response
     def extract
       @extractors.each do |ex|
-        Variables.substitute!(ex.field)
+        @variables.substitute!(ex.field)
         if @request.has_response_field?(ex.field, @target)
           field = @request.get_response_field(ex.field, @target)
           if ex.pattern
-            Variables.substitute!(ex.pattern)
+            @variables.substitute!(ex.pattern)
             Regexp.new(ex.pattern).match(field)
             if Regexp.last_match
-              Variables[ex.variable] = Regexp.last_match(1)
+              @variables[ex.variable] = Regexp.last_match(1)
             else
               Log.warn("Extraction from response #{@target} field '#{ex.field}' ('#{field}') with pattern '#{ex.pattern}' failed.")
             end
           else
-            Variables[ex.variable] = field
+            @variables[ex.variable] = field
           end
-          Variables.mark_for_save(ex.variable) if ex.save
-          Variables.export(ex.variable) if ex.export
+          @variables.mark_for_save(ex.variable) if ex.save
+          @variables.export(ex.variable) if ex.export
         else
           Log.warn("Extraction from response #{@target} field '#{ex.field}' failed: field not found.")
         end

data/lib/guard.rb

@@ -11,11 +11,11 @@ module Resat
     include Kwalify::Util::HashLike
     attr_accessor :failures
 
-    def prepare
+    def prepare(variables)
       @timeout ||= 120
       @period ||= 5
       @failures = []
-      Variables.substitute!(@pattern)
+      variables.substitute!(@pattern)
       Log.info("Waiting for guard #{@name} with pattern /#{@pattern.to_s}/")
     end
     
@@ -33,4 +33,4 @@ module Resat
   end
 
 end
- 
+ 

data/lib/resat.rb

@@ -3,7 +3,7 @@
 #
 
 module Resat
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end
 
 require File.join(File.dirname(__FILE__), 'engine')

data/lib/scenario_runner.rb

@@ -15,7 +15,7 @@ module Resat
 
   class ScenarioRunner
 
-    attr_accessor :requests_count, :parser_errors, :failures
+    attr_accessor :requests_count, :parser_errors, :failures, :variables
 
     # Instantiate new scenario runner with given YAML definition document and
     # schemas directory.
@@ -32,13 +32,13 @@ module Resat
       @dry_run        = dry_run
       parse(doc)
       if @valid
-        Config.init(config || @cfg_file, schemasdir)
-        @valid = Config.valid?
+        @config = Config.new(config || @cfg_file, schemasdir)
+        @valid = @config.valid?
         if @valid
-          Variables.reset
-          Variables.load(Config.input, schemasdir) if Config.input && File.readable?(Config.input)
-          Config.variables.each { |v| Variables[v['name']] = v['value'] } if Config.variables
-          variables.each { |k, v| Variables[k] = v } if variables
+          @variables = Variables.new
+          @variables.load(@config.input, schemasdir) if @config.input && File.readable?(@config.input)
+          @config.variables.each { |v| @variables[v['name']] = v['value'] } if @config.variables
+          variables.each { |k, v| @variables[k] = v } if variables
         end
       end
     end
@@ -53,8 +53,8 @@ module Resat
     def run
       return if @ignored || !@valid
       Log.info("-" * 80 + "\nRunning scenario #{@name}")
-      unless Variables.empty?
-        info_msg = Variables.all.inject("Using variables:") do |msg, (k, v)|
+      unless @variables.empty?
+        info_msg = @variables.all.inject("Using variables:") do |msg, (k, v)|
           msg << "\n   - #{k}: #{v}"
         end
         Log.info(info_msg)
@@ -67,13 +67,13 @@ module Resat
         when ApiRequest
           @requests_count += @request.send_count if @request # Last request
           @request = step
-          @request.prepare
+          @request.prepare(@variables, @config)
           @request.send unless @dry_run
         when Guard
-          step.prepare
+          step.prepare(@variables)
           step.wait(@request) unless @dry_run
         when Filter, Handler
-          step.prepare
+          step.prepare(@variables)
           step.run(@request) unless @dry_run 
         end
         puts step.inspect if step.failures.nil?
@@ -82,7 +82,7 @@ module Resat
       end
 
       @requests_count += @request.send_count
-      Variables.save(Config.output) if Config.output
+      @variables.save(@config.output) if @config.output
     end
 
     protected

data/lib/variables.rb

@@ -8,14 +8,16 @@ require 'singleton'
 module Resat
 
   class Variables
-    include Singleton
 
     attr_reader :vars, :marked_for_save, :exported
 
-    # Replace occurrences of environment variables in +raw+ with their value
-    def Variables.substitute!(raw)
-      instance().substitute!(raw)
+    # Initialize instance
+    def initialize
+      @@exported = Hash.new unless defined? @@exported
+      @vars = @@exported.dup
     end
+
+    # Replace occurrences of environment variables in +raw+ with their value
     def substitute!(raw)
       if raw.kind_of?(String)
         scans = Array.new
@@ -32,27 +34,28 @@ module Resat
       end
     end
     
-    def Variables.[](key)
-      instance().vars[key]
+    def [](key)
+      vars[key]
     end
 
-    def Variables.[]=(key, value)
-      instance().vars[key] = value
+    def []=(key, value)
+      vars[key] = value
     end
 
-    def Variables.include?(key)
-      instance().vars.include?(key)
+    def include?(key)
+      vars.include?(key)
     end
     
-    def Variables.empty?
-      instance().vars.empty?
+    def empty?
+      vars.empty?
     end
     
-    def Variables.all
-      instance().vars.sort
+    def all
+      vars.sort
     end
 
-    def Variables.load(file, schemasdir)
+    # Load variables from given file
+    def load(file, schemasdir)
       schemafile = File.join(schemasdir, 'variables.yaml')
       schema = Kwalify::Yaml.load_file(schemafile)
       validator = Kwalify::Validator.new(schema)
@@ -60,18 +63,17 @@ module Resat
       serialized_vars = parser.parse_file(file)
       parser.errors.push(Kwalify::ValidationError.new("No variables defined")) unless serialized_vars
       if parser.errors.empty?
-        vars = instance().vars
         serialized_vars.each { |v| vars[v['name']] = v['value'] }
       else
         Log.warn("Error loading variables from '#{file}': #{KwalifyHelper.parser_error(parser)}")
       end
     end
     
-    def Variables.save(file)
+    # Save variables to given file
+    def save(file)
       serialized_vars = []
-      i = instance()
-      i.vars.each do |k, v|
-        if i.marked_for_save.include?(k)
+      vars.each do |k, v|
+        if marked_for_save.include?(k)
           serialized_vars << { 'name' => k, 'value' => v }
         end
       end
@@ -80,37 +82,15 @@ module Resat
       end
     end
     
-    def Variables.mark_for_save(key)
-      instance().mark_for_save(key)
-    end
     def mark_for_save(key)
       @marked_for_save << key
     end      
     
-    # Exported values will be kept even after a call to reset
-    def Variables.export(key)
-      instance().export(key)
-    end
+    # Exported values will be kept even after new instance is initialized
     def export(key)
-      @exported[key] = @vars[key]
+      @@exported[key] = @vars[key]
     end      
     
-    def Variables.reset
-      instance().reset
-    end
-    def reset
-      @vars = @exported.clone
-      @marked_for_save = Array.new
-    end
-
-    protected
-
-    def initialize
-      @exported = Hash.new
-      reset
-      super
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resat
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Raphael Simon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 -07:00
+date: 2010-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency