xommelier 0.1.14 → 0.1.15

data/Gemfile

@@ -21,7 +21,7 @@ group :development do
   gem 'guard-bundler'
   gem 'rb-inotify'
   gem 'libnotify'
-  gem 'ruby_gntp'
+  gem 'terminal-notifier-guard'
   gem 'rb-fsevent'
 end
 

data/lib/xommelier/version.rb

@@ -1,3 +1,3 @@
 module Xommelier
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

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

@@ -22,13 +22,17 @@ module Xommelier
           alias_method :parse, :from_xml
           alias_method :from_xommelier, :from_xml
 
+          def ns_element(ns, element)
+            [ns, element].compact.join(':')
+          end
+
           def element_xpath(xmldoc = nil, name = nil)
-            "#{xmlns_xpath(xmldoc)}:#{name || element_name}"
+            ns_element(xmlns_xpath(xmldoc), name || element_name)
           end
 
           def xmlns_xpath(xml_document = nil)
             if xml_document
-              prefix = xml_document.namespaces.key(xmlns.uri)
+              prefix = xml_document.namespaces.key(xmlns.try(:uri))
               (prefix =~ /:/) ? prefix[6..-1] : prefix
             else
               xmlns.as
@@ -49,7 +53,7 @@ module Xommelier
           end
 
           self.class.attributes.each do |name, options|
-            send(name, @_xml_node[name])
+            deserialize_attribute(name, options)
           end
 
           self.class.elements.each do |name, options|
@@ -130,6 +134,8 @@ module Xommelier
 
         protected
 
+        delegate :ns_element, to: 'self.class'
+
         def element_xpath(xmldoc = self.xml_document, name = nil)
           self.class.element_xpath(xmldoc, name)
         end
@@ -160,10 +166,20 @@ module Xommelier
           attributes[name] = value.to_xommelier
         end
 
+        def deserialize_attribute(name, options = nil)
+          options ||= self.element_options(name)
+          ns = options[:ns]
+          if ns.default? || ns == xmlns
+            send(name, @_xml_node[options[:attribute_name]])
+          else
+            send(name, @_xml_node.attribute_with_ns(options[:attribute_name].to_s, ns.uri.to_s).try(:value))
+          end
+        end
+
         def deserialize_element(name, options = nil)
           options ||= self.element_options(name)
           type = options[:type]
-          nodes = @_xml_node.xpath("./#{options[:ns].as}:#{options[:element_name]}", options[:ns].to_hash)
+          nodes = @_xml_node.xpath("./#{ns_element(options[:ns].as, options[:element_name])}", options[:ns].to_hash)
           if nodes.any?
             case options[:count]
             when :any, :many

data/lib/xommelier/xml/element.rb

@@ -49,7 +49,7 @@ module Xommelier
       def options=(options = {})
         @options = options
         unless @options[:validate]
-          @options[:validate] = !!xmlns.schema
+          @options[:validate] = !!xmlns.try(:schema)
         end
         @options.delete(:type)
       end

data/lib/xommelier/xml/namespace.rb

@@ -12,7 +12,7 @@ module Xommelier
         end
       end
 
-      attr_reader :uri, :options, :as, :elements, :attributes
+      attr_reader :uri, :options, :elements, :attributes
       alias to_s uri
 
       def initialize(uri, options = {}, &block)
@@ -27,6 +27,10 @@ module Xommelier
         scoped(&block) if block_given?
       end
 
+      def as
+        @as unless default?
+      end
+
       def ns
         Xommelier::Xml::Namespace.registry
       end
@@ -69,6 +73,10 @@ module Xommelier
         end
       end
 
+      def default?
+        uri.to_s == DEFAULT_NS
+      end
+
       def to_hash
         {as.to_s => uri.to_s}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -141,21 +141,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4544361787088539035
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4544361787088539035
 requirements: []
 rubyforge_project: xommelier
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Xommelier is an XML Sommelier