xommelier 0.1.11 → 0.1.12

data/lib/xommelier/atom/feed.rb

@@ -23,8 +23,8 @@ module Xommelier
         element :author,      type: Person
         element :category,    type: Category
         element :contributor, type: Person
-        element :entry,       type: Entry
         element :link,        type: Link
+        element :entry,       type: Entry
       end
     end
   end

data/lib/xommelier/version.rb

@@ -1,3 +1,3 @@
 module Xommelier
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

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

@@ -63,11 +63,12 @@ module Xommelier
           element_name = options.delete(:element_name) { self.element_name }
           element_name = element_name.to_s
           element_name << '_' if %w(text class id).include?(element_name)
+          xmlns = options[:ns] || self.xmlns
           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
+            prefix = options[:prefix] || builder.doc.namespaces.key(xmlns.uri)[6..-1].presence
           else # Root element
             builder = Nokogiri::XML::Builder.new(options)
             attribute_values = children_namespaces.inject({xmlns: xmlns.uri}) do |hash, ns|
@@ -83,7 +84,8 @@ module Xommelier
           attributes.each do |name, value|
             attribute_options = attribute_options(name)
             attribute_name = attribute_options[:attribute_name]
-            if (ns = attribute_options[:ns]).uri != current_xmlns
+            ns = attribute_options[:ns]
+            if 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
@@ -94,13 +96,12 @@ module Xommelier
           end
           @_xml_node = (prefix ? builder[prefix] : builder).
               send(element_name, attribute_values) do |xml|
-            elements.each do |name, value|
-              serialize_element(
-                name,
-                value,
-                xml,
-                element_options(name).merge(parent_ns_prefix: prefix)
-              )
+            self.class.elements.each do |name, element_options|
+              value = elements.fetch(name, options[:default])
+              if value
+                serialize_element(name, value, xml,
+                                  element_options.merge(overriden_xmlns: xmlns))
+              end
             end
             xml.text(@text) if respond_to?(:text)
           end.instance_variable_get(:@node)
@@ -183,19 +184,22 @@ module Xommelier
         end
 
         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)
             value.each { |item| serialize_element(name, item, xml, single_element) }
           else
+            xmlns = options[:overriden_xmlns] || self.xmlns
+            prefix = if options[:prefix]
+                       options[:prefix]
+                     elsif options[:ns].try(:!=, xmlns)
+                       xml.doc.namespaces.key(options[:ns].uri)[6..-1].presence
+                     else
+                       nil
+                     end
             case value
             when Xommelier::Xml::Element
-              value.to_xommelier(builder: xml, element_name: options[:element_name])
+              value.to_xommelier(builder: xml, element_name: options[:element_name], prefix: prefix, ns: options[:ns])
             else
               element_name = options[:element_name].to_s
               element_name << '_' if %w(text class id).include?(element_name)

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

@@ -77,7 +77,7 @@ module Xommelier
           def element(name, options = {})
             options[:element_name] = options.delete(:as) { name }
             options[:ns] ||= if options[:type].try(:<, Xml::Element)
-                               options[:ns] = options[:type].xmlns
+                               options[:type].xmlns
                              else
                                xmlns
                              end

data/spec/fixtures/multi_namespace_feed.atom.xml

@@ -2,14 +2,14 @@
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0">
   <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
   <title>Example Feed</title>
-  <link href="http://example.org/"/>
   <updated>2003-12-13T18:30:02Z</updated>
   <author>
     <name>John Doe</name>
   </author>
+  <link href="http://example.org/"/>
   <entry>
-    <title>Atom-Powered Robots Run Amok</title>
     <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <title>Atom-Powered Robots Run Amok</title>
     <updated>2003-12-13T18:30:02Z</updated>
     <summary>Some text.</summary>
     <link href="http://example.org/2003/12/13/atom03"/>

data/spec/fixtures/nested_atom.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title>Xommelier nest elements</title>
+  <updated>2012-04-04T04:04:00Z</updated>
   <subtitle>Xommelier is able to build complex objects from very nested hash</subtitle>
   <author>
     <name>Alexander</name>
     <email>al@semyonov.us</email>
   </author>
-  <updated>2012-04-04T04:04:00Z</updated>
   <contributor>
     <name>Artyom</name>
     <email>sevenov@gmail.com</email>

data/spec/fixtures/simple_feed.atom.xml

@@ -2,14 +2,14 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
   <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
   <title>Example Feed</title>
-  <link href="http://example.org/"/>
   <updated>2003-12-13T18:30:02Z</updated>
   <author>
     <name>John Doe</name>
   </author>
+  <link href="http://example.org/"/>
   <entry>
-    <title>Atom-Powered Robots Run Amok</title>
     <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <title>Atom-Powered Robots Run Amok</title>
     <updated>2003-12-13T18:30:02Z</updated>
     <summary>Some text.</summary>
     <link href="http://example.org/2003/12/13/atom03"/>

data/spec/functional/atom_feed_building_spec.rb

@@ -29,6 +29,11 @@ describe 'Atom feed building' do
   it { feed.should be_valid }
 
   it { should == load_xml_file('simple_feed.atom').read }
+  it do
+    rng.validate(parsed_xml).each do |error|
+      pp error
+    end
+  end
   it('should conform to RelaxNG schema') { rng.valid?(parsed_xml).should == true }
   it('should conform to XML Schema') { xsd.valid?(parsed_xml).should == true }
 end

data/spec/lib/xommelier_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri