livedoor-feeddiscover 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,9 @@
-== 0.1.0 / 2007-06-16
+== 1.1.0 / 2007-06-23
+
+* set default User-Agent header as follow.
+
+    livedoor-feeddiscover/x.y.z (+http://feeddiscoverapi.rubyforge.org)
+
+== 1.0.0 / 2007-06-16
 
 * Initial release

data/Manifest.txt

@@ -21,3 +21,4 @@ spec/livedoor/api/feed_discover/feed_spec.rb
 spec/livedoor/api/feed_discover/version_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+test/spec_runner.rb

data/README.txt

@@ -19,7 +19,7 @@ So, livedoor-feeddiscover do not access the target URL.
   # find feed of matz blog.
   matzblog = Livedoor::API::FeedDiscover.find(
     "http://www.rubyist.net/~matz/",
-    "User-Agent" => "livedoor-feeddiscover/#{Livedoor::API::FeedDiscover::VERSION::STRING}")
+    "User-Agent" => "YourCoolApp/1.0 (+http://your.cool.app)")
   if matzblog.feeds?
     puts matzblog.feed.source             # specified argument
     puts matzblog.feed.link               # blog link
@@ -52,11 +52,16 @@ So, livedoor-feeddiscover do not access the target URL.
   end
 
 
+=== DEFAULT USERAGENT
+
+  livedoor-feeddiscover/x.y.z (+http://feeddiscoverapi.rubyforge.org)
+
+
 === BENCHMARK
 
 vs feed-discover[http://rubyforge.org/projects/feed-discover/].
 
-  > ruby examples\benchmark.rb
+  > ruby examples/benchmark.rb
   Start auto-discover for 4 blogs ------------------------------------
   http://www.rubyist.net/~matz/
   http://rubyforge.org/

data/Rakefile

@@ -75,7 +75,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.url = HOMEPATH
 
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["spec/**/*_spec.rb"]
+  p.test_globs = ["test/spec_runner.rb"]
   p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
 
   p.summary = p.paragraphs_of('README.txt', 2..2)[0]
@@ -87,15 +87,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.need_tar = true
 end
 
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
 desc 'Release the website and new gem version'
-task :deploy => [:check_manifest!, :check_version, :publish_docs, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
-end
+task :deploy => [:check_manifest!, :check_version, :publish_docs, :release]
 
 task :check_manifest! => [:check_manifest] do
   unless $?.success?
@@ -114,13 +107,22 @@ task :check_version do
     puts "Please update your version.rb to match the release version, currently #{VERS}"
     exit
   end
+  histver = File.read("History.txt")[/^== (\d+\.\d+\.\d+)/, 1]
+  unless ENV['VERSION'] == histver
+    puts "Please update your History.txt to match the release version, currently #{histver}"
+    exit
+  end
 end
 
+# remove :test task defined by Hoe.
+remove_tasks :test, :test_deps, :default
+
 desc "Run the specs under spec/models"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
+task :test => [:spec]
 
 desc "Default task is to run specs"
 task :default => :spec
@@ -131,7 +133,7 @@ task :default => :spec
 
 desc 'Uninstall the gem package'
 task_for_windows :uninstall_gem do
-  sh "gem.bat uninstall #{GEM_NAME}"
+  sh "gem.bat uninstall #{ENV['GEMOPTS']} #{GEM_NAME}"
 end
 
 
@@ -140,7 +142,7 @@ end
 #
 
 task_for_windows :install_gem do
-  sh "gem.bat install pkg/*.gem"
+  sh "gem.bat install #{ENV['GEMOPTS']} pkg/*.gem"
 end
 
 task_for_windows :ridocs do
@@ -158,9 +160,8 @@ task :docs do
 end
 
 task_for_windows :publish_docs do
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
   with_temporary_rename("doc", "html") {
-    Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, config["username"]).upload
+    Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, @rubyforge_username).upload
   }
 end
 
@@ -195,8 +196,5 @@ override_task :post_news do
   puts "Posted to rubyforge `#{subject}'."
   rm_f NEWS_FILE
 end
-task :clean do
-  rm_f NEWS_FILE
-end
 
 # vim: syntax=Ruby

data/examples/mkopml.rb

@@ -36,10 +36,13 @@ def main
     exit 1
   end
 
-  unless feedlist.feeds?
-    exit 2
+  nofeed = ARGV - feedlist.map{|e| e.source }
+  nofeed.each do |e|
+    $stderr.puts "feed not found: #{e}"
   end
 
+  exit 2 unless feedlist.feeds?
+
   with_output_stream(output) do |w|
     w.puts feedlist.opml
   end

data/lib/livedoor/api/feed_discover/client.rb

@@ -18,9 +18,13 @@ module Livedoor::API::FeedDiscover
   class Client
 
     BASE_URI = URI("http://rpc.reader.livedoor.com/feed/discover").freeze
+    DEFAULT_USERAGENT = "livedoor-feeddiscover/#{Livedoor::API::FeedDiscover::VERSION::STRING} (+http://feeddiscoverapi.rubyforge.org)"
 
     def initialize(header = nil)
-      @http_header = (header || {}).dup
+      @http_header = {
+        "User-Agent" => DEFAULT_USERAGENT,
+      }
+      @http_header.update(header) if header
     end
 
     def http_header

data/lib/livedoor/api/feed_discover/version.rb

@@ -3,7 +3,7 @@ module Livedoor
     module FeedDiscover
       module VERSION
         MAJOR = 1
-        MINOR = 0
+        MINOR = 1
         TINY  = 0
 
         STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/livedoor/api/feed_discover/client_spec.rb

@@ -5,6 +5,48 @@ describe Livedoor::API::FeedDiscover::Client do |*arg|
     @client = Livedoor::API::FeedDiscover::Client.new
   end
 
+  it "#initialize take http header" do
+    client = Livedoor::API::FeedDiscover::Client.new(
+      "User-Agent" => "foo/1.0",
+      "X-FooBar" => "foobarbaz"
+    )
+    client.http_header.should be_an_instance_of(Hash)
+    client.http_header.keys.length.should eql(2)
+
+    client.http_header.should be_has_key("User-Agent")
+    client.http_header["User-Agent"].should eql("foo/1.0")
+
+    client.http_header.should be_has_key("X-FooBar")
+    client.http_header["X-FooBar"].should eql("foobarbaz")
+  end
+
+  it "#initialize can take Hash" do
+    client = Livedoor::API::FeedDiscover::Client.new({
+      "User-Agent" => "foo/1.0",
+      "X-FooBar" => "foobarbaz",
+    });
+    client.http_header.should be_an_instance_of(Hash)
+    client.http_header.keys.length.should eql(2)
+
+    client.http_header.should be_has_key("User-Agent")
+    client.http_header["User-Agent"].should eql("foo/1.0")
+
+    client.http_header.should be_has_key("X-FooBar")
+    client.http_header["X-FooBar"].should eql("foobarbaz")
+  end
+
+  it "should set DEFAULT_USERAGENT to http header" do
+    client = Livedoor::API::FeedDiscover::Client.new
+    client.http_header.should be_an_instance_of(Hash)
+    client.http_header.keys.length.should eql(1)
+
+    client.http_header.should be_has_key("User-Agent")
+    client.http_header["User-Agent"].should eql(client.class::DEFAULT_USERAGENT)
+
+    client = Livedoor::API::FeedDiscover::Client.new(nil)
+    client.http_header["User-Agent"].should eql(client.class::DEFAULT_USERAGENT)
+  end
+
   it "#find should find feed from specified URL" do
     feedlist = @client.find("http://rubyforge.org/")
     feedlist.should be_an_instance_of(Livedoor::API::FeedDiscover::FeedList)

data/spec/spec_helper.rb

@@ -1,28 +1,33 @@
 require 'rubygems'
 require 'spec'
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
-require "livedoor/api/feed_discover"
+under_gem = Gem.path.any?{|path| /\A#{Regexp.quote(path)}/i =~ Dir.pwd }
+if under_gem
+  require "livedoor/api/feed_discover"
+else
+  $LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
+  require "livedoor/api/feed_discover"
 
+  require "open-uri"
+  require "tempfile"
+  require "digest"
+  require "fileutils"
 
-require "open-uri"
-require "tempfile"
-require "digest"
-
-# local cache for test.
-class URI::HTTP
-  def open(*rest, &block)
-    cachedir = File.join(File.dirname(__FILE__), ".cache")
-    cache = File.join(cachedir, Digest::MD5.hexdigest(self.to_s))
-    Dir.mkdir(cachedir) unless File.exist?(cachedir)
-    unless File.exist?(cache)
-      puts "fetch #{self}"
-      File.open(cache, "wb") do |w|
-        OpenURI.open_uri(self, *rest) do |r|
-          w.write r.read
+  # local cache for test.
+  class URI::HTTP
+    def open(*rest, &block)
+      cachedir = File.join(File.dirname(__FILE__), ".cache")
+      cache = File.join(cachedir, Digest::MD5.hexdigest(self.to_s))
+      FileUtils.mkdir_p(cachedir)
+      unless File.exist?(cache)
+        puts "fetch #{self}"
+        File.open(cache, "wb") do |w|
+          OpenURI.open_uri(self, *rest) do |r|
+            w.write r.read
+          end
         end
       end
+      File.open(cache, "rb", &block)
     end
-    File.open(cache, "rb", &block)
   end
 end

data/test/spec_runner.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '../spec/spec_helper.rb')
+
+class SpecRunner < Test::Unit::TestCase
+
+  def with_save_behaviour_runner
+    old_behaviour_runner = defined?($behaviour_runner) ? $behaviour_runner : nil
+    begin
+      yield
+    ensure
+      $behaviour_runner = old_behaviour_runner if old_behaviour_runner
+    end
+  end
+
+  def test_spec
+    argv = Dir.glob(File.join(File.dirname(__FILE__), '../spec/**/*_spec.rb'))
+    failures = with_save_behaviour_runner {
+      $behaviour_runner = Spec::Runner::OptionParser.new.create_behaviour_runner(argv, $stdout, $stderr, true)
+      $behaviour_runner.run(argv, false)
+    }
+    unless failures.zero?
+      fail "#{failures} failure(s)."
+    end
+  end
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: livedoor-feeddiscover
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-06-17 00:00:00 +09:00
+  version: 1.1.0
+date: 2007-06-24 00:00:00 +09:00
 summary: livedoor-feeddiscover performs feed autodiscovery using the livedoor Feed Discover API.
 require_paths: 
 - lib
@@ -52,11 +52,9 @@ files:
 - spec/livedoor/api/feed_discover/version_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- test/spec_runner.rb
 test_files: 
-- spec/livedoor/api/feed_discover/client_spec.rb
-- spec/livedoor/api/feed_discover/feed_list_spec.rb
-- spec/livedoor/api/feed_discover/feed_spec.rb
-- spec/livedoor/api/feed_discover/version_spec.rb
+- test/spec_runner.rb
 rdoc_options: 
 - --main
 - README.txt