ratom 0.6.3 → 0.6.4

data/.gitignore

@@ -0,0 +1,4 @@
+doc
+pkg
+nbproject
+rdoc

data/History.txt

@@ -1,3 +1,10 @@
+== 0.6.4
+
+* Remove Hoe dependency and converted to a Jeweler based project build.
+* Fixed error when assigning nil to node['xml:lang'] [George Guimarães].
+* Handle link@title. [Brian Dewey]
+* SimpleExtensions#[] returns a namespace hash if localname is not given. [Daniel Vartanov]
+
 == 0.6.3 2009-11-19
 
 * Removed extraneous logging.

data/{README.txt → README.rdoc}

@@ -280,7 +280,7 @@ The source repository is accessible via GitHub:
 
 == Contact Information
 
-The project page is at http://rubyforge.org/projects/ratom. Please file any bugs or feedback
+The project page is at http://github.com/seangeo/ratom. Please file any bugs or feedback
 using the trackers and forums there.
 
 == Authors and Contributors

data/Rakefile

@@ -1,4 +1,58 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "ratom"
+    gem.summary = %Q{Atom Syndication and Publication API}
+    gem.description = %Q{A fast Atom Syndication and Publication API based on libxml}
+    gem.email = "seangeo@gmail.com"
+    gem.homepage = "http://github.com/seangeo/ratom"
+    gem.rubyforge_project = 'ratom'
+    gem.authors = ["Peerworks", "Sean Geoghegan"]
+    gem.add_development_dependency "rspec"
+    gem.add_dependency 'libxml-ruby', '>= 1.1.2'
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new do |rf|
+    rf.doc_task = 'rdoc'
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "ratom #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION.yml

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

data/lib/atom.rb

@@ -31,19 +31,34 @@ module Atom # :nodoc:
   #
   module SimpleExtensions
     attr_reader :simple_extensions
-    
+
     # Gets a simple extension value for a given namespace and local name.
     #
     # +ns+:: The namespace.
     # +localname+:: The local name of the extension element.
     #
-    def [](ns, localname)
-      if !defined?(@simple_extensions) || @simple_extensions.nil?
-        @simple_extensions = {}
+    def [](namespace, localname=nil)
+      @simple_extensions ||= {}
+
+      localname.nil? ? namespace_hash(namespace) : element_values(namespace, localname)
+    end
+
+  protected
+
+    def namespace_hash(namespace)
+      namespace_keys = @simple_extensions.keys.select { |key| key =~ /^\{#{namespace},/ }
+
+      elements = {}
+      namespace_keys.each do |key|
+        attribute_name = key.match(/\{.*,(.*)\}/)[1]
+        elements[attribute_name] = @simple_extensions[key]
       end
-      
-      key = "{#{ns},#{localname}}"
-      (@simple_extensions[key] or @simple_extensions[key] = ValueProxy.new)
+      elements
+    end
+
+    def element_values(namespace, localname)
+      key = "{#{namespace},#{localname}}"
+      @simple_extensions[key] ||= ValueProxy.new
     end
     
     class ValueProxy < DelegateClass(Array)
@@ -282,7 +297,7 @@ module Atom # :nodoc:
       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'] = 'xhtml'
-        node['xml:lang'] = self.xml_lang
+        node['xml:lang'] = self.xml_lang.to_s
         
         div = XML::Node.new('div')
         div['xmlns'] = XHTML
@@ -678,7 +693,7 @@ module Atom # :nodoc:
     end    
     
     include Xml::Parseable
-    attribute :href, :rel, :type, :length, :hreflang
+    attribute :href, :rel, :type, :length, :hreflang, :title
         
     # Create a link.
     #
@@ -693,7 +708,7 @@ module Atom # :nodoc:
           raise ArgumentError, "Link created with node other than atom:link: #{o.name}"
         end
       when Hash
-        [:href, :rel, :type, :length, :hreflang].each do |attr|
+        [:href, :rel, :type, :length, :hreflang, :title].each do |attr|
           self.send("#{attr}=", o[attr])
         end
       else

data/spec/atom_spec.rb

@@ -381,6 +381,10 @@ describe Atom do
         it "should have 'http://example.org/2005/04/02/atom' string representation" do
           @link.to_s.should == 'http://example.org/2005/04/02/atom'
         end
+        
+        it "should have title 'Alternate link'" do
+          @link.title.should == "Alternate link"
+        end
       end
       
       describe 'enclosure link' do
@@ -1046,6 +1050,29 @@ describe Atom do
       it "should load simple extension 3 xml for entry" do
         @entry["http://example.org/example3", 'simple3'].should == ['<ContinuityOfCareRecord xmlns="urn:astm-org:CCR">Simple Entry Value (NS2)</ContinuityOfCareRecord>']
       end
+
+      describe "when only namespace is provided" do
+        before :each do
+          @example_elements = @entry["http://example.org/example"]
+          @example2_elements = @entry['http://example2.org/example2']
+          @example3_elements = @entry['http://example.org/example3']
+        end
+
+        it "should return namespace elements as a hash" do
+          @example_elements.should == {
+            'simple1' => ['Simple1 Entry Value'],
+            'simple2' => ['Simple2', 'Simple2a']
+          }
+
+          @example2_elements.should == {
+            'simple1' => ['Simple Entry Value (NS2)']
+          }
+
+          @example3_elements.should == {
+            'simple3' => ['<ContinuityOfCareRecord xmlns="urn:astm-org:CCR">Simple Entry Value (NS2)</ContinuityOfCareRecord>']
+          }
+        end
+      end
     end
     
     describe 'writing simple extensions' do
@@ -1232,6 +1259,11 @@ describe Atom do
       txt.should == "<p>This is some text</p>"
       txt.type.should == "xhtml"
     end
+    
+    it "should be renderable to xml" do
+      txt = Atom::Content::Xhtml.new("<p>This is some text</p>")
+      txt.to_xml.should_not raise_error("TypeError")
+    end
   end
     
   describe 'Atom::Category initializer' do

data/spec/fixtures/complex_single_entry.atom

@@ -15,7 +15,7 @@
   <category term="atom" scheme="http://example.org" label="Atom" />
   <entry>
     <title>Atom draft-07 snapshot</title>
-    <link rel="alternate" type="text/html" 
+    <link rel="alternate" type="text/html" title="Alternate link"
      href="http://example.org/2005/04/02/atom"/>
     <link rel="enclosure" type="audio/mpeg" length="1337"
      href="http://example.org/audio/ph34r_my_podcast.mp3"/>

data/spec/fixtures/entry_with_custom_extensions.atom

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<entry xmlns='http://www.w3.org/2005/Atom' xmlns:custom='http://custom.namespace'>
+  <id>https://custom.namespace/id/1</id>
+  <link rel='self' type='application/atom+xml' href='https://custom.namespace/id/1'/>
+  <custom:property name='foo' value='bar'/>
+  <custom:property name='baz' value='bat'/>
+</entry>

data/spec/fixtures/entry_with_simple_extensions.atom

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:ex="http://example.org/example" xmlns:ex2="http://example2.org/example2" xmlns:ex3="http://example.org/example3">
+
+  <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>
+  <ex:simple1>Simple1 Value</ex:simple1>
+  <ex:simple-empty/>
+  <ex:title>Extension Title</ex:title>
+  
+  <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="html">This &lt;em&gt;is&lt;/em&gt; html.</content>
+    <updated>2003-12-13T18:30:02Z</updated>
+    <summary>Some text.</summary>
+    <ex:simple1>Simple1 Entry Value</ex:simple1>
+    <ex:simple2>Simple2</ex:simple2>
+    <ex:simple2>Simple2a</ex:simple2>
+    <ex2:simple1>Simple Entry Value (NS2)</ex2:simple1>
+    <ex3:simple3><ContinuityOfCareRecord xmlns="urn:astm-org:CCR">Simple Entry Value (NS2)</ContinuityOfCareRecord></ex3:simple3>
+    <category term="atom" scheme="http://example.org" label="Atom" ex:attribute="extension" />
+  </entry>
+
+</feed>

data/spec/fixtures/entry_with_single_custom_extension.atom

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<entry xmlns='http://www.w3.org/2005/Atom' xmlns:custom='http://single.custom.namespace'>
+  <id>https://custom.namespace/id/1</id>
+  <link rel='self' type='application/atom+xml' href='https://single.custom.namespace/id/1'/>
+  <custom:singleproperty name='foo' value='bar'/>
+</entry>

data/spec/property.rb

@@ -0,0 +1,31 @@
+module Atom
+  module Extensions
+    class Property
+      include Atom::Xml::Parseable
+
+      namespace "http://custom.namespace"
+      attribute :name, :value
+
+      def initialize(name = nil, value = nil)
+        if name && value
+          initialize_with_o :name => name, :value => value
+        else
+          initialize_with_o(name) { yield if block_given? }
+        end
+      end
+
+      def initialize_with_o(o = nil)
+        case o
+        when String, XML::Reader
+          parse o, :once => true
+        when Hash
+          o.each do |name,value|
+            self.send :"#{name}=", value
+          end
+        else
+          yield(self) if block_given?
+        end
+      end
+    end  
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ratom
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Peerworks
@@ -10,55 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +10:30
+date: 2010-04-02 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
-    version: 
-description: Atom Syndication and Publication API
-email: sean@peerworks.org
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id002
+description: A fast Atom Syndication and Publication API based on libxml
+email: seangeo@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
+- LICENSE
+- README.rdoc
 files: 
+- .gitignore
 - History.txt
-- License.txt
-- Manifest.txt
-- README.txt
+- LICENSE
+- README.rdoc
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
+- VERSION.yml
 - lib/atom.rb
+- lib/atom/configuration.rb
 - lib/atom/pub.rb
-- lib/atom/version.rb
 - lib/atom/xml/parser.rb
-- lib/atom/configuration.rb
-- setup.rb
 - spec/app/member_entry.atom
 - spec/app/service.xml
 - spec/atom/pub_spec.rb
@@ -83,49 +88,50 @@ files:
 - spec/fixtures/complex_single_entry.atom
 - spec/fixtures/created_entry.atom
 - spec/fixtures/entry.atom
+- spec/fixtures/entry_with_custom_extensions.atom
+- spec/fixtures/entry_with_simple_extensions.atom
+- spec/fixtures/entry_with_single_custom_extension.atom
 - spec/fixtures/multiple_entry.atom
 - spec/fixtures/simple_single_entry.atom
 - spec/fixtures/with_stylesheet.atom
 - spec/paging/first_paged_feed.atom
 - spec/paging/last_paged_feed.atom
 - spec/paging/middle_paged_feed.atom
+- spec/property.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rspec.rake
-- tasks/website.rake
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
-homepage: http://ratom.rubyforge.org
+homepage: http://github.com/seangeo/ratom
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ratom
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Atom Syndication and Publication API
-test_files: []
-
+test_files: 
+- spec/atom/pub_spec.rb
+- spec/atom_spec.rb
+- spec/property.rb
+- spec/spec_helper.rb

data/Manifest.txt

@@ -1,54 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/atom.rb
-lib/atom/pub.rb
-lib/atom/version.rb
-lib/atom/xml/parser.rb
-lib/atom/configuration.rb
-setup.rb
-spec/app/member_entry.atom
-spec/app/service.xml
-spec/atom/pub_spec.rb
-spec/atom_spec.rb
-spec/conformance/baseuri.atom
-spec/conformance/divtest.atom
-spec/conformance/linktests.xml
-spec/conformance/nondefaultnamespace-baseline.atom
-spec/conformance/nondefaultnamespace-xhtml.atom
-spec/conformance/nondefaultnamespace.atom
-spec/conformance/ordertest.xml
-spec/conformance/title/html-cdata.atom
-spec/conformance/title/html-entity.atom
-spec/conformance/title/html-ncr.atom
-spec/conformance/title/text-cdata.atom
-spec/conformance/title/text-entity.atom
-spec/conformance/title/text-ncr.atom
-spec/conformance/title/xhtml-entity.atom
-spec/conformance/title/xhtml-ncr.atom
-spec/conformance/unknown-namespace.atom
-spec/conformance/xmlbase.atom
-spec/fixtures/complex_single_entry.atom
-spec/fixtures/created_entry.atom
-spec/fixtures/entry.atom
-spec/fixtures/multiple_entry.atom
-spec/fixtures/simple_single_entry.atom
-spec/fixtures/with_stylesheet.atom
-spec/paging/first_paged_feed.atom
-spec/paging/last_paged_feed.atom
-spec/paging/middle_paged_feed.atom
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/config/hoe.rb

@@ -1,72 +0,0 @@
-require 'atom/version'
-
-AUTHOR = ['Peerworks', 'Sean Geoghegan']  # can also be an array of Authors
-EMAIL = "sean@peerworks.org"
-DESCRIPTION = "Atom Syndication and Publication API"
-GEM_NAME = 'ratom' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'ratom' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "sgeo"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Atom::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'atom documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  p.extra_deps = [['libxml-ruby', '>= 1.1.2']]     
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = RUBYFORGE_PROJECT
-hoe.remote_rdoc_dir = PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,'')
-hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -1,17 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'atom'

data/lib/atom/version.rb

@@ -1,15 +0,0 @@
-# Copyright (c) 2008 The Kaphan Foundation
-#
-# For licensing information see LICENSE.txt.
-#
-# Please visit http://www.peerworks.org/contact for further information.
-#
-module Atom #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 6
-    TINY  = 3
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end