yahoo 1.0.0 → 1.1.0

data/Manifest.txt

@@ -4,4 +4,3 @@ README
 Rakefile
 lib/yahoo.rb
 test/test_yahoo.rb
-test/uri_stub.rb

data/Rakefile

@@ -8,7 +8,7 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'yahoo'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.summary = 'Base for Yahoo web services'
   s.description = 'This library makes it easy to implement Yahoo\'s web services APIs.'
   s.author = 'Eric Hodel'
@@ -17,6 +17,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.files = File.read('Manifest.txt').split($/)
   s.require_path = 'lib'
+
+  s.add_dependency 'rc-rest', '>= 1.0.0'
 end
 
 desc 'Run tests'
@@ -24,6 +26,7 @@ task :default => [ :test ]
 
 Rake::TestTask.new('test') do |t|
   t.libs << 'test'
+  t.libs << '../rc-rest/lib'
   t.pattern = 'test/test_*.rb'
   t.verbose = true
 end

data/lib/yahoo.rb

@@ -1,17 +1,16 @@
-require 'open-uri'
-require 'rexml/document'
+require 'rc_rest'
 
 ##
 # Abstract class for implementing Yahoo APIs.
 #
 # http://developer.yahoo.com/
 
-class Yahoo
+class Yahoo < RCRest
 
   ##
   # Yahoo error class.
 
-  class Error < RuntimeError; end
+  class Error < RCRest::Error; end
 
   ##
   # Web services initializer.
@@ -35,36 +34,13 @@ class Yahoo
   end
 
   ##
-  # Extracts and raises an error from +obj+.  Returns if no error could be
-  # found.
+  # Extracts and raises an error from +xml+, if any.
 
-  def check_error(obj)
-    obj = REXML::Document.new obj.read unless REXML::Document === obj
-
-    err = obj.elements['Error']
+  def check_error(xml)
+    err = xml.elements['Error']
     raise Error, err.elements['Message'].text if err
   end
 
-  ##
-  # Performs a GET request with +params+.  Calls the parse_response method on
-  # the concrete class with an REXML::Document instance and returns its
-  # result.
-
-  def get(params)
-    url = make_url params
-
-    url.open do |xml|
-      res = REXML::Document.new xml.read
-
-      check_error res
-
-      return parse_response(res)
-    end
-  rescue OpenURI::HTTPError => e
-    check_error e.io
-    raise
-  end
-
   ##
   # Creates a URL from the Hash +params+.  Automatically adds the appid and
   # sets the output type to 'xml'.
@@ -73,13 +49,7 @@ class Yahoo
     params[:appid] = @appid
     params[:output] = 'xml'
 
-    escaped_params = params.sort_by { |k,v| k.to_s }.map do |k,v|
-      "#{URI.escape k.to_s}=#{URI.escape v.to_s}"
-    end
-
-    url = @url.dup
-    url.query = escaped_params.join '&'
-    return url
+    super params
   end
 
 end

data/test/test_yahoo.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'test/uri_stub'
+require 'rc_rest/uri_stub'
 require 'yahoo'
 
 class Yahoo::Test < Yahoo
@@ -31,18 +31,7 @@ class TestYahoo < Test::Unit::TestCase
     @t = Yahoo::Test.new 'APP_ID'
   end
 
-  def test_check_error_IO
-    io = StringIO.new '<Error><Message>you broked it</Message></Error>'
-    @t.check_error io
-
-  rescue Yahoo::Error => e
-    assert_equal 'you broked it', e.message
-
-  else
-    flunk 'expected an error'
-  end
-
-  def test_check_error_REXML__Document
+  def test_check_error
     xml = REXML::Document.new '<Error><Message>you broked it</Message></Error>'
     @t.check_error xml
 
@@ -53,38 +42,10 @@ class TestYahoo < Test::Unit::TestCase
     flunk 'expected an error'
   end
 
-  def test_get
-    xml = '<Result>stuff</Result>'
-    URI::HTTP.responses << xml
-
-    result = @t.test
-
-    assert_equal xml, result.to_s
-  end
-
-  def test_get_error
-    def @t.make_url(*args) # HACK extend uri_stub with error raising ability
-      u = Object.new
-      def u.open
-        xml = '<Error><Message>you did the bad thing</Message></Error>'
-        raise OpenURI::HTTPError.new('400 Bad Request', StringIO.new(xml))
-      end
-      return u
-    end
-
-    assert_raise Yahoo::Error do @t.test end
-  end
-
-  def test_initialize
-    assert_equal 'http://api.test.yahoo.com/TestService/Vtest/test',
-                 @t.instance_variable_get(:@url).to_s
-  end
-
   def test_make_url
-    url = @t.make_url :test_param_1 => 'test test',
-                      :test_param_2 => 'tset tset'
+    url = @t.make_url :param => 'value'
 
-    expected = 'http://api.test.yahoo.com/TestService/Vtest/test?appid=APP_ID&output=xml&test_param_1=test%20test&test_param_2=tset%20tset'
+    expected = 'http://api.test.yahoo.com/TestService/Vtest/test?appid=APP_ID&output=xml&param=value'
 
     assert_equal expected, url.to_s
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.15
+rubygems_version: 0.8.99
 specification_version: 1
 name: yahoo
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-06-10 00:00:00 -07:00
+  version: 1.1.0
+date: 2006-06-16 00:00:00 -07:00
 summary: Base for Yahoo web services
 require_paths: 
 - lib
@@ -35,7 +35,6 @@ files:
 - Rakefile
 - lib/yahoo.rb
 - test/test_yahoo.rb
-- test/uri_stub.rb
 test_files: []
 
 rdoc_options: []
@@ -48,5 +47,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rc-rest
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 

data/test/uri_stub.rb

@@ -1,17 +0,0 @@
-require 'open-uri'
-
-class URI::HTTP
-
-  class << self
-    attr_accessor :responses, :uris
-  end
-
-  alias original_open open
-
-  def open
-    self.class.uris << self.to_s
-    yield StringIO.new(self.class.responses.shift)
-  end
-
-end
-