ratom 0.6.10 → 0.7.0

data/.gitignore

@@ -0,0 +1,5 @@
+doc
+pkg
+nbproject
+rdoc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+script: "bundle exec rake spec"

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bundle-gem.gemspec
+gemspec

data/History.txt

@@ -1,3 +1,9 @@
+== 0.7.0
+
+* Atom::VERSION is now a string.
+* Now works in 1.9.3 without any deprecation warnings. [clnclarinet]
+* Build system uses bundler and travis and a non-ancient version of Rspec. [clnclarinet]
+
 == 0.6.10
 
 * Removed explicit dependency on ActiveSupport. [icambron]

data/README.rdoc

@@ -12,6 +12,10 @@ built by Peerworks[http://peerworks.org], via the Atom Publishing protocol.  How
 supports, or aims to support, all the Atom Syndication Format and Publication Protocol
 and can be used to access Atom feeds or to script publishing entries to a blog supporting APP.
 
+{<img src="https://secure.travis-ci.org/seangeo/ratom.png?branch=master" alt="Build Status" />}[http://travis-ci.org/seangeo/ratom]
+
+API docs are {here}[http://rdoc.info/github/seangeo/ratom/frames].
+
 == Prerequisites
 
 * libxml-ruby, >= 1.1.2
@@ -217,7 +221,7 @@ defined like this:
 	
 We can tell rAtom about our custom namespace and custom class using the following method calls:
 
-  Atom::Feed..add_extension_namespace :custom, "http://custom.namespace"
+  Atom::Feed.add_extension_namespace :custom, "http://custom.namespace"
   Atom::Entry.elements "custom:property", :class => Custom::Property
 	
 The first method call registers an alias for the "http://custom.namespace" namespace and the second method call
@@ -282,6 +286,12 @@ The source repository is accessible via GitHub:
 
   git clone git://github.com/seangeo/ratom.git
 
+The project now uses Bundler for dependency management so, just do 
+
+  bundle install
+
+to get going.
+
 == Contact Information
 
 The project page is at http://github.com/seangeo/ratom. Please file any bugs or feedback

data/Rakefile

@@ -1,59 +1,10 @@
-require 'rubygems'
-require 'rake'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+Bundler.setup(:default, :test)
 
-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'
-    rf.remote_doc_path = ''
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
 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/lib/atom.rb

@@ -280,22 +280,37 @@ module Atom # :nodoc:
       end
       
       def to_xml(nodeonly = true, name = 'content', namespace = nil, namespace_map = Atom::Xml::NamespaceMap.new) # :nodoc:
-        require 'iconv'
-        # Convert from utf-8 to utf-8 as a way of making sure the content is UTF-8.
-        #
-        # This is a pretty crappy way to do it but if we don't check libxml just
+        # Reject content that isn't UTF-8. If we don't check libxml just
         # fails silently and outputs the content element without any content. At
         # least checking here and raising an exception gives the caller a chance
         # to try and recitfy the situation.
         #
-        begin
-          node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
-          node << Iconv.iconv('utf-8', 'utf-8', self.to_s).first
-          node['type'] = 'html'
-          node['xml:lang'] = self.xml_lang if self.xml_lang
-          node
-        rescue Iconv::IllegalSequence => e
-          raise SerializationError, "Content must be converted to UTF-8 before attempting to serialize to XML: #{e.message}."
+
+        if RUBY_VERSION =~ /^1.8/
+          require 'iconv'
+          # Convert from utf-8 to utf-8 as a way of making sure the content is
+          # UTF-8.
+          begin
+            node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
+            node << Iconv.iconv('utf-8', 'utf-8', self.to_s).first
+            node['type'] = 'html'
+            node['xml:lang'] = self.xml_lang if self.xml_lang
+            node
+          rescue Iconv::IllegalSequence => e
+            raise SerializationError, "Content must be converted to UTF-8 before attempting to serialize to XML: #{e.message}."
+          end
+
+        else
+
+          if self.to_s.force_encoding("UTF-8").ascii_only?
+            node = XML::Node.new("#{namespace_map.prefix(Atom::NAMESPACE, name)}")
+            node << self.to_s
+            node['type'] = 'html'
+            node['xml:lang'] = self.xml_lang if self.xml_lang
+            node
+          else
+            raise SerializationError, "Content must be converted to UTF-8 before attempting to serialize to XML: #{self}."
+          end
         end
       end
     end

data/lib/atom/pub.rb

@@ -175,7 +175,7 @@ module Atom
       def headers
         {'Accept' => 'application/atom+xml',
          'Content-Type' => 'application/atom+xml;type=entry',
-         'User-Agent' => "rAtom #{Atom::VERSION::STRING}"
+         'User-Agent' => "rAtom #{Atom::VERSION}"
          }
       end
     end
@@ -216,7 +216,7 @@ module Atom
         uri = URI.parse(edit.href)
         response = nil
         Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Delete.new(uri.request_uri, {'Accept' => 'application/atom+xml', 'User-Agent' => "rAtom #{Atom::VERSION::STRING}"})
+          request = Net::HTTP::Delete.new(uri.request_uri, {'Accept' => 'application/atom+xml', 'User-Agent' => "rAtom #{Atom::VERSION}"})
           if opts[:user] && opts[:pass]
             request.basic_auth(opts[:user], opts[:pass])
           elsif opts[:hmac_access_id] && opts[:hmac_secret_key]
@@ -244,7 +244,7 @@ module Atom
     def headers
       {'Accept' => 'application/atom+xml',
        'Content-Type' => 'application/atom+xml;type=entry',
-       'User-Agent' => "rAtom #{Atom::VERSION::STRING}"
+       'User-Agent' => "rAtom #{Atom::VERSION}"
        }
     end    
   end

data/lib/atom/version.rb

@@ -1,7 +1,4 @@
 require 'yaml'
 module Atom
-  module VERSION
-    INFO = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "VERSION.yml"))
-    STRING = [:major, :minor, :patch, :build].map {|l| INFO[l]}.compact.join('.')
-  end
+  VERSION = "0.7.0"
 end

data/ratom.gemspec

@@ -2,97 +2,46 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/atom/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{ratom}
-  s.version = "0.6.10"
+  s.name = "ratom"
+  s.version = Atom::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peerworks", "Sean Geoghegan"]
-  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.date = "2012-05-11"
+  s.description = "A fast Atom Syndication and Publication API based on libxml"
+  s.email = "seangeo@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    "History.txt",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION.yml",
-    "lib/atom.rb",
-    "lib/atom/configuration.rb",
-    "lib/atom/pub.rb",
-    "lib/atom/version.rb",
-    "lib/atom/xml/parser.rb",
-    "ratom.gemspec",
-    "spec/app/member_entry.atom",
-    "spec/app/service.xml",
-    "spec/app/service_xml_base.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/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",
-    "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"
-  ]
-  s.homepage = %q{http://github.com/seangeo/ratom}
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.homepage = "http://github.com/seangeo/ratom"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ratom}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Atom Syndication and Publication API}
-  s.test_files = [
-    "spec/atom/pub_spec.rb",
-    "spec/atom_spec.rb",
-    "spec/property.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.summary = "Atom Syndication and Publication API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<libxml-ruby>, ["~> 2.3.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<libxml-ruby>, [">= 1.1.2"])
+      s.add_dependency(%q<libxml-ruby>, ["~> 2.3.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<libxml-ruby>, [">= 1.1.2"])
+    s.add_dependency(%q<libxml-ruby>, ["~> 2.3.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
   end
 end
 

data/spec/atom/pub_spec.rb

@@ -5,7 +5,7 @@
 # Please visit http://www.peerworks.org/contact for further information.
 #
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'atom'
 require 'atom/pub'
 require 'atom/version'
@@ -238,7 +238,7 @@ describe Atom::Pub do
         @collection = Atom::Pub::Collection.new(:href => 'http://example.org/blog')
         @request_headers = {'Accept' => 'application/atom+xml', 
                    'Content-Type' => 'application/atom+xml;type=entry',
-                   'User-Agent' => "rAtom #{Atom::VERSION::STRING}"
+                   'User-Agent' => "rAtom #{Atom::VERSION}"
                    }
       end
           
@@ -380,7 +380,7 @@ describe Atom::Pub do
     before(:each) do
       @request_headers = {'Accept' => 'application/atom+xml', 
                           'Content-Type' => 'application/atom+xml;type=entry',
-                          'User-Agent' => "rAtom #{Atom::VERSION::STRING}"
+                          'User-Agent' => "rAtom #{Atom::VERSION}"
                          }
     end
     

data/spec/atom_spec.rb

@@ -5,10 +5,10 @@
 # Please visit http://www.peerworks.org/contact for further information.
 #
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper'
 require 'net/http'
 require 'time'
-require 'spec/property'
+require 'property'
 
 shared_examples_for 'simple_single_entry.atom attributes' do
   it "should parse title" do

data/spec/spec_helper.rb

@@ -4,18 +4,11 @@
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'atom'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
   def mock_response(klass, body, headers = {})
     response = klass.new(nil, nil, nil)
@@ -39,6 +32,7 @@ Spec::Runner.configure do |config|
     http = mock('http')
     http.should_receive(:request).with(req).and_return(response)
     http.stub!(:use_ssl=)
+    http.stub!(:ca_path=)
     http.stub!(:verify_mode=)
     http.stub!(:verify_depth=)
     Net::HTTP.should_receive(:new).with(url.host, url.port).and_return(http)

metadata

@@ -1,59 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ratom
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 10
-  version: 0.6.10
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Peerworks
 - Sean Geoghegan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-15 00:00:00 +10:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: &70333618774100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70333618774100
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70333618773580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *70333618773580
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70333618773000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70333618773000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70333618772520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :runtime
-  version_requirements: *id002
+  version_requirements: *70333618772520
 description: A fast Atom Syndication and Publication API based on libxml
 email: seangeo@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
 - History.txt
 - LICENSE
 - README.rdoc
@@ -103,38 +116,72 @@ files:
 - spec/property.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/seangeo/ratom
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: -371406572056392839
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -371406572056392839
 requirements: []
-
-rubyforge_project: ratom
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Atom Syndication and Publication API
-test_files: 
+test_files:
+- spec/app/member_entry.atom
+- spec/app/service.xml
+- spec/app/service_xml_base.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/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
+- 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