Added namespace detection for TypeConverter.

savonrb · Sep 2, 2013 · 3d076cb · 3d076cb
1 parent c151543
commit 3d076cb
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 11 deletions.
diff --git a/lib/nori/type_converter.rb b/lib/nori/type_converter.rb
@@ -1,21 +1,18 @@
+require 'rexml/document'
+
 class Nori
   class TypeConverter
-    module XmlNamespace
-      XML_SCHEMA = 'http://www.w3.org/2001/XMLSchema'
-      XML_SCHEMA_INSTANCE = 'http://www.w3.org/2001/XMLSchema-instance'
-    end
-
-    attr_accessor :attribute_namespace, :type_attribute_name, :type_namespace, :conversions
+    attr_accessor :attribute_prefix, :type_attribute_name, :type_prefix, :conversions
 
     def initialize(conversions = {})
-      @attribute_namespace = nil
+      @attribute_prefix = nil
       @type_attribute_name = 'type'
-      @type_namespace = nil
+      @type_prefix = nil
       @conversions = conversions
     end
 
     def namespaced_type_attribute
-      @namespaced_type_attribute ||= @attribute_namespace.nil? ? @type_attribute_name : "#{@attribute_namespace}:#{@type_attribute_name}"
+      @namespaced_type_attribute ||= @attribute_prefix.nil? ? @type_attribute_name : "#{@attribute_prefix}:#{@type_attribute_name}"
     end
 
     def conversion(type)
@@ -35,13 +32,26 @@ def type(attributes)
     end
 
     def type_namespace_matches?(type)
-      @type_namespace.nil? && type.index(':').nil? || type.index(@type_namespace + ":") == 0
+      @type_prefix.nil? && type.index(':').nil? || type.index(@type_prefix + ":") == 0
     end
 
     def strip_namespace(type)
-      @type_namespace.nil? ? type : type.gsub(/^#{@type_namespace}:/, '')
+      @type_prefix.nil? ? type : type.gsub(/^#{@type_prefix}:/, '')
+    end
+
+    def detect_namespace_prefixes!(xml, opts = {})
+      document = REXML::Document.new(xml)
+      namespaces = REXML::XPath.first(document.root).namespaces
+      @attribute_prefix = namespaces.key(opts[:attribute_namespace] || XmlNamespace::XML_SCHEMA_INSTANCE)
+      @type_prefix = namespaces.key(opts[:type_namespace] || XmlNamespace::XML_SCHEMA)
+    end
+
+    module XmlNamespace
+      XML_SCHEMA = 'http://www.w3.org/2001/XMLSchema'
+      XML_SCHEMA_INSTANCE = 'http://www.w3.org/2001/XMLSchema-instance'
     end
 
+    # -- Type Converter
 
     class NoConvert
       def self.convert(value)

diff --git a/spec/nori/type_converter_spec.rb b/spec/nori/type_converter_spec.rb
@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Nori::TypeConverter do
+  describe "#detect_namespace_prefixes!" do
+    let(:namespaces) { {} }
+    let(:type_converter) { Nori::TypeConverter.new.tap {|c| c.detect_namespace_prefixes!(xml, namespaces)} }
+
+    context 'no namespaces' do
+      let(:xml) {
+        <<-EOT
+            <?xml version="1.0" encoding="UTF-8"?>
+            <Envelope>
+              <Body>
+              </Body>
+            </Envelope>
+        EOT
+      }
+      subject { type_converter }
+      its(:attribute_prefix) { should be_nil }
+      its(:type_prefix) { should be_nil }
+    end
+
+    context 'XMLSchema namespace (default)' do
+      let(:xml) {
+        <<-EOT
+        subject { converter }
+            <?xml version="1.0" encoding="UTF-8"?>
+            <Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+              <Body>
+              </Body>
+            </Envelope>
+        EOT
+      }
+      subject { type_converter }
+      its(:attribute_prefix) { should eq('xsi') }
+      its(:type_prefix) { should eq('xsd') }
+    end
+
+    context 'custom namespace' do
+      let(:namespaces) {
+        { :attribute_namespace => 'http://company.com/foo', :type_namespace => 'http://company.com/bar' }
+      }
+      let(:xml) {
+        <<-EOT
+        subject { converter }
+            <?xml version="1.0" encoding="UTF-8"?>
+            <Envelope xmlns:foo="http://company.com/foo" xmlns:bar="http://company.com/bar" >
+              <Body>
+              </Body>
+            </Envelope>
+        EOT
+      }
+      subject { type_converter }
+      its(:attribute_prefix) { should eq('foo') }
+      its(:type_prefix) { should eq('bar') }
+    end
+  end
+end