alexrabarts-term_extraction 0.1.2 → 0.1.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/lib/term_extraction/yahoo.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+require 'addressable/uri'
+require 'open-uri'
 
 class TermExtraction
   class Yahoo < TermExtraction
@@ -13,7 +15,17 @@ class TermExtraction
       end
 
       terms
-    end 
+    end
+
+    def uri
+      api_uri = Addressable::URI.parse(gateway)
+      api_uri.query_values = {
+         'appid'   => @api_key,
+         'output'  => 'xml',
+         'context' => @context
+      }
+      api_uri
+    end
 
     class << self
       def canonical_name
@@ -30,19 +42,8 @@ class TermExtraction
         'http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction'
       end
 
-      def url
-        uri = Addressable::URI.parse(gateway)
-        uri.query_values = {
-           # TODO: Change appid to the BMP one
-           'appid'   => @api_key,
-           'output'  => 'xml',
-           'context' => @context
-        }
-        uri
-      end
-
       def remote_xml
-        open(url).read
+        open(uri).read
       end
   end
 end

data/lib/term_extraction/zemanta.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'nokogiri'
+require 'addressable/uri'
 
 class TermExtraction
   class Zemanta < TermExtraction
@@ -14,6 +15,20 @@ class TermExtraction
       terms
     end
 
+    def uri
+      Addressable::URI.parse(gateway)
+    end
+
+    def post_params
+      {
+        'method'        =>'zemanta.suggest',
+        'api_key'       => @api_key,
+        'return_images' => 0,
+        'text'          => @context,
+        'format'        => 'xml'
+      }
+    end
+
     class << self
       def canonical_name
         'zemanta'
@@ -25,22 +40,8 @@ class TermExtraction
         'http://api.zemanta.com/services/rest/0.0/'
       end
 
-      def url
-        URI.parse(gateway)
-      end
-
-      def post_params
-        {
-          'method'        =>'zemanta.suggest',
-          'api_key'       => @api_key,
-          'return_images' => 0,
-          'text'          => @context,
-          'format'        => 'xml'
-        }
-      end
-
       def remote_xml
-        Net::HTTP.post_form(url, post_params).body
+        Net::HTTP.post_form(uri, post_params).body
       end
   end
 end

data/test/term_extraction_test.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/test_helper'
 class TermExtractionTest < Test::Unit::TestCase
   should 'return correct terms from Yahoo!' do
     yahoo = TermExtraction::Yahoo.new
-    yahoo.stubs(:remote_xml).returns(read_xml_fixture('yahoo'))
+    fake_uri(:get, yahoo.uri, 'yahoo.xml')
     assert_equal yahoo.terms, correct_yahoo_terms
   end
   
   should 'return correct terms from Zemanta' do
     zemanta = TermExtraction::Zemanta.new
-    zemanta.stubs(:remote_xml).returns(read_xml_fixture('zemanta'))
+    fake_uri(:post, zemanta.uri, 'zemanta.xml')
     assert_equal zemanta.terms, correct_zemanta_terms
   end
 
@@ -29,20 +29,28 @@ class TermExtractionTest < Test::Unit::TestCase
 
   should 'return different response on subsequent calls when different data is returned from Yahoo!' do
     yahoo = TermExtraction::Yahoo.new
-    yahoo.stubs(:remote_xml).returns(read_xml_fixture('yahoo'))
+    fake_uri(:get, yahoo.uri, 'yahoo.xml')
     original_terms = yahoo.terms
-    yahoo.stubs(:remote_xml).returns(read_xml_fixture('yahoo2'))
+    fake_uri(:get, yahoo.uri, 'yahoo2.xml')
     assert_not_equal original_terms, yahoo.terms
   end
 
   should 'return different response on subsequent calls when different data is returned from Zemanta' do
     zemanta = TermExtraction::Zemanta.new
-    zemanta.stubs(:remote_xml).returns(read_xml_fixture('zemanta'))
+    fake_uri(:post, zemanta.uri, 'zemanta.xml')
     original_terms = zemanta.terms
-    zemanta.stubs(:remote_xml).returns(read_xml_fixture('zemanta2'))
+    fake_uri(:post, zemanta.uri, 'zemanta2.xml')
     assert_not_equal original_terms, zemanta.terms
   end
 
+  context 'Yahoo!' do
+    should 'be able to handle a context with "%" in it' do
+      yahoo = TermExtraction::Yahoo.new(:context => '%')
+      fake_uri(:get, yahoo.uri, 'yahoo.xml')
+      assert_nothing_thrown{ yahoo.terms }
+    end
+  end
+
   private
     def correct_yahoo_terms
       ['gears of war', 'gears']

data/test/test_helper.rb

@@ -2,12 +2,21 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
+require 'fake_web'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'term_extraction'
 
 class Test::Unit::TestCase
-  def read_xml_fixture(name)
-    File.read("test/fixtures/#{name}.xml")
+  def fake_uri(method, uri, fixture)
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    response = File.open(File.join(File.dirname(__FILE__), 'fixtures', fixture)).read
+    FakeWeb.register_uri(method, uri.to_s, :string => response)
+  end
+
+  def teardown
+    FakeWeb.allow_net_connect = true
+    FakeWeb.clean_registry
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexrabarts-term_extraction
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - alex
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -08:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency