rss-client 2.0.9 → 2.0.10

data/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008 Stoyan Zhekov
+Copyright (c) 2010 Stoyan Zhekov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,4 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/{README → README.rdoc}

@@ -1,19 +1,19 @@
-= RSSClient:  Fetching and parsing RSS feeds with easy
+= rss-client:  Fetching and parsing RSS feeds with easy
 
 == Download
 
-The latest version of rake can be found at
+The latest version of rss-client can be found at
 
-* http://rubyforge.org/project/...
+* http://github.com/zh/rssclient/
 
 
 == Installation
 
 === Normal Installation
 
-You can install rake with the following command.
+You can install rss-client with the following command.
 
-  % ruby install.rb
+  % rake install
 
 from its distribution directory.
 
@@ -63,17 +63,20 @@ Download and install  rss-client with the following.
 [<b>Todd Werth</b>] For the ruby command-line application skeleton
 
 
-== License
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
 
-rss-client is available under an MIT-style license.
+== Copyright
 
-:include: MIT-LICENSE
-
-
-== Other stuff
-
-Author::   Stoyan Zhekov <stoyan@gmail.com> 
+Author::   Stoyan Zhekov <zh@zhware.net> 
 Requires:: Ruby 1.8.0 or later
-License::  Copyright (c) 2007, 2008 Stoyan Zhekov
-           Released under an MIT-style license.  See the MIT-LICENSE file
-           included in the distribution.
+License::  Copyright (c) 2010 Stoyan Zhekov.
+           Released under an MIT-style license.
+           See LICENSE for details.

data/Rakefile

@@ -1,83 +1,79 @@
 require 'rubygems'
-Gem::manage_gems
-
 require 'rake'
-require 'rake/clean'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'fileutils'
-include FileUtils
-
-$:.unshift File.join(File.dirname(__FILE__), "lib")
 
-NAME = "rss-client"
-
-RDOC_FILES = %w[
+begin
+  require 'jeweler'
+  project_name = "rss-client"
+  rdoc_files = %w[
   lib
-  README
-  MIT-LICENSE
-]
-
-RDOC_OPTS  = %w[
+  README.rdoc
+  LICENSE
+  ]
+  rdoc_opts  = %w[
   --line-numbers
   --inline-source
   --all
   --quiet
-  --title RSSClient:\ Fetching\ and\ parsing\ RSS\ feeds\ with\ easy
-  --main README
+  --title rss-client:\ Fetching\ and\ parsing\ RSS\ feeds\ with\ easy
+  --main README.rdoc
   --exclude "^(_darcs|.hg|.svn|spec|bin|pkg)/"
-]
-
-load 'rake_tasks/annotations.rake'
+  ]
 
-spec = Gem::Specification.new do |s| 
-  s.name = NAME
-  s.version = "2.0.9"
-  s.author = "Stoyan Zhekov"
-  s.email = "stoyan@gmail.com"
-  s.rubyforge_project = NAME
-  s.homepage = "http://www.assembla.com/wiki/show/#{NAME}"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Fetching and parsing RSS feeds with easy"
-  s.files = (RDOC_FILES + %w[install.rb] + %w[Rakefile] + Dir["{bin,lib,rake_tasks,spec}/**/*"]).uniq
-  s.test_files = Dir['spec/spec_*.rb']
-  s.require_path = "lib"
-  s.bindir = "bin"
-  s.executables = ['rssclient']
-  s.default_executable = 'rssclient'
-  s.has_rdoc = true
-  s.extra_rdoc_files = RDOC_FILES
-  s.rdoc_options = RDOC_OPTS
-  s.add_dependency("feed-normalizer", ">= 1.4.0")
+  Jeweler::Tasks.new do |gem|
+    gem.name = project_name
+    gem.summary = %Q{Fetching and parsing RSS feeds with easy}
+    gem.description = %Q{Ruby library for fetching (http-access2) and parsing (feed-normalizer) RSS (and Atom) feeds.}
+    gem.email = "zh@zhware.net"
+    gem.homepage = "http://github.com/zh/#{project_name}"
+    gem.authors = ["Stoyan Zhekov"]
+    gem.rubyforge_project = project_name
+    gem.platform = Gem::Platform::RUBY
+    gem.files = (rdoc_files + %w[Rakefile] + Dir["{bin,lib,rake_tasks,spec}/**/*"]).uniq
+    gem.test_files = Dir['spec/spec_*.rb']
+    gem.require_path = "lib"
+    gem.bindir = "bin"
+    gem.executables = ['rssclient']
+    gem.default_executable = 'rssclient'
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = rdoc_files
+    gem.rdoc_options = rdoc_opts
+    gem.add_dependency('feed-normalizer', '>= 1.4.0')
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
-end
+task :default => :spec
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
 
-desc "package and the gem"
-task :install do
-  name = "#{spec.name}-#{spec.version}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{spec.name}-#{spec.version}.gem}
-end
+task :test => :check_dependencies
 
-desc "uninstall the gem"
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{spec.name}}
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'spec'
+    test.pattern = 'spec/**/*_spec.rb'
+    test.verbose = true
+    test.rcov_opts = %w{--exclude rdoc\/,pkg\/,spec\/}
+  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
 
-desc "generate rdoc"
-task :rdoc => [:clean] do
-  sh "rdoc #{(RDOC_OPTS + RDOC_FILES).join(' ')}"
-end
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
 
-desc "Run all the tests"
-task :test do
-  sh "specrb -Ilib:spec -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
-end
- 
-task :default => "pkg/#{spec.name}-#{spec.version}.gem" do
-    puts "generated latest version"
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rss-client #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/bin/rssclient

@@ -26,10 +26,10 @@
 #   -s, --since         Only changes from {since} seconds ago
 #
 # == Author
-#   Stoyan Zhekov <stoyan@gmail.com>
+#   Stoyan Zhekov <zh@zhware.net>
 #
 # == Copyright
-#   Copyright (c) 2007 Stoyan Zhekov <stoyan@gmail.com>. Licensed under the MIT License:
+#   Copyright (c) 2010 Stoyan Zhekov <zh@zhware.net>. Licensed under the MIT License:
 #   http://www.opensource.org/licenses/mit-license.php
 
 begin
@@ -43,7 +43,7 @@ require 'optparse'
 require 'rdoc/usage'
 
 class App
-  VERSION = '2.0.9'
+  VERSION = '2.0.10'
 
   attr_reader :options
 

data/lib/rss-client.rb

@@ -53,25 +53,35 @@ protected
       return nil unless @rssc_raw
 
       case @rssc_raw.status
-        when 200
-        # good
-        when 301, 302
-          @rssc_raw = get_url(@rssc_raw.header["Location"], opts)
-          return nil unless @rssc_raw
-
-        when 304
-          # Not modified - nothing to do
-          return nil
-	
-	when 401
-	  raise RuntimeError, "access denied, " + @rssc_raw.header['WWW-Authenticate'].to_s
-	when 404
-	  raise RuntimeError, "feed [ #{url} ] not found"
-        else
-          raise RuntimeError, "can't fetch feed (unknown response code: #{@rssc_raw.status})"
+      when 200 # good
+      when 301, 302 # follow redirect ...
+        @rssc_raw = get_url(@rssc_raw.header["Location"], opts)
+        return nil unless @rssc_raw
+
+      when 304 # Not modified - nothing to do
+        return nil
+
+      # errors
+      when 401
+        raise RuntimeError, "access denied, " + @rssc_raw.header['WWW-Authenticate'].to_s
+      when 404
+        raise RuntimeError, "feed [ #{url} ] not found"
+      else
+        raise RuntimeError, "can't fetch feed (unknown response code: #{@rssc_raw.status})"
       end
+
+      return nil unless @rssc_raw.content
+
       # Parse the raw RSS
-      return @rssc_raw.content ? FeedNormalizer::FeedNormalizer.parse(@rssc_raw.content) : nil
+      begin
+        FeedNormalizer::FeedNormalizer.parse(@rssc_raw.content, :try_others => true)
+      rescue NoMethodError
+        # undefined method `channel' for #<RSS::Atom::Feed:0x9f03b70>
+        # try a simpler parser ...
+        FeedNormalizer::FeedNormalizer.parse(@rssc_raw.content,
+          :try_others => true, :force_parser => FeedNormalizer::SimpleRssParser
+        )
+      end
     rescue RuntimeError => error
       @rssc_error = error
       return nil

data/spec/helper.rb

@@ -1,10 +1,3 @@
-begin
-  require 'bacon'
-rescue LoadError
-  require 'rubygems'
-  require 'bacon'
-end
-
-rssclient_dir = File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-$LOAD_PATH.unshift(rssclient_dir)
-require 'rss-client'
+$LOAD_PATH.unshift 'lib'
+require 'rubygems'
+require 'rss-client'

data/spec/{spec_http_access2.rb → spec_http_access2_spec.rb}

@@ -7,7 +7,7 @@ describe 'http-access2' do
   end
 
   it 'should have an object identity' do
-    @client.should.not.be.same_as HTTPAccess2::Client.new
+    @client.should_not == HTTPAccess2::Client.new
   end
 
 end

data/spec/spec_rss_client_spec.rb

@@ -0,0 +1,40 @@
+require 'spec/helper'
+
+class RSSFeed
+  include RSSClient
+
+  def self.fetch(*args)
+    self.new.fetch(*args)
+  end
+
+  def fetch(url)
+    get_feed url, OpenStruct.new
+  end
+end
+
+describe RSSClient do
+  describe 'basics' do
+    before do
+      @feed = RSSFeed.new
+    end
+
+    it 'should have an object identity' do
+      @feed.should_not == RSSFeed.new
+    end
+
+    it 'should have useful defaults' do
+      @feed.rssc_error.should == nil
+      @feed.rssc_raw.should == nil
+    end
+  end
+
+  describe 'parsing' do
+    it 'can read a normal feed' do
+      RSSFeed.fetch('http://rubyforge.org/export/rss_sfnews.php').entries.size.should >= 5
+    end
+
+    it 'can read weird feeds' do
+      RSSFeed.fetch('http://dotmovfest.blogspot.com/feeds/posts/default').entries.size.should >= 5
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rss-client
 version: !ruby/object:Gem::Version 
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors: 
 - Stoyan Zhekov
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-18 00:00:00 +09:00
+date: 2010-01-05 00:00:00 +09:00
 default_executable: rssclient
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: feed-normalizer
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,35 +22,31 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
-description: 
-email: stoyan@gmail.com
+description: Ruby library for fetching (http-access2) and parsing (feed-normalizer) RSS (and Atom) feeds.
+email: zh@zhware.net
 executables: 
 - rssclient
 extensions: []
 
 extra_rdoc_files: 
-- lib
-- README
-- MIT-LICENSE
+- LICENSE
+- README.rdoc
 files: 
-- lib
-- README
-- MIT-LICENSE
-- install.rb
+- LICENSE
+- README.rdoc
 - Rakefile
 - bin/rssclient
 - lib/rss-client.rb
-- lib/rss-client
 - lib/rss-client/http-access2.rb
-- lib/rss-client/http-access2
 - lib/rss-client/http-access2/cookie.rb
 - lib/rss-client/http-access2/http.rb
-- rake_tasks/annotations.rake
 - spec/helper.rb
-- spec/spec_http_access2.rb
-- spec/spec_rss_client.rb
+- spec/spec_http_access2_spec.rb
+- spec/spec_rss_client_spec.rb
 has_rdoc: true
-homepage: http://www.assembla.com/wiki/show/rss-client
+homepage: http://github.com/zh/rss-client
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -57,9 +54,9 @@ rdoc_options:
 - --all
 - --quiet
 - --title
-- "RSSClient: Fetching and parsing RSS feeds with easy"
+- "rss-client: Fetching and parsing RSS feeds with easy"
 - --main
-- README
+- README.rdoc
 - --exclude
 - "\"^(_darcs|.hg|.svn|spec|bin|pkg)/\""
 require_paths: 
@@ -79,10 +76,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rss-client
-rubygems_version: 1.0.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Fetching and parsing RSS feeds with easy
 test_files: 
-- spec/spec_http_access2.rb
-- spec/spec_rss_client.rb
+- spec/spec_http_access2_spec.rb
+- spec/spec_rss_client_spec.rb

data/install.rb

@@ -1,84 +0,0 @@
-require 'rbconfig'
-require 'find'
-require 'ftools'
-
-include Config
-
-$ruby = CONFIG['ruby_install_name']
-
-##
-# Install a binary file. We patch in on the way through to
-# insert a #! line. If this is a Unix install, we name
-# the command (for example) 'rssclient' and let the shebang line
-# handle running it. Under windows, we add a '.rb' extension
-# and let file associations to their stuff
-#
-
-def installBIN(from, opfile)
-
-  tmp_dir = nil
-  for t in [".", "/tmp", "c:/temp", $bindir]
-    stat = File.stat(t) rescue next
-    if stat.directory? and stat.writable?
-      tmp_dir = t
-      break
-    end
-  end
-
-  fail "Cannot find a temporary directory" unless tmp_dir
-  tmp_file = File.join(tmp_dir, "_tmp")
-    
-  File.open(from) do |ip|
-    File.open(tmp_file, "w") do |op|
-      ruby = File.join($realbindir, $ruby)
-      op.puts "#!#{ruby} -w"
-      op.write ip.read
-    end
-  end
-
-  opfile += ".rb" if CONFIG["target_os"] =~ /mswin/i
-  File::install(tmp_file, File.join($bindir, opfile), 0755, true)
-  File::unlink(tmp_file)
-end
-
-$sitedir = CONFIG["sitelibdir"]
-unless $sitedir
-  version = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-  $libdir = File.join(CONFIG["libdir"], "ruby", version)
-  $sitedir = $:.find {|x| x =~ /site_ruby/}
-  if !$sitedir
-    $sitedir = File.join($libdir, "site_ruby")
-  elsif $sitedir !~ Regexp.quote(version)
-    $sitedir = File.join($sitedir, version)
-  end
-end
-
-$bindir =  CONFIG["bindir"]
-
-$realbindir = $bindir
-
-bindir = CONFIG["bindir"]
-if (destdir = ENV['DESTDIR'])
-  $bindir  = destdir + $bindir
-  $sitedir = destdir + $sitedir
-  
-  File::makedirs($bindir)
-  File::makedirs($sitedir)
-end
-
-# The library files
-
-files = Dir.chdir('lib') { Dir['**/*.rb'] }
-
-for fn in files
-  fn_dir = File.dirname(fn)
-  target_dir = File.join($sitedir, fn_dir)
-  if ! File.exist?(target_dir)
-    File.makedirs(target_dir)
-  end
-  File::install(File.join('lib', fn), File.join($sitedir, fn), 0644, true)
-end
-
-# and the executable
-
-installBIN("bin/rssclient", "rssclient")

data/rake_tasks/annotations.rake

@@ -1,84 +0,0 @@
-class SourceAnnotationExtractor
-  class Annotation < Struct.new(:line, :tag, :text)
-    def to_s(options={})
-      s = "[%3d] " % line
-      s << "[#{tag}] " if options[:tag]
-      s << text
-    end
-  end
-
-  def self.enumerate(tag, options={})
-    extractor = new(tag)
-    extractor.display(extractor.find, options)
-  end
-
-  attr_reader :tag
-
-  def initialize(tag)
-    @tag = tag
-  end
-
-  def find(dirs=%w(app lib test))
-    dirs.inject({}) { |h, dir| h.update(find_in(dir)) }
-  end
-
-  def find_in(dir)
-    results = {}
-
-    Dir.glob("#{dir}/*") do |item|
-      next if File.basename(item)[0] == ?.
-
-      if File.directory?(item)
-        results.update(find_in(item))
-      elsif item =~ /\.(builder|(r(?:b|xml|js)))$/
-        results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
-      elsif item =~ /\.(rhtml|erb)$/
-        results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
-      end
-    end
-
-    results
-  end
-
-  def extract_annotations_from(file, pattern)
-    lineno = 0
-    result = File.readlines(file).inject([]) do |list, line|
-      lineno += 1
-      next list unless line =~ pattern
-      list << Annotation.new(lineno, $1, $2)
-    end
-    result.empty? ? {} : { file => result }
-  end
-
-  def display(results, options={})
-    results.keys.sort.each do |file|
-      puts "#{file}:"
-      results[file].each do |note|
-        puts "  * #{note.to_s(options)}"
-      end
-      puts
-    end
-  end
-end
-
-desc "Enumerate all annotations"
-task :notes do
-  SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", :tag => true
-end
-
-namespace :notes do
-  desc "Enumerate all OPTIMIZE annotations"
-  task :optimize do
-    SourceAnnotationExtractor.enumerate "OPTIMIZE"
-  end
-
-  desc "Enumerate all FIXME annotations"
-  task :fixme do
-    SourceAnnotationExtractor.enumerate "FIXME"
-  end
-
-  desc "Enumerate all TODO annotations"
-  task :todo do
-    SourceAnnotationExtractor.enumerate "TODO"
-  end
-end

data/spec/spec_rss_client.rb

@@ -1,22 +0,0 @@
-require 'spec/helper'
-
-class RSSFeed
-  include RSSClient
-end
-
-describe 'rss-client' do
-
-  before do
-    @feed = RSSFeed.new
-  end
-
-  it 'should have an object identity' do
-    @feed.should.not.be.same_as RSSFeed.new
-  end
-
-  it 'should have useful defaults' do
-    @feed.rssc_error.should == nil
-    @feed.rssc_raw.should == nil
-  end
-
-end