term-extraction 0.1.4 → 1.0.0

data/Gemfile

@@ -1,8 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 gem 'rdoc'
 gem 'nokogiri', '>=1.0.7'
+gem 'addressable'
 
 group :development do
   gem 'jeweler'

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    addressable (2.3.5)
     fakeweb (1.3.0)
     git (1.2.5)
     jeweler (1.6.4)
@@ -21,6 +22,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
   fakeweb
   jeweler
   mocha

data/README.rdoc

@@ -0,0 +1,28 @@
+= term_extraction
+
+== DESCRIPTION:
+
+Provides access to term extraction APIs such as Yahoo! YQL and Zemanta.
+
+== SYNOPSIS:
+
+  # Query Yahoo! for terms
+  yahoo = TermExtraction::Yahoo.new(:context => 'Italian sculptors and painters of the renaissance favored the Virgin Mary for inspiration')
+  yahoo.terms # => ["Italian sculptors", "the Virgin Mary"]
+
+  # Query Zemanta for terms
+  zemanta = TermExtraction::Zemanta.new(:api_key => 'myApiKey', :context => 'apple imac')
+  zemanta.terms # => ["Apple", "IMac", "Rumor", "Hardware", "Nvidia", "Macintosh", "Desktops", "AllInOne"]
+
+== INSTALL:
+
+  gem install term-extraction # require 'term_extraction'
+
+Or in your `Gemfile`:
+
+  gem 'term-extraction', require => 'term_extraction'
+
+COPYRIGHT
+=========
+
+Copyright (c) 2011 Stateless Systems (http://statelesssystems.com). See LICENSE for details.

data/VERSION.yml

@@ -1,4 +1,5 @@
---- 
-:minor: 1
-:patch: 4
-:major: 0
+---
+:major: 1
+:minor: 0
+:patch: 0
+:build: 

data/lib/term_extraction/yahoo.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'uri'
 require 'addressable/uri'
 require 'open-uri'
 
@@ -20,9 +21,7 @@ class TermExtraction
     def uri
       api_uri = Addressable::URI.parse(gateway)
       api_uri.query_values = {
-         'appid'   => @api_key,
-         'output'  => 'xml',
-         'context' => @context
+        'q' => "select * from search.termextract where context=\"#{@context}\""
       }
       api_uri
     end
@@ -39,7 +38,7 @@ class TermExtraction
       end
 
       def gateway
-        'http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction'
+        'http://query.yahooapis.com/v1/public/yql'
       end
 
       def remote_xml

data/lib/term_extraction/zemanta.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 require 'nokogiri'
-require 'addressable/uri'
+require 'uri'
 
 class TermExtraction
   class Zemanta < TermExtraction
@@ -16,7 +16,7 @@ class TermExtraction
     end
 
     def uri
-      Addressable::URI.parse(gateway)
+      URI.parse gateway
     end
 
     def post_params

data/term-extraction.gemspec

@@ -4,23 +4,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{term-extraction}
-  s.version = "0.1.4"
+  s.name = "term-extraction"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["alex"]
-  s.date = %q{2011-10-27}
-  s.description = %q{Term extraction library}
-  s.email = %q{alexrabarts@gmail.com}
+  s.date = "2013-09-13"
+  s.description = "Term extraction library"
+  s.email = "alexrabarts@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-    "README"
+    "README.rdoc"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README",
+    "README.rdoc",
     "Rakefile",
     "VERSION.yml",
     "lib/term_extraction.rb",
@@ -34,10 +34,10 @@ Gem::Specification.new do |s|
     "test/term_extraction_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/alexrabarts/term_extraction}
+  s.homepage = "http://github.com/alexrabarts/term_extraction"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{Provides access to term extraction APIs such as Yahoo! Term Extraction API and Zemanta.}
+  s.rubygems_version = "1.8.25"
+  s.summary = "Provides access to term extraction APIs such as Yahoo! Term Extraction API and Zemanta."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -46,17 +46,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.0.7"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 1.0.7"])
+      s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 1.0.7"])
+    s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/test/fixtures/yahoo.xml

@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
-<ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:cate" xsi:schemaLocation="urn:yahoo:cate http://api.search.yahoo.com/ContentAnalysisService/V1/TermExtractionResponse.xsd"><Result>gears of war</Result><Result>gears</Result></ResultSet>
-<!-- ws04.search.scd.yahoo.com uncompressed/chunked Thu Feb 26 21:04:16 PST 2009 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<query xmlns:yahoo="http://www.yahooapis.com/v1/base.rng" yahoo:count="2" yahoo:created="2013-09-13T12:16:37Z" yahoo:lang="en-US"><results><Result xmlns="urn:yahoo:cate">gears of war</Result><Result xmlns="urn:yahoo:cate">gears</Result></results></query><!-- total: 24 -->
+<!-- engine2.yql.bf1.yahoo.com -->

data/test/fixtures/yahoo2.xml

@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
-<ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:cate" xsi:schemaLocation="urn:yahoo:cate http://api.search.yahoo.com/ContentAnalysisService/V1/TermExtractionResponse.xsd"><Result>fears of war</Result><Result>fears</Result></ResultSet>
-<!-- ws04.search.scd.yahoo.com uncompressed/chunked Thu Feb 26 21:04:16 PST 2009 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<query xmlns:yahoo="http://www.yahooapis.com/v1/base.rng" yahoo:count="2" yahoo:created="2013-09-13T12:16:37Z" yahoo:lang="en-US"><results><Result xmlns="urn:yahoo:cate">fears of war</Result><Result xmlns="urn:yahoo:cate">fears</Result></results></query><!-- total: 24 -->
+<!-- engine2.yql.bf1.yahoo.com -->

data/test/term_extraction_test.rb

@@ -1,30 +1,40 @@
 require File.dirname(__FILE__) + '/test_helper'
+require 'addressable/uri'
 
 class TermExtractionTest < Test::Unit::TestCase
   should 'return correct terms from Yahoo!' do
     yahoo = TermExtraction::Yahoo.new
     fake_uri(:get, yahoo.uri, 'yahoo.xml')
-    assert_equal yahoo.terms, correct_yahoo_terms
+    assert_equal correct_yahoo_terms, yahoo.terms
   end
   
   should 'return correct terms from Zemanta' do
     zemanta = TermExtraction::Zemanta.new
     fake_uri(:post, zemanta.uri, 'zemanta.xml')
-    assert_equal zemanta.terms, correct_zemanta_terms
+    assert_equal correct_zemanta_terms, zemanta.terms
+  end
+
+  should 'set the correct API uri for Yahoo!' do
+    yahoo = TermExtraction::Yahoo.new(:context => 'the context')
+    uri = Addressable::URI.parse('http://query.yahooapis.com/v1/public/yql')
+    uri.query_values = {
+      'q' => "select * from search.termextract where context=\"the context\""
+    }
+    assert_equal uri.to_s, yahoo.uri.to_s
   end
 
   should 'be able to set the context after initialization' do
     yahoo         = TermExtraction::Yahoo.new
     context       = 'foo'
     yahoo.context = context
-    assert_equal yahoo.context, context
+    assert_equal context, yahoo.context
   end
 
   should 'be able to set the api key after initialization' do
     zemanta         = TermExtraction::Zemanta.new
     context         = 'bar'
     zemanta.context = context
-    assert_equal zemanta.context, context
+    assert_equal context, zemanta.context
   end
 
   should 'return different response on subsequent calls when different data is returned from Yahoo!' do
@@ -59,4 +69,4 @@ class TermExtractionTest < Test::Unit::TestCase
     def correct_zemanta_terms
       ['Apple', 'IMac', 'Rumor', 'Hardware', 'Nvidia', 'Macintosh', 'Desktops', 'AllInOne']
     end
-end
+end

metadata

@@ -1,95 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: term-extraction
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - alex
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.7
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Term extraction library
 email: alexrabarts@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README
-files: 
+- README.rdoc
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - VERSION.yml
 - lib/term_extraction.rb
@@ -102,39 +115,32 @@ files:
 - test/fixtures/zemanta2.xml
 - test/term_extraction_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/alexrabarts/term_extraction
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -731793109204494660
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Provides access to term extraction APIs such as Yahoo! Term Extraction API and Zemanta.
+summary: Provides access to term extraction APIs such as Yahoo! Term Extraction API
+  and Zemanta.
 test_files: []
-

data/README

@@ -1,31 +0,0 @@
-= term_extraction
-
-== DESCRIPTION:
-
-Provides access to term extraction APIs such as Yahoo! Term Extraction API and
-Zemanta.
-
-== SYNOPSIS:
-
-  # Query Yahoo! for terms
-  yahoo = TermExtraction::Yahoo.new(:api_key => 'myApiKey', :context => 'xbox 360 gears of war')
-  yahoo.terms # => ["gears of war", "xbox 360", "gears", "xbox"]
-
-  # Query Zemanta for terms
-  zemanta = TermExtraction::Zemanta.new(:api_key => 'myApiKey', :context => 'apple imac')
-  zemanta.terms # => ["Apple", "IMac", "Rumor", "Hardware", "Nvidia", "Macintosh", "Desktops", "AllInOne"]
-
-== INSTALL:
-
-* Via git:
-
-    git clone git://github.com/alexrabarts/term_extraction.git
-
-* Via gem:
-
-    gem install alexrabarts-term_extraction -s http://gems.github.com
-
-COPYRIGHT
-=========
-
-Copyright (c) 2009 Stateless Systems (http://statelesssystems.com). See LICENSE for details.