xommelier 0.1.15 → 0.1.16

data/lib/xommelier/atom.rb

@@ -13,6 +13,7 @@ module Xommelier
     autoload :Link,      'xommelier/atom/link'
     autoload :Person,    'xommelier/atom/person'
     autoload :Category,  'xommelier/atom/category'
+    autoload :Content,   'xommelier/atom/content'
     autoload :Generator, 'xommelier/atom/generator'
     autoload :Source,    'xommelier/atom/source'
     autoload :Feed,      'xommelier/atom/feed'

data/lib/xommelier/atom/content.rb

@@ -0,0 +1,13 @@
+require 'xommelier/atom'
+
+module Xommelier
+  module Atom
+    # The Atom content construct is defined in section 4.1.3 of the format spec.
+    class Content < Xml::Element
+      attribute :type
+      attribute :src, type: Uri
+
+      text
+    end
+  end
+end

data/lib/xommelier/atom/entry.rb

@@ -12,7 +12,7 @@ module Xommelier
       element :updated, type: Time
 
       may do
-        element :content
+        element :content, type: Content
         element :published, type: Time
         element :rights
         element :source

data/lib/xommelier/version.rb

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

data/lib/xommelier/xml.rb

@@ -51,14 +51,15 @@ module Xommelier
       instance_variable_set :@_xmlns, nil
     end
 
+    # Define XML default namespace
     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
+    # 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'
     end
   end
 end

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

@@ -48,8 +48,8 @@ module Xommelier
           @_xml_node = options.delete(:node) { xml.at_xpath(element_xpath(xml.document, element_name)) }
           validate if options[:validate]
 
-          if text? && @_xml_node.text?
-            self.text = @_xml_node.text
+          if text? && @_xml_node.inner_html.present?
+            self.text = @_xml_node.inner_html
           end
 
           self.class.attributes.each do |name, options|
@@ -132,6 +132,38 @@ module Xommelier
           end
         end
 
+        def <=>(other)
+          if text? && other.is_a?(String)
+            text.to_s <=> other
+          else
+            super
+          end
+        end
+
+        def ==(other)
+          if text? && other.is_a?(String)
+            text.to_s == other
+          else
+            super
+          end
+        end
+
+        def =~(other)
+          if text? && other.is_a?(Regexp)
+            text.to_s =~ other
+          else
+            super
+          end
+        end
+
+        def to_s
+          if text?
+            text.to_s
+          else
+            super
+          end
+        end
+
         protected
 
         delegate :ns_element, to: 'self.class'

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

@@ -68,7 +68,6 @@ module Xommelier
           def inherited(child)
             child.elements    = elements.dup
             child.attributes  = attributes.dup
-            child.send(:include, Xml::CommonAttributes)
           end
 
           # Defines containing element
@@ -171,6 +170,7 @@ module Xommelier
               read_text
             end
             alias_method :text=, :text
+            alias_attribute :content, :text
           end
         end
 

data/spec/functional/atom_feed_parsing_spec.rb

@@ -37,7 +37,7 @@ describe 'Atom feed' do
     its(:rights) { should == '© Mark Pilgrim, 2003' }
     describe 'Generator' do
       subject { feed.generator }
-      pending 'Make Xommelier::Xml::Element.to_s respond with #text.to_s' do
+      context '#to_s' do
         it { should == 'Example Toolkit' }
         its(:text)  { should == 'Example Toolkit' }
       end
@@ -89,12 +89,15 @@ describe 'Atom feed' do
       it { entry.contributors[0].name.should == 'Sam Ruby' }
       it { entry.contributors[1].name.should == 'Joe Gregorio' }
       its(:summary) { should == 'Some text.' }
-      its(:content) { should ~ /#{Regexp.escape('[Update: The Atom draft is fiished.]')}/ }
-      pending 'should parse text-based elements\' attributes' do
+      context 'Content' do
         subject { entry.content }
+        it { should =~ /#{Regexp.escape('[Update: The Atom draft is finished.]')}/ }
+        its(:text) do
+          should == "\n      <div xmlns=\"http://www.w3.org/1999/xhtml\">\n        <p><i>[Update: The Atom draft is finished.]</i></p>\n      </div>\n    "
+        end
         its(:type) { should == 'xhtml' }
         its(:lang) { should == 'en' }
-        its(:base) { should == 'http://diveintomark.org/' }
+        its(:base) { should == URI.parse('http://diveintomark.org/') }
         its(:content) { should ~ Regexp.new(Regexp.escape('<p><i>[Update: The Atom draft is fiished.]</i></p>')) }
       end
       its(:total) { should == 1 }

data/spec/spec_helper.rb

@@ -10,4 +10,8 @@ ATOM_XMLNS = 'http://www.w3.org/2005/Atom'
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.order = 'random'
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -81,6 +81,7 @@ files:
 - lib/xommelier.rb
 - lib/xommelier/atom.rb
 - lib/xommelier/atom/category.rb
+- lib/xommelier/atom/content.rb
 - lib/xommelier/atom/entry.rb
 - lib/xommelier/atom/feed.rb
 - lib/xommelier/atom/full.rb