yamlrpc 0.1.080630154212 → 0.1.080701110311

data/lib/yamlrpc/client.rb

@@ -13,15 +13,17 @@ module YamlRpc
   
   class Client
     
+    DEFAULT_FORM_DATA_ROOT = :yaml_rpc
+    
     attr_accessor :url
     attr_accessor :form_data_root
     
     # * <tt>url</tt> Root url, ie. "http://my.com/something/"; YamlRpc#some_method(:foo => 'bar') will POST to http://my.com/something/some_method with { :foo => 'bar' } params
     # * <tt>options</tt>
-    #   * <tt>:form_data_root</tt> Default to nil; if you want all params to have single root, ie. 'yaml', set :form_data_root => :yaml
+    #   * <tt>:form_data_root</tt> Default to :yamlrpc, meaning all params are passed inside :yamlrpc form field
     def initialize(url, options = {})
       @url = url
-      @form_data_root = options[:form_data_root]
+      @form_data_root = options.has_key?(:form_data_root) ? options[:form_data_root] : DEFAULT_FORM_DATA_ROOT
     end
     
     # * <tt>method</tt> Method name

data/lib/yamlrpc/helpers.rb

@@ -13,6 +13,7 @@ module YamlRpc
     def decode(params, fields = nil)
       r = {}
       fields = params.keys unless fields
+      fields = fields.is_a?(Array) ? fields : [ fields ]
       fields.each { |k| r[k] = YAML::load(params[k] || "--- \n" ) }
       r
     end
@@ -26,8 +27,10 @@ module YamlRpc
     # * <tt>params</tt> Hash
     # * <tt>fields</tt> Optional, single field name or array of field names, ie. [:foo, :bar]
     def decode_to_ary(params, fields)
+      r = nil
       fields = fields.is_a?(Array) ? fields : [ fields ]
-      fields.map { |k| YAML::load(params[k] || "--- \n") }
+      r = fields.map { |k| YAML::load(params[k] || "--- \n") }
+      r.size > 1 ? r : r.first
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yamlrpc
 version: !ruby/object:Gem::Version 
-  version: 0.1.080630154212
+  version: 0.1.080701110311
 platform: ruby
 authors: 
 - Mirek Rusin
@@ -9,7 +9,7 @@ autorequire: yamlrpc
 bindir: bin
 cert_chain: []
 
-date: 2008-06-30 00:00:00 +01:00
+date: 2008-07-01 00:00:00 +01:00
 default_executable: 
 dependencies: []