yahoo_content_analysis 0.0.1 → 0.1.0

data/lib/yahoo_content_analysis.rb

@@ -7,6 +7,9 @@ require 'yahoo_content_analysis/connection'
 require 'yahoo_content_analysis/response'
 require 'yahoo_content_analysis/client'
 
+require 'active_support/all'
+require 'stringex'
+
 module YahooContentAnalysis
   extend Configuration
 end

data/lib/yahoo_content_analysis/client.rb

@@ -24,17 +24,18 @@ module YahooContentAnalysis
     end
 
     def setup(options={})
-      options = YahooContentAnalysis.options.merge(options)
-      self.current_options = options
+      opts = Hash[options.map{ |k, v| [k.to_sym, v] }]
+      opts = YahooContentAnalysis.options.merge(opts)
+      self.current_options = opts
       Configuration.keys.each do |key|
-        send("#{key}=", options[key])
+        send("#{key}=", opts[key])
       end
     end
 
     def analyze(content, opts={})      
       raise 'Specify a value for the content' unless content
       response = connection.post do |request|
-        request.params = options(content)
+        request.body = options(content)
       end
       YahooContentAnalysis::Response.new(response)
     end

data/lib/yahoo_content_analysis/response.rb

@@ -18,28 +18,46 @@ module YahooContentAnalysis
       parse(response)
     end
 
+    def humanize_topic(topic)
+      topic.titleize.remove_formatting
+    end
+
     def parse(response)
-      r = response.body['query']['results'] || {} 
+      r = response.body['query']['results'] || {}
       @language = get_language(r['lang'])
 
-      @topics = Array((r['yctCategories'] || {})['yctCategory']).collect do |cat|
-        {:name => cat['content'], :score => cat['score']}
+      yahoo_categories = (r['yctCategories'] || {})['yctCategory'] || []
+      yahoo_categories = [yahoo_categories] unless yahoo_categories.is_a?(Array)
+      @topics = yahoo_categories.collect do |cat|
+        {:name => humanize_topic(cat['content']), :score => cat['score'].to_f, :original=>cat['content']}
       end
 
-      @entities = Array((r['entities'] || {})['entity']).collect do |ent|
-        type = extract_type(ent['types'])
+      yahoo_entities = (r['entities'] || {})['entity'] || []
+      yahoo_entities = [yahoo_entities] unless yahoo_entities.is_a?(Array)
+      entities_hash = yahoo_entities.inject({}) do |hash, ent|
+        name = ent['text']['content']
+        if hash.has_key?(name)
+          existing = hash[name]
+          existing[:score] = [existing[:score], ent['score'].to_f].max
+        else
+          type = extract_type(ent['types'])
 
-        entity = {:name => ent['text']['content'], :score => ent['score']}
-        entity[:type] = type if type
-        entity[:wikipedia_url] = ent['wiki_url'] if ent['wiki_url']
+          entity = {:name => ent['text']['content'], :score => ent['score'].to_f}
+          entity[:type] = type if type
+          entity[:wikipedia_url] = ent['wiki_url'] if ent['wiki_url']
 
-        ## these aren't showing up in any results, so not worrying about them
-        # if cat['related_entities'] && cat['related_entities']['wikipedia']
-        # end
+          ## these aren't showing up in any results, so not worrying about them
+          # if cat['related_entities'] && cat['related_entities']['wikipedia']
+          # end
 
-        entity
+          hash[name] = entity
+        end
+
+        hash
       end
 
+      @entities = entities_hash.values
+
     end
 
     def get_language(lang)
@@ -51,7 +69,7 @@ module YahooContentAnalysis
     def extract_type(h)
       return nil unless (h && h['type'])
       type = h['type'].is_a?(Array) ? h['type'].first : h['type']
-      (type['content'] || '').sub(/^\/(.*)/, '')
+      (type['content'] || '').split('/')[1].remove_formatting.titleize
     end
 
   end

data/lib/yahoo_content_analysis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module YahooContentAnalysis
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/yahoo_content_analysis.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('hashie',  '>= 0.4.0')
   gem.add_runtime_dependency('simple_oauth')
   gem.add_runtime_dependency('language_list')
+  gem.add_runtime_dependency('activesupport')
+  gem.add_runtime_dependency('stringex')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('minitest')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahoo_content_analysis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -135,6 +135,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2699003970576411257
+      hash: 750957635226304825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2699003970576411257
+      hash: 750957635226304825
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23