testbeat 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cef2aff2396b4839c9bd7af2bd8c99d1abf7df
-  data.tar.gz: c1de2a32d44fd2875ae8f472c5b6c5171ce61d0b
+  metadata.gz: 2eb20bbc27f50020099e39126ebfd97296c48686
+  data.tar.gz: 2f8ec9d8fc06e4a78f335183c984fd828144ac02
 SHA512:
-  metadata.gz: 44c1420a77283d2229cf547ed5d02cf3a28710e462b065ffbdbf2671caca746f4781bf65ddbd16b1441e3575c69579c7cdf3051c66139b617b566869ffa8155a
-  data.tar.gz: baa1fcd721c9febf81c6c989008b2462f63abcb6cae43d9b4ed473edfdc244979ff34f4108d45fe8726e06ed4998f7b42c0b9ad8c298664b002b0881ab2849e4
+  metadata.gz: 681e471d5c646060e4226b64976240c4c317435acf47cf76e24f29db5e4bc40888e444a16f275be31978980964a00ccfdb2bc71f791bb3f159be398c9c5230a4
+  data.tar.gz: a0ee67a020553b8b7821b646c4e8319351b51190c7c6cc271bdea09522da02f81cd2cad82040560e0ddbec046f3c0753de97d3e560cb7260805e1ebf09862e76

data/lib/rspec/spec_helper.rb

@@ -14,6 +14,26 @@ require "logger"
 # global so we don't need to pass this around to utility classes
 $logger = Logger.new('testbeat-debug.log')
 
+HTTP_VERBS = {
+  'COPY'      => Net::HTTP::Copy,
+  'DELETE'    => Net::HTTP::Delete,
+  'GET'       => Net::HTTP::Get,
+  'HEAD'      => Net::HTTP::Head,
+  'LOCK'      => Net::HTTP::Lock,
+  'MKCOL'     => Net::HTTP::Mkcol,
+  'MOVE'      => Net::HTTP::Move,
+  'OPTIONS'   => Net::HTTP::Options,
+  'PATCH'     => Net::HTTP::Patch,
+  'POST'      => Net::HTTP::Post,
+  'PROPFIND'  => Net::HTTP::Propfind,
+  'PROPPATCH' => Net::HTTP::Proppatch,
+  'PUT'       => Net::HTTP::Put,
+  'TRACE'     => Net::HTTP::Trace,
+  'UNLOCK'    => Net::HTTP::Unlock
+}
+
+HTTP_VERB_RESOURCE = /^(COPY|DELETE|GET|HEAD|LOCK|MKCOL|MOVE|OPTIONS|PATCH|POST|PROPFIND|PROPPATCH|PUT|TRACE|UNLOCK)\s+(\S+)/
+
 class TestbeatNode
 
   def initialize(nodename)
@@ -329,6 +349,7 @@ class TestbeatContext
 
   def parse_description_args(example_group_description_args)
     a = example_group_description_args[0]
+
     /unencrypted/i.match(a) {
       @unencrypted = true
     }
@@ -336,16 +357,17 @@ class TestbeatContext
     /unauthenticated/i.match(a) {
       @unauthenticated = true
     }
-    # We could iterate methods in Net::HTTP and support all
-    # Change method to rest_method for consistency
-    /(GET|HEAD|POST)\s+(\S*)(.*)/.match(a) { |rest|
+
+    HTTP_VERB_RESOURCE.match(a) { |rest|
       @rest = true
       @method = rest[1]
       @resource = rest[2]
     }
+
     /reprovision/i.match(a) {
       @reprovision = true
     }
+
     # idea: nodes that should not be modified (production etc), particularily not through shell
     #/untouchable/
   end
@@ -381,19 +403,26 @@ class TestbeatRestRequest
       :read_timeout => @timeout
       ) do |http|
 
-      req = Net::HTTP::Get.new(@testbeat.resource)
-      if @testbeat.method == 'POST'
-        req = Net::HTTP::Post.new(@testbeat.resource)
-        if @testbeat.form?
-          req.set_form_data(@testbeat.form)
-        end
-        if @testbeat.body?
-          req.body = @testbeat.body
-        end
+      if not HTTP_VERBS.has_key?(@testbeat.method)
+        raise "Testbeat can't find HTTP verb #{@testbeat.method}"
       end
+
+      req = HTTP_VERBS[@testbeat.method].new(@testbeat.resource)
       if @testbeat.headers?
         @testbeat.headers.each {|name, value| req[name] = value }
       end
+      if @testbeat.form?
+        if not req.methods.include? :set_form_data
+          raise "Testbeat can't set form data for HTTP verb #{@testbeat.method}"
+        end
+        req.set_form_data(@testbeat.form)
+      end
+      if @testbeat.body?
+        if not req.request_body_permitted?
+          raise "Testbeat can't set body for HTTP verb #{@testbeat.method}"
+        end
+        req.body = @testbeat.body
+      end
 
       @response = http.request(req) # Net::HTTPResponse object
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testbeat
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Staffan Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec