ratom 0.6.9 → 0.6.10

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.10
+
+* Removed explicit dependency on ActiveSupport. [icambron]
+* Added support for external content references using the src attribute. [lukfugl]
+
 == 0.6.9
 
 * SSL support [kossnocorp]

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
+:patch: 10
 :build: 
+:major: 0
 :minor: 6
-:patch: 9

data/lib/atom.rb

@@ -170,13 +170,17 @@ module Atom # :nodoc:
     
   class Content  # :nodoc:
     def self.parse(xml)
-      case xml['type']
-      when "xhtml"
-        Xhtml.new(xml)
-      when "html"
-        Html.new(xml)
+      if xml['src'] && !xml['src'].empty?
+        External.new(xml)
       else
-        Text.new(xml)
+        case xml['type']
+        when "xhtml"
+          Xhtml.new(xml)
+        when "html"
+          Html.new(xml)
+        else
+          Text.new(xml)
+        end
       end
     end
   
@@ -212,6 +216,26 @@ module Atom # :nodoc:
       end
     end
     
+    # External content reference within an Atom document.
+    class External < Base      
+      attribute :type, :src
+
+      # this one only works with XML::Reader instances, no strings, since the
+      # content won't be inline.
+      def initialize(o)
+        raise ArgumentError, "Got #{o} which isn't an XML::Reader" unless o.kind_of?(XML::Reader)
+        super("")
+        parse(o, :once => true)
+      end
+      
+      def to_xml(nodeonly = true, name = 'content', namespace = nil, namespace_map = Atom::Xml::NamespaceMap.new)
+        node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
+        node['type'] = self.type if self.type
+        node['src'] = self.src if self.src
+        node
+      end
+    end
+    
     # Text content within an Atom document.
     class Text < Base      
       attribute :type, :'xml:lang'

data/lib/atom/xml/parser.rb

@@ -10,7 +10,7 @@ require 'time'
 RootCA = '/etc/ssl/certs'
 
 # Just a couple methods form transforming strings
-unless defined?(ActiveSupport)
+unless String.instance_methods.include?(:singularize)
   class String # :nodoc:
     def singularize
       if self =~ /ies$/
@@ -19,11 +19,19 @@ unless defined?(ActiveSupport)
         self.sub(/s$/, '')
       end
     end
-  
+  end
+end
+
+unless String.instance_methods.include?(:demodulize)
+  class String # :nodoc:
     def demodulize
       self.sub(/.*::/, '')
     end
-    
+  end
+end
+
+unless String.instance_methods.include?(:constantize)
+  class String # :nodoc:   
     def constantize
       Object.module_eval("::#{self}", __FILE__, __LINE__)
     end

data/ratom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ratom}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peerworks", "Sean Geoghegan"]
-  s.date = %q{2011-07-13}
+  s.date = %q{2011-10-15}
   s.description = %q{A fast Atom Syndication and Publication API based on libxml}
   s.email = %q{seangeo@gmail.com}
   s.extra_rdoc_files = [
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/entry_with_custom_extensions.atom",
     "spec/fixtures/entry_with_simple_extensions.atom",
     "spec/fixtures/entry_with_single_custom_extension.atom",
+    "spec/fixtures/external_content_single_entry.atom",
     "spec/fixtures/multiple_entry.atom",
     "spec/fixtures/simple_single_entry.atom",
     "spec/fixtures/with_stylesheet.atom",
@@ -69,7 +70,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/seangeo/ratom}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ratom}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Atom Syndication and Publication API}
   s.test_files = [
     "spec/atom/pub_spec.rb",
@@ -79,9 +80,10 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.2"])
     else

data/spec/atom_spec.rb

@@ -1293,6 +1293,28 @@ describe Atom do
     end
   end
     
+  describe Atom::Content::External do
+    before(:each) do
+      feed = nil
+      lambda { feed = Atom::Feed.load_feed(File.open('spec/fixtures/external_content_single_entry.atom')) }.should_not raise_error
+      entry = feed.entries.first
+      entry.content.should_not be_nil
+      @content = entry.content
+      @content.class.should == Atom::Content::External
+    end
+
+    it "should capture the src" do
+      @content.type.should == 'application/pdf'
+      @content.src.should == 'http://example.org/pdfs/robots-run-amok.pdf'
+    end
+
+    it "should include type and src in the serialized xml" do
+      xml = @content.to_xml
+      xml['type'].should == 'application/pdf'
+      xml['src'].should == 'http://example.org/pdfs/robots-run-amok.pdf'
+    end
+  end
+  
   describe 'Atom::Category initializer' do
     it "should create a empty category" do
       lambda { Atom::Category.new }.should_not raise_error

data/spec/fixtures/external_content_single_entry.atom

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+  <title>Example Feed</title> 
+  <link href="http://example.org/"/>
+  <updated>2003-12-13T18:30:02Z</updated>
+  <author> 
+    <name>John Doe</name>
+  </author> 
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+
+  <entry>
+    <title>Atom-Powered Robots Run Amok</title>
+    <link href="http://example.org/2003/12/13/atom03"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <content type="application/pdf" src="http://example.org/pdfs/robots-run-amok.pdf"/>
+    <updated>2003-12-13T18:30:02Z</updated>
+    <summary>Some text.</summary>
+  </entry>
+
+</feed>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ratom
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 6
-  - 9
-  version: 0.6.9
+  - 10
+  version: 0.6.10
 platform: ruby
 authors: 
 - Peerworks
@@ -16,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +09:30
+date: 2011-10-15 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -37,11 +34,9 @@ dependencies:
   name: libxml-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
@@ -98,6 +93,7 @@ files:
 - spec/fixtures/entry_with_custom_extensions.atom
 - spec/fixtures/entry_with_simple_extensions.atom
 - spec/fixtures/entry_with_single_custom_extension.atom
+- spec/fixtures/external_content_single_entry.atom
 - spec/fixtures/multiple_entry.atom
 - spec/fixtures/simple_single_entry.atom
 - spec/fixtures/with_stylesheet.atom
@@ -117,27 +113,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ratom
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Atom Syndication and Publication API