xommelier 0.1.27 → 0.1.28

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4824745889fca5cb98ea64de92f0546e01de2099
+  data.tar.gz: 2d29e5097a62566157d9269629feae898eb27d3a
+SHA512:
+  metadata.gz: f4f7e582c1b8a8f5ee0741d7c6301d1b8b82ee11739c173cfd3292ee7af0f7209ffbc8908765e4309b283308a5b7b391860f0c513f3fe2af38a766ebe2be7b69
+  data.tar.gz: 9a450f314e50ddde5648a5d6b17638de2d1805143850f7a54de0a81dd44c10cd1d04fd40d8f5768f74e6bf95b30304204b48a258b7bf5961232d759cc956bf07

data/lib/xommelier/core_ext/string.rb

@@ -1,5 +1,6 @@
 class String
   def self.from_xommelier(value)
+    return nil if value.is_a?(NilClass)
     value.to_s
   end
 

data/lib/xommelier/version.rb

@@ -1,3 +1,3 @@
 module Xommelier
-  VERSION = '0.1.27'
+  VERSION = '0.1.28'
 end

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

@@ -22,6 +22,7 @@ module Xommelier
               doc.from_xml(xml, options)
             end
           end
+
           alias_method :parse, :from_xml
           alias_method :from_xommelier, :from_xml
 
@@ -61,6 +62,7 @@ module Xommelier
             deserialize_element(element)
           end
         end
+
         alias_method :from_xommelier, :from_xml
 
         def to_xml(options = {})
@@ -93,17 +95,13 @@ module Xommelier
             attribute = attribute_options(name)
             attribute_name = attribute.attribute_name
             ns = attribute.ns
-            if ns.uri != current_xmlns
-              if ns.as == :xml
-                attribute_name = "xml:#{attribute_name}"
-              elsif (attr_prefix = namespaces.key(ns.uri).try(:[], 6..-1).presence)
-                attribute_name = "#{attr_prefix}:#{attribute_name}"
-              end
+            if ns.uri != current_xmlns && (attr_prefix = namespaces.key(ns.uri).try(:[], 6..-1).presence)
+              attribute_name = "#{attr_prefix}:#{attribute_name}"
             end
-            serialize_attribute(attribute_name, value, attribute_values)
+            serialize_attribute(attribute_name, value, attribute_values) if (value != nil) || attribute.required?
           end
           @_xml_node = (prefix ? builder[prefix] : builder).
-              send(element_name, attribute_values) do |xml|
+            send(element_name, attribute_values) do |xml|
             self.class.elements.each do |name, element|
               value = elements.fetch(name, options[:default])
               unless value == nil
@@ -112,10 +110,11 @@ module Xommelier
                 end
               end
             end
-            xml.text(@text) if respond_to?(:text)
+            xml.text(@text) if text?
           end.instance_variable_get(:@node)
           builder.to_xml(save_options)
         end
+
         alias_method :to_xommelier, :to_xml
 
         def to_hash
@@ -217,7 +216,7 @@ module Xommelier
         # @param [Xommelier::Xml::Element::Structure::Attribute] attribute
         def deserialize_attribute(attribute)
           ns = attribute.ns
-          if ns.default? || ns == xmlns
+          if ns == xmlns || attribute.xml?
             send(attribute.writer, @_xml_node[attribute.attribute_name])
           else
             send(attribute.writer, @_xml_node.attribute_with_ns(attribute.attribute_name, ns.uri.to_s).try(:value))
@@ -259,17 +258,17 @@ module Xommelier
               end
             end
           else
-            xmlns  = element.overridden_xmlns || self.xmlns
+            xmlns = element.overridden_xmlns || self.xmlns
             prefix = if xmlns != xml.doc.namespaces['xmlns']
                        xml.doc.namespaces.key(element.ns.uri).try(:[], 6..-1).presence
                      end
             case value
             when Xommelier::Xml::Element
               value.to_xommelier(
-                builder:      xml,
+                builder: xml,
                 element_name: element.element_name,
-                prefix:       prefix,
-                ns:           element.ns
+                prefix: prefix,
+                ns: element.ns
               )
             else
               (prefix ? xml[prefix] : xml).send(element.serializable_element_name) do

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

@@ -105,7 +105,9 @@ module Xommelier
         class Attribute < Property
           DEFAULTS = {
             type: String,
-            required: false
+            required: false,
+            optional: true,
+            xml: false
           }
 
           def node_type
@@ -116,8 +118,16 @@ module Xommelier
             options[:required]
           end
 
+          def xml?
+            options[:xml]
+          end
+
           def attribute_name
-            @attribute_name ||= options.delete(:as) { name }.to_s
+            @attribute_name ||= if xml?
+                                  "xml:#{name}"
+                                else
+                                  options.delete(:as) { name }.to_s
+                                end
           end
         end
 

data/lib/xommelier/xml.rb

@@ -35,8 +35,8 @@ module Xommelier
     # Inject common XML attributes to every XML element
     require 'xommelier/xml/element'
     class Element
-      attribute :lang, ns: Xml.xmlns, as: 'xml:lang'
-      attribute :base, type: Uri, ns: Xml.xmlns, as: 'xml:base'
+      attribute :lang, optional: true, xml: true
+      attribute :base, type: Uri, optional: true, xml: true
     end
   end
 end

data/spec/support/schema_validatable.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 shared_examples 'Valid XML Document' do
   it { subject.class.schema.should be_present }
   specify do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.27
-  prerelease: 
+  version: 0.1.28
 platform: ruby
 authors:
 - Alexander Semyonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -211,33 +198,26 @@ files:
 - xommelier.gemspec
 homepage: http://github.com/alsemyonov/xommelier
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1200176832615114872
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1200176832615114872
 requirements: []
 rubyforge_project: xommelier
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Xommelier is an XML Sommelier
 test_files:
 - spec/fixtures/atom.rng.xml
@@ -268,3 +248,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/schema_validatable.rb
+has_rdoc: