xommelier 0.1.3 → 0.1.4

data/lib/xommelier/version.rb

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

data/lib/xommelier/xml.rb

@@ -14,5 +14,15 @@ module Xommelier
 
     autoload :Namespace,  'xommelier/xml/namespace'
     autoload :Element,    'xommelier/xml/element'
+
+    extend ClassMethods
+    xmlns DEFAULT_NS, as: :xml
+
+    module CommonAttributes
+      def self.included(base)
+        base.attribute :lang, ns: Xml.xmlns
+        base.attribute :base, type: Uri, ns: Xml.xmlns
+      end
+    end
   end
 end

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

@@ -84,7 +84,7 @@ module Xommelier
           (prefix ? builder[prefix] : builder).
             send(element_name, attribute_values) do |xml|
               elements.each do |name, value|
-                serialize_element(name, value, xml)
+                serialize_element(name, value, xml, self.class.elements[name].merge(parent_ns_prefix: prefix))
               end
               if respond_to?(:text)
                 xml.text @text
@@ -146,8 +146,12 @@ module Xommelier
           end
         end
 
-        def serialize_element(name, value, xml, options = nil)
-          options ||= self.element_options(name)
+        def serialize_element(name, value, xml, options = {})
+          prefix = if options[:ns].try(:!=, xmlns)
+                     xml.doc.namespaces.key(options[:ns].uri)[6..-1].presence
+                   else
+                     nil
+                   end
           case options[:count]
           when :any, :many
             single_element = options.merge(count: :one)
@@ -157,7 +161,7 @@ module Xommelier
             when Xommelier::Xml::Element
               value.to_xommelier(builder: xml, element_name: options[:element_name])
             else
-              xml.send(options[:element_name]) { xml.text value.to_xommelier }
+              (prefix ? xml[prefix] : xml).send(options[:element_name]) { xml.text value.to_xommelier }
             end
           end
         end

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

@@ -67,6 +67,7 @@ module Xommelier
           def inherited(child)
             child.elements    = elements.dup
             child.attributes  = attributes.dup
+            include Xml::CommonAttributes
           end
 
           # Defines containing element

data/spec/functional/atom_feed_thread_building_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'xommelier/atom/threading'
+require 'xommelier/atom/full'
 
 describe 'Atom feed building' do
   let(:feed) do

data/spec/lib/xommelier_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   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: &70163686772120 !ruby/object:Gem::Requirement
+  requirement: &70270196058780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163686772120
+  version_requirements: *70270196058780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70163686771620 !ruby/object:Gem::Requirement
+  requirement: &70270196058120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163686771620
+  version_requirements: *70270196058120
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70163686771160 !ruby/object:Gem::Requirement
+  requirement: &70270196057660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163686771160
+  version_requirements: *70270196057660
 description: XML-Object Mapper with many built-in XML formats supported
 email:
 - al@semyonov.us