webtagger 1.0.1 → 1.1.1

data/README.rdoc

@@ -19,6 +19,12 @@ And it's written to support any API in the future.
     tags = WebTagger.tag_with_tagthe(text)
     #some APIs might need an api key, pass that as the second parameter
     tags = WebTagger.tag_with_yahoo(text, "YOUR-API-KEY")
+    #you can also "OR" results together: the first service that responds will be the overall result
+    tags = WebTagger.tag_with_yahoo_or_tagthe_or_alchemy text, {:yahoo=>"YOUR_YAHOO_KEY", :alchemy=>"ALCHEMY_KEY"}
+    #and you can of course "AND" results together: call all of the services:
+    tags = WebTagger.tag_with_yahoo_and_tagthe_and_alchemy text, {:yahoo=>"YOUR_YAHOO_KEY", :alchemy=>"ALCHEMY_KEY"}
+    #however, you can't combine them: this is EXACTLY THE SAME as above :(
+    tags = WebTagger.tag_with_yahoo_and_tagthe_or_alchemy text, {:yahoo=>"YOUR_YAHOO_KEY", :alchemy=>"ALCHEMY_KEY"}
     
 
 WebTagger uses caching so rest assured you won't be throttled by the API providers.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.1

data/lib/webtagger.rb

@@ -31,9 +31,9 @@ class WebTagger
 
                 r = Net::HTTP.post_form URI.parse(opts[:uri]), query
 
-                response = if opts[:json] then JSON.parse(r.body) else r.body end
                 if (100..399) === r.code.to_i
-                    @@cache[text_digest] = response
+                    response = if opts[:json] then JSON.parse(r.body) else r.body end
+                    @@cache[text_digest] = response 
                     callback.call(response)
                 else
                     callback.call(nil)
@@ -79,4 +79,45 @@ class WebTagger
             resp['memes'][0]['dimensions']['topic']
         end
     end
+    
+    #Following good practices as stated here: 
+    #http://technicalpickles.com/posts/using-method_missing-and-respond_to-to-create-dynamic-methods/
+    #Always define respond_to and method_missing together, and define missing methods when they are 
+    #first invoked
+    def self.respond_to?(m_sym, include_private=false)
+        !!(m_sym.to_s =~ /^tag_with.*/)
+    end
+
+    def self.method_missing(name, *args, &block)
+       if name.to_s =~ /^tag_with_[A-Za-z]+\w*/
+         operator = nil
+         methods = []
+         name.to_s.scan /(([A-Za-z]+)_?(and|or)?)+/ do |match|
+             operator ||= match[2]
+             methods << match[1]
+         end
+         
+         #define the method, so as to NOT default to method_missing next time, 'cause
+         #that's slow: the class needs to dispatch twice!
+         class_eval <<-RUBY
+            def self.#{name.to_s}(text, tokens={})
+                results = []
+                #{
+                    methods.collect do |m|
+                        %Q{
+                          #{"return results.flatten! unless results.empty?" if operator == "or"}
+                          response = send("tag_with_#{m}".to_sym, text, tokens["#{m}".to_sym])
+                          results << response if response and !response.empty?
+                        }
+                    end
+                }
+                results.flatten!
+            end
+         RUBY
+         send name, *args
+       else
+           super
+       end
+    end
+
 end #of webtagger module

data/spec/fixtures/yahoo.json

@@ -0,0 +1 @@
+{"ResultSet":{"Result":[]}}

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ file_opener = lambda {|service| File.open("#{File.dirname(__FILE__)}/fixtures/#{
 FakeWeb.register_uri(:post, "http://tagthe.net/api", :body=>file_opener.call("tagthe"))
 FakeWeb.register_uri(:post, "http://access.alchemyapi.com/calls/text/TextGetRankedKeywords",
                      :body=>file_opener.call("alchemy"))
+FakeWeb.register_uri(:post, "http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction",
+                     :body=>file_opener.call("yahoo"))
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/webtagger_spec.rb

@@ -1,18 +1,43 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+#ATTENTION, ACTHUNG, ATENCIÓN:
+#The calls to *yahoo* and *alchemy* require
+#an API token in the actual service
+#but, because I'm using fakeweb here, I can bypass that.
+#IF YOU USE THOSE; REMEMBER TO ADD YOUR API TOKEN AS A 
+#SECOND PARAMETER!
 describe "WebTagger" do
   before(:each) do
      @query = "I'm a very general surgeon, surgeon"
   end
 
-  it "should tag with tagthe" do
+  it "should tag with an individual service" do
    r = WebTagger.tag_with_tagthe @query
    r.should == ["surgeon"]
+
+   r = WebTagger.tag_with_alchemy @query
+   r.should == ["general surgeon"]
+
+   r = WebTagger.tag_with_yahoo @query
+   r.should == nil 
   end
+ 
+  it "should combine results" do
+      r = WebTagger.tag_with_alchemy_and_tagthe @query
+      r.sort.should == ["general surgeon", "surgeon"]
 
-  it "should tag with alchemy" do
-     r = WebTagger.tag_with_alchemy @query
-     r.should == ["general surgeon"]
+      r = WebTagger.tag_with_yahoo_and_alchemy_and_tagthe @query
+      r.sort.should == ["general surgeon", "surgeon"]
   end
 
+  it "should present disjoint results" do
+      r = WebTagger.tag_with_alchemy_or_tagthe @query
+      r.should == ["general surgeon"]
+
+      s = WebTagger.tag_with_tagthe_or_alchemy @query
+      s.should == ["surgeon"]
+
+      s = WebTagger.tag_with_yahoo_or_tagthe_or_alchemy @query
+      s.should == ["surgeon"]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webtagger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - lfborjas
@@ -144,6 +144,7 @@ files:
 - lib/webtagger.rb
 - spec/fixtures/alchemy.json
 - spec/fixtures/tagthe.json
+- spec/fixtures/yahoo.json
 - spec/spec_helper.rb
 - spec/support_spec.rb
 - spec/webtagger_spec.rb