Changeset 1971

Timestamp:

09/17/07 13:41:33 (1 year ago)

Author:

nahi

Message:

• cache the result of XSD::CodeGen?#{safeconstname|safevarname} while mapping.
  

Files:

• trunk/lib/soap/mapping/mapping.rb (modified) (5 diffs)
• trunk/lib/soap/mapping/registry.rb (modified) (1 diff)
• trunk/lib/soap/mapping/wsdlencodedregistry.rb (modified) (1 diff)

trunk/lib/soap/mapping/mapping.rb

@@ -215 +215 @@
-      end
-      if lenient
-XSD::CodeGen::GenSupport
+Mapping
-        if const.const_defined?(const_str)
-          const = const.const_get(const_str)
@@ -320 +320 @@
-      end
-      iv = obj.instance_variables
-XSD::CodeGen::GenSupport
+Mapping
-      if iv.include?("@#{name}")
-        return obj.instance_variable_get("@#{name}")
@@ -342 +342 @@
-      values.each do |attr_name, value|
-        # untaint depends GenSupport.safevarname
-XSD::CodeGen::GenSupport
+Mapping
-        setter = name + "="
-        if obj.respond_to?(setter)
@@ -371 +371 @@
-  end
-
+  def self.safeconstname(name)
+    Thread.current[:SOAPMapping][:SafeConstName][name] ||=
+      XSD::CodeGen::GenSupport.safeconstname(name)
+  end
+
+  def self.safevarname(name)
+    Thread.current[:SOAPMapping][:SafeVarName][name] ||=
+      XSD::CodeGen::GenSupport.safevarname(name)
+  end
+
-  def self.root_type_hint
-    Thread.current[:SOAPMapping][:RootTypeHint]
@@ -552 +562 @@
-        data[:RootTypeHint] = opt[:root_type_hint]
-        data[:SchemaDefinition] = {}
+        data[:SafeVarName] = {}
+        data[:SafeConstName] = {}
-        yield
-      end

trunk/lib/soap/mapping/registry.rb

@@ -221 +221 @@
-  def find_schema_definition(name)
-    return nil unless name
-XSD::CodeGen::GenSupport
+Mapping
-    obj_class = Mapping.class_from_name(typestr)
-    if obj_class

trunk/lib/soap/mapping/wsdlencodedregistry.rb

@@ -59 +59 @@
-    begin
-      unless obj_class
-XSD::CodeGen::GenSupport
+Mapping
-        obj_class = Mapping.class_from_name(typestr)
-      end