xommelier 0.1.4 → 0.1.5

data/lib/xommelier/version.rb

@@ -1,3 +1,3 @@
 module Xommelier
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/xommelier/xml/element/serialization.rb

@@ -64,6 +64,7 @@ module Xommelier
           if options[:builder] # Non-root element
             builder = options.delete(:builder)
             attribute_values = {}
+            namespaces = builder.doc.namespaces
             prefix = builder.doc.namespaces.key(xmlns.uri)[6..-1].presence
           else # Root element
             builder = Nokogiri::XML::Builder.new(options)
@@ -72,19 +73,27 @@ module Xommelier
               hash
             end
             attribute_values.delete("xmlns:#{xmlns.as.to_s}")
+            attribute_values.delete("xmlns:xml")
+            namespaces = attribute_values
             prefix = nil
           end
           current_xmlns = builder.doc.namespaces[prefix ? "xmlns:#{prefix}" : 'xmlns']
           attributes.each do |name, value|
-            if (ns = self.class.attributes[name][:ns]).uri != current_xmlns && attr_prefix = builder.doc.namespaces.key(ns.uri).try(:[], 6..-1).presence
-              name = "#{attr_prefix}:#{name}"
+            attribute_options = attribute_options(name)
+            attribute_name = attribute_options[:attribute_name]
+            if (ns = attribute_options[:ns]).uri != current_xmlns
+              if ns.as == :xml
+                attribute_name = "xml:#{attribute_options[:attribute_name]}"
+              elsif attr_prefix = namespaces.key(ns.uri).try(:[], 6..-1).presence
+                attribute_name = "#{attr_prefix}:#{attribute_options[:attribute_name]}"
+              end
             end
-            serialize_attribute(name, value, attribute_values)
+            serialize_attribute(attribute_name, value, attribute_values)
           end
           (prefix ? builder[prefix] : builder).
             send(element_name, attribute_values) do |xml|
               elements.each do |name, value|
-                serialize_element(name, value, xml, self.class.elements[name].merge(parent_ns_prefix: prefix))
+                serialize_element(name, value, xml, element_options(name).merge(parent_ns_prefix: prefix))
               end
               if respond_to?(:text)
                 xml.text @text
@@ -104,8 +113,11 @@ module Xommelier
           elements.inject(namespaces) do |result, (name, children)|
             element_options = self.class.elements[name]
             result << element_options[:ns]
+            result += attributes.keys.map { |name| attribute_options(name)[:ns] }
             if element_options[:type] < Xml::Element
-              Array(children).each { |child| result += child.children_namespaces }
+              Array(children).each do |child|
+                result += child.children_namespaces
+              end
             end
             result
           end

data/lib/xommelier/xml/element/structure.rb

@@ -67,7 +67,7 @@ module Xommelier
           def inherited(child)
             child.elements    = elements.dup
             child.attributes  = attributes.dup
-            include Xml::CommonAttributes
+            child.send(:include, Xml::CommonAttributes)
           end
 
           # Defines containing element
@@ -86,6 +86,7 @@ module Xommelier
 
           # Defines containing attribute
           def attribute(name, options = {})
+            options[:attribute_name] = options.delete(:as) { name }
             options[:ns] ||= xmlns
             attributes[name] = DEFAULT_OPTIONS.merge(options)
             define_attribute_accessors(name)

data/lib/xommelier/xml/element.rb

@@ -27,6 +27,14 @@ module Xommelier
         @attributes = {}
         @text = nil
 
+        self.class.attributes.each do |name, options|
+          send("#{name}=", options[:default]) if options[:default]
+        end
+
+        self.class.elements.each do |name, options|
+          send("#{name}=", options[:default]) if options[:default]
+        end
+
         case contents
         when Hash
           contents.each do |name, value|

data/spec/lib/xommelier_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe Xommelier do
-  it { Xommelier::VERSION.should == '0.1.4' }
+  it { Xommelier::VERSION.should == '0.1.5' }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70270196058780 !ruby/object:Gem::Requirement
+  requirement: &70275292162600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270196058780
+  version_requirements: *70275292162600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70270196058120 !ruby/object:Gem::Requirement
+  requirement: &70275292149460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270196058120
+  version_requirements: *70275292149460
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70270196057660 !ruby/object:Gem::Requirement
+  requirement: &70275292120260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270196057660
+  version_requirements: *70275292120260
 description: XML-Object Mapper with many built-in XML formats supported
 email:
 - al@semyonov.us