diff options
| author | Rick Bradley <rick@rickbradley.com> | 2008-04-02 00:06:30 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-11 13:10:38 -0500 |
| commit | e8caf135a4a378d54bf62f8c37064ee3ccc508e9 (patch) | |
| tree | 646b08dea97254cbd657293ecfba1b9a2f95e842 /lib/puppet | |
| parent | b75048202219f2e07a211df3400a0ee88ccfd208 (diff) | |
| download | puppet-e8caf135a4a378d54bf62f8c37064ee3ccc508e9.tar.gz puppet-e8caf135a4a378d54bf62f8c37064ee3ccc508e9.tar.xz puppet-e8caf135a4a378d54bf62f8c37064ee3ccc508e9.zip | |
making search work over REST, w/ unit & integration specs
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/rest.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb index 690c79632..0c86b2706 100644 --- a/lib/puppet/indirector/rest.rb +++ b/lib/puppet/indirector/rest.rb @@ -17,8 +17,6 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus def search(key, options = {}) network_results = network_fetch("#{indirection.name}s/#{key}") raise YAML.load(network_results) if network_results =~ %r{--- !ruby/exception} - decoded_results = network_results.collect do |result| - indirection.model.from_yaml(result) - end + decoded_results = YAML.load(network_results.to_s).collect {|result| indirection.model.from_yaml(result) } end end diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index f226ae133..9e6c28512 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -32,7 +32,7 @@ module Puppet::Network::HTTP::Handler def do_search(request, response) args = params(request) - result = model.search(args).collect {|obj| obj.to_yaml } + result = model.search(args).collect {|result| result.to_yaml }.to_yaml encode_result(request, response, result) end |