Merge pull request #11 from asm/master

Instance variables are a list of symbols now. Thanks to asm!
noeticpenguin · Dec 11, 2012 · efa0704 · efa0704
2 parents c41b64b + d13abb6
commit efa0704
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb
@@ -252,10 +252,10 @@ def self.class2element(klass)
   def self.obj2element(obj)
     name = namespace = nil
     ivars = obj.instance_variables
-    if ivars.include?('@schema_type')
+    if ivars.include?(:@schema_type)
       name = obj.instance_variable_get('@schema_type')
     end
-    if ivars.include?('@schema_ns')
+    if ivars.include?(:@schema_ns)
       namespace = obj.instance_variable_get('@schema_ns')
     end
     if !name or !namespace
@@ -313,9 +313,9 @@ def self.get_attribute(obj, attr_name)
       end
       iv = obj.instance_variables
       name = Mapping.safevarname(attr_name)
-      if iv.include?("@#{name}")
+      if iv.include?("@#{name}".to_sym)
         return obj.instance_variable_get("@#{name}")
-      elsif iv.include?("@#{attr_name}")
+      elsif iv.include?("@#{attr_name}".to_sym)
         return obj.instance_variable_get("@#{attr_name}")
       end
       if obj.respond_to?(name)