Making the changes necessary to get the REST support

to work with the current state of the indirection work,
including using a request object and an expiration date.

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb
index 34596cad4..26f7736f3 100644
--- a/lib/puppet/indirector/rest.rb
+++ b/lib/puppet/indirector/rest.rb
@@ -20,26 +20,26 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
         network {|conn| conn.put("/#{path}", data).body }
     end
     
-    def find(name, options = {})
-        network_result = network_fetch("#{indirection.name}/#{name}")
+    def find(request)
+        network_result = network_fetch("#{indirection.name}/#{request.key}")
         raise YAML.load(network_result) if exception?(network_result)
         indirection.model.from_yaml(network_result)
     end
     
-    def search(name, options = {})
-        network_results = network_fetch("#{indirection.name}s/#{name}")
+    def search(request)
+        network_results = network_fetch("#{indirection.name}s/#{request.key}")
         raise YAML.load(network_results) if exception?(network_results)
         YAML.load(network_results.to_s).collect {|result| indirection.model.from_yaml(result) }
     end
     
-    def destroy(name, options = {})
-        network_result = network_delete("#{indirection.name}/#{name}")
+    def destroy(request)
+        network_result = network_delete("#{indirection.name}/#{request.key}")
         raise YAML.load(network_result) if exception?(network_result)
         YAML.load(network_result.to_s)      
     end
     
-    def save(obj, options = {})
-        network_result = network_put("#{indirection.name}/", obj.to_yaml)
+    def save(request)
+        network_result = network_put("#{indirection.name}/", request.instance.to_yaml)
         raise YAML.load(network_result) if exception?(network_result)
         indirection.model.from_yaml(network_result)
     end