webpoke 0.0.42 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161ba91de528d2f2542eee96d84017fd0c471c8c
-  data.tar.gz: 2f7c4478471ca0a8139028b39e4b20ec6e08bbac
+  metadata.gz: e0c431ea215a727e9877d8f74240ccb0e90eb7bd
+  data.tar.gz: 245c37771d159e896332d10de48b4a0a9efec6af
 SHA512:
-  metadata.gz: 2e3343e51f36810098384ff4d3111bee4c60023b423eee16e21163e32de805e907d6b0602ccab3e78a1b3507d23e2009247fcbb7c1a99ccaa5ced72867067a2f
-  data.tar.gz: b880cbefad2c6f4bd5ec31a1de5ba67928aa017588030d2caa2b5dfa4b9d06c25447c9e438db7b8006b9bc547bda3337cde3364bdff0809f8fb8b5d10821b1b2
+  metadata.gz: 812bc22f223f176cbfc28cfdc7ae1d3ae257be7f87ed5bd0de9501be62b8f79a18ce1eabd71895662b36aece783b9dd474710db61494a479fe96054c70f59bed
+  data.tar.gz: ac2eb679c651ec5f86162c02f3126c61a1a1abf66b70f73064f78d8a3917a5443d3b22e8c53ce6207bb89c5f9dbedd487e58f703cc3e2402afc6c1fcc65f0271

data/bin/poke

@@ -46,7 +46,7 @@ optparser = OptionParser.new do |opts|
       puts "<#{format}> is not a recognized format, try [#{formats.join(', ')}]"
       exit
     end
-    
+    options[:format] = format;
   end
   
   if !ARGV[0]
@@ -71,11 +71,15 @@ elsif (File.file?(file))
   require File.expand_path(file)
 end
 
-if options[:doc]
-  options[:doc] << Webpoke.document(options[:group])
-  exit 0
-end
-
-Webpoke.run(options[:group])
+begin
+  if options[:doc]
+    options[:doc] << Webpoke.document(options[:group])
+    exit 0
+  end
 
-puts "\nTests: #{Webpoke.tested}, success: #{Webpoke.success}, errors: #{Webpoke.failed}";
+  Webpoke.run(options[:group])
+  puts Webpoke.results()
+rescue Interrupt => e
+  puts Webpoke.results()
+  exit!
+end

data/lib/Webpoke/Class.rb

@@ -2,7 +2,7 @@ class Class
   
   def mark_accessible (*args)
     args.each do |arg|
-      self.class_eval("def #{arg} (val=nil); if (val) then @#{arg} = val; else @#{arg}; end end")
+      self.class_eval("def #{arg} (val=nil); if (val != nil) then @#{arg} = val; else @#{arg}; end end")
       self.class_eval("def #{arg}=(val);@#{arg}=val;end") 
     end
   end

data/lib/Webpoke/Test.rb

@@ -3,16 +3,36 @@
 =end
 class Webpoke::Test
   
-  mark_accessible :description, :group, :url, :method, :success, :query, :should_fail, :headers, :data
+  mark_accessible :description, :group, :url, :method, :success, :query, :should_fail, :headers, :data, :body, :on_success, :dependant, :depends_on, :response, :parse
   
   def initialize(&block)
+    @parse = true
+    @on_success = [];
     instance_eval(&block);
     @group = @group || ''
     @method = @method || 'get'
     @headers = @headers || {}
+    @on_success = [];
+  end
+  
+  def should_parse?
+    return @parse
+  end
+  
+  def on (response, &block)
+    
+    if (response == 'success')
+      @on_success << block
+    else
+      @on_error << block
+    end
     
   end
   
+  def depends_on otherTest
+    otherTest.on_success << self
+    self.dependant = true;
+  end
   
   def default_success (code, body)
     if @should_fail
@@ -22,7 +42,6 @@ class Webpoke::Test
     end
   end
   
-  
   def success (&block)
     @success = block
   end
@@ -83,11 +102,20 @@ Returns the test description
   end
   
   
+  def dependant?
+    @dependant
+  end
+  
+  
 =begin rdoc
   Run the test
 =end
   def passed? (response, body)
     
+    @response = {
+      body: body,
+      code: response
+    }
     if !self.default_success(response, body)
       return false
     end
@@ -98,9 +126,7 @@ Returns the test description
         result = @success.call(response, body)
       rescue Exception => e
         result = false
-        Webpoke.log "\nError while executing success for test".red
-        Webpoke.log e
-        Webpoke.log e.backtrace.join "\n"
+        raise Webpoke::TestSuccessError.new(e.message, e)
       end
     else
       result = self.default_success(response, body)
@@ -113,4 +139,15 @@ Returns the test description
 end
 
 class Webpoke::TestError < StandardError
+  attr_accessor :object
+  def initialize(message=nil, object=nil)
+    super(message)
+    self.object = object
+  end
+end
+class Webpoke::TestSuccessError < Webpoke::TestError
+end
+class Webpoke::TestHTTPError < Webpoke::TestError
+end
+class Webpoke::TestParseError < Webpoke::TestError
 end

data/lib/Webpoke/version.rb

@@ -1,3 +1,3 @@
 module Webpoke
-  VERSION = "0.0.42"
+  VERSION = "0.0.45"
 end

data/lib/webpoke.rb

@@ -49,7 +49,9 @@ module Webpoke
   # Adds a test to the queue
   # @param block [Proc] the configuration for this test
   def test(&block)
-    $tests << Test.new(&block)
+    test = Test.new(&block)
+    $tests << test
+    return test
   end
   
     
@@ -79,6 +81,10 @@ module Webpoke
       end
     end
     
+    if test.body
+      args[:body] = test.body
+    end
+    
     args[:query] = test.query if test.query
     
     args
@@ -91,55 +97,90 @@ module Webpoke
     $config = Webpoke::Config.new(&block)
   end
 
+  def run_test(test)
+    
+    $tested +=1
+    fqu = if test.url.match(/^https?:\/\//i) then test.url; else $config.base+test.url; end
+    args = args_for_test(test)
+    
+    log "#{$tested}: #{test.description}".bold
+    log "#{test.method.upcase}: #{test.url}...", false
+    $config.beforeSend(test.method, fqu, args) if $config.beforeSend
+    
+    begin
+      r = HTTParty.send(test.method, fqu, args)
+    rescue Interrupt
+      puts Webpoke.results
+      exit!
+    rescue Exception => e
+      raise Webpoke::TestHTTPError.new(e.message, e)
+    end
+    
+    body = r.body
+    begin
+      if test.should_parse? && $config.parse[:output] && body.is_a?(String)
+        body = $config.parse[:output].call(r.body)
+      end
+    rescue Exception => e
+      raise Webpoke::TestParseError.new(e.message, body)
+    end
+    
+    
+    if test.passed?(r.code, body)
+      true
+    else
+      if $config.on_failure
+        log $config.on_failure.call(r.code, body)
+      end
+      false
+    end
+    
+  end
+  
+  def gauge_success(test)
+    begin
+      success = run_test test
+    rescue Webpoke::TestHTTPError => e
+      log 'FAIL:'.red
+      log e
+      $errors += 1;
+    rescue Webpoke::TestParseError => e
+      log "Parsing failure: ".red
+      log "\t#{e}"
+      log "Data:"
+      log "\t"+e.object
+      $errors += 1;
+    rescue Webpoke::TestSuccessError => e
+      log "\nError while executing success for test".red
+      log e
+      log e.backtrace.join "\n"
+    end
+    
+    if (success)
+      $successes +=1
+      log "OK!".green
+      test.on_success.each do |dependent|
+        dt = dependent.call()
+        gauge_success dt
+      end
+    else
+      $errors += 1
+      log "FAIL!".red
+    end
+    return success
+    
+  end
+  
   
   def run (group=nil)
     
     $tests.each do |test|
       next if group && test.group != group
-      $tested +=1
-      
-      fqu = if test.url.match(/^https?:\/\//i) then url; else $config.base+test.url; end
-      
-      args = args_for_test(test)
       
-      $config.beforeSend(test.method, fqu, args) if $config.beforeSend
+      next if test.dependant?
       
-      log "#{$tested}: #{test.description}".bold
-      log "#{test.method.upcase}: #{test.url}...", false
-      begin
-        r = HTTParty.send(test.method, fqu, args)
-      rescue Exception => e
-        log 'FAIL:'.red
-        log e
-        $errors += 1;
-        next;
-      end
-      
-      body = r.body
-      begin
-        if $config.parse[:output] && body.is_a?(String)
-          body = $config.parse[:output].call(r.body)
-        end
-      rescue Exception => e
-        log "Parsing failure: ".red
-        log "\t#{e}"
-        log "Data:"
-        log "\t"+r.body
-        $errors += 1;
-        next;
-      end
+      gauge_success(test)
       
-      
-      if test.passed?(r.code, body)
-        $successes +=1
-        log "OK!".green
-      else
-        log "FAIL!".red
-                
-        if $config.on_failure
-          log $config.on_failure.call(r.code, body)
-        end
-      end
     end
       
   end
@@ -170,6 +211,27 @@ module Webpoke
     
   end
   
+  
+  def Webpoke.results()
+    
+    if $config.format == 'stdout'
+      puts "\nTests: #{Webpoke.tested}, success: #{Webpoke.success}, errors: #{Webpoke.failed}";
+    else
+      puts JSON.pretty_generate({
+        tests: Webpoke.tested,
+        success: Webpoke.success,
+        errors: Webpoke.failed
+        })
+    end
+    
+    if (Webpoke.failed > 0)
+      exit 1;
+    else
+      exit 0;
+    end
+    
+  end
+  
   def Webpoke.success
     return $successes
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpoke
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.45
 platform: ruby
 authors:
 - Roberto Hidalgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty