DistelliServiceMarshallers 1.1 → 1.2

data/lib/distelli/servicemarshallers.rb

@@ -37,12 +37,18 @@ module Distelli
         return obj.strftime("%Y-%m-%dT%H:%M:%S%z")
       end
 
+      params_set_name = '_'+obj.class.name.split('::').last+'__params'
       type_map_name = '_'+obj.class.name.split('::').last+'__type_map'
+      params_set = obj.instance_variable_get('@'+params_set_name)
       obj.instance_variables.each do |var|
         var_name = var.to_s.delete('@')
-        if var_name == type_map_name
+        if var_name == type_map_name or var_name == params_set_name
           next
         end
+        if params_set != nil and params_set.include?(var_name)
+          next
+        end
+
         val = obj.instance_variable_get(var)
         if val.is_a?(Integer) or val.is_a?(Float) or val.is_a?(String) or val.is_a?(TrueClass) or val.is_a?(FalseClass)
           data[var_name] = val
@@ -72,9 +78,9 @@ module Distelli
 
     def marshall_error(error)
       if not error.is_a?(Distelli::BaseException)
-        raise StandardError.new("Cannot marshall error: "+error.inspect) 
+        raise StandardError.new("Cannot marshall error: "+error.inspect)
       end
-      
+
       err_msg = error.err_msg
       err_code = error.err_code
       return '{"Error":{"code":"'+err_code.to_s+'", "message":"'+err_msg.to_s+'"}}'
@@ -208,7 +214,7 @@ module Distelli
 
     def marshall_error(error)
       if not error.is_a?(Distelli::BaseException)
-        raise StandardError.new("Cannot marshall error: "+error.inspect) 
+        raise StandardError.new("Cannot marshall error: "+error.inspect)
       end
 
       err_msg = error.err_msg
@@ -396,16 +402,24 @@ module Distelli
 
     private
     def encode_obj_xml(obj)
+      params_set_name = '_'+obj.class.name.split('::').last+'__params'
+      params_set = obj.instance_variable_get('@'+params_set_name)
+
       type_map_name = '_'+obj.class.name.split('::').last+'__type_map'
       type_map = obj.instance_variable_get('@'+type_map_name)
+
       xml_data = Array.new
 
       obj.instance_variables.each do |var|
         k = var.to_s.delete('@')
 #        puts "Var: "+var.to_s+" TMN: "+type_map_name.to_s
-        if k == type_map_name
+        if k == type_map_name or k == params_set_name
+          next
+        end
+        if params_set != nil and params_set.include?(k)
           next
         end
+
         v = obj.instance_variable_get(var)
         data_type = type_map[k]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DistelliServiceMarshallers
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: DistelliServiceInterface
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Distelli Service Marshaller classes