konzertmeister 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca90c17f6172668f11d6e88749f3158b3e1c0c0
-  data.tar.gz: a2bd917e517aa8130a9055492971d70b2db0223d
+  metadata.gz: 80f284a429c65e6524596988621f155921b1cfdc
+  data.tar.gz: c125717ec9317e7e815cb8e05eb870fdcbf87d3e
 SHA512:
-  metadata.gz: 2b515e2aa966570da9b431e8e248acba0a692c21db85b03c27f6ff8e202d8e3abaf4430cdfd50eb1c11b992793eb9245716393e0e9b9bb493ba6a2c8ea1caddd
-  data.tar.gz: 214d56fcb28d139094e903f13f6bb7157503a4e2dc732eb0a18577e52836a6c843fcaae88ee17921f46961cc03a6df7edd4b108fd2e6cd1cba1af97579e5d7ed
+  metadata.gz: 69aee1f995896b1867791b5fca8128ca5e08456e8355eceef03d62df761ba19c1f54c972238b17855cc82287242686b93a2859a3857be0a911c9ddaed807896e
+  data.tar.gz: cdc573a551cc98e9de427df1dde31a1f52a12e9f333d73752bf89f1d8633971fd8a3b495afb614576da561d69eb43ac085de7fb3be60d6265003a45d2f571a84

data/lib/konzertmeister/backend.rb

@@ -78,6 +78,10 @@ class Konzertmeister
       end
     end
 
+    def destroy
+      Konzertmeister.session.delete("/backends/id/#{self.id}")
+    end
+
     def hosts
       @hosts ||= if @data.key?('hosts')
           @data.fetch('hosts').map do |host_hash|

data/lib/konzertmeister/customer.rb

@@ -45,6 +45,10 @@ class Konzertmeister
       end
     end
 
+    def destroy
+      Konzertmeister.session.delete("/customers/id/#{self.id}")
+    end
+
     def backends
       @backends ||= if @data.key?('backends')
           @data.fetch('backends').map do |be_hash|

data/lib/konzertmeister/session.rb

@@ -16,53 +16,28 @@ class Konzertmeister
     end
 
     def get(path, headers = {}, &block)
-      url = _url(path)
-      params = _request_params(
-        :method => :get,
-        :url => url,
-        :headers => headers,
-        :timeout => nil
-      )
-      begin
-        json = RestClient::Request.execute(params, &block)
-        JSON.parse(json)
-      rescue => e
-        puts "ERROR"
-        p e
-        false
-      end
+      execute_http(:get, path, {}, headers, &block)
     end
 
-    def post(path, params, headers = {}, &block)
-      json = JSON.generate(params)
-      url = _url(path)
-      request_params = _request_params({
-        :method => :post,
-        :url => url,
-        :payload => json,
-        :headers => headers,
-        :timeout => nil
-      })
-      begin
-        response = RestClient::Request.execute(request_params, &block)
-        if response.empty?
-          {}
-        else
-          JSON.parse(response)
-        end
-      rescue RestClient::Exception => e
-        puts
-        puts "ERROR making request to #{path}:"
-        p e
-        false
-      end
+    def post(path, params = {}, headers = {}, &block)
+      execute_http(:post, path, params, headers, &block)
+    end
+
+    def put(path, params = {}, headers = {}, &block)
+      execute_http(:put, path, params, headers, &block)
     end
 
-    def put(path, params, headers = {}, &block)
-      json = JSON.generate(params)
-      url = _url(path)
-      request_params = _request_params({
-        :method => :put,
+    def delete(path, params = {}, headers = {}, &block)
+      execute_http(:delete, path, params, headers, &block)
+    end
+
+    private
+
+    def execute_http(method, path, params, headers, &block)
+      json = params.empty? ? nil : JSON.generate(params)
+      url = url_for(path)
+      request_params = request_params({
+        :method => method,
         :url => url,
         :payload => json,
         :headers => headers,
@@ -83,15 +58,16 @@ class Konzertmeister
       end
     end
 
-    def _request_params(extra = {})
+    def request_params(extra = {})
       base = {}
       base[:ssl_client_cert] = @ssl_client_cert if @ssl_client_cert
       base[:ssl_client_key] = @ssl_client_key if @ssl_client_key
+      base.delete(:payload) if [:get, :head].include?(base[:method])
 
       base.merge(extra)
     end
 
-    def _url(path = nil)
+    def url_for(path = nil)
       scheme = (@port == 443 ? "https" : "http")
       [
         "#{scheme}://#{@hostname}:#{@port}",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: konzertmeister
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - TempoIQ Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client