open_calais 0.0.2 → 0.1.0

data/lib/open_calais.rb

@@ -5,6 +5,8 @@ require 'open_calais/version'
 require 'open_calais/configuration'
 require 'open_calais/client'
 
+require 'active_support/all'
+
 module OpenCalais
   extend Configuration
 

data/lib/open_calais/client.rb

@@ -28,14 +28,15 @@ module OpenCalais
     end
 
     def setup(options={})
-      options = OpenCalais.options.merge(options)
-      self.current_options = options
+      opts = Hash[options.map{ |k, v| [k.to_sym, v] }]
+      opts = OpenCalais.options.merge(opts)
+      self.current_options = opts
       Configuration.keys.each do |key|
-        send("#{key}=", options[key])
+        send("#{key}=", opts[key])
       end
     end
 
-    def enrich(text, opts={})
+    def analyze(text, opts={})
       raise 'Specify a value for the text' unless (text && text.length > 0)
       options = current_options.merge(opts)
 
@@ -44,6 +45,11 @@ module OpenCalais
       end
       OpenCalais::Response.new(response)
     end
+
+    # using analyze as a standard method name
+    # enrich is more OpenCalais specific
+    alias_method :enrich, :analyze
+
   end
 
 end

data/lib/open_calais/response.rb

@@ -18,7 +18,7 @@ module OpenCalais
     end
 
     def humanize_topic(topic)
-      topic.gsub('_', ' and ')
+      topic.gsub('_', ' & ').titleize.remove_formatting
     end
 
     def importance_to_score(imp)
@@ -37,11 +37,11 @@ module OpenCalais
       r.each do |k,v|
         case v._typeGroup
         when 'topics'
-          self.topics << {:name => humanize_topic(v.categoryName), :score => v.score, :original => v.categoryName}
+          self.topics << {:name => humanize_topic(v.categoryName), :score => v.score.to_f, :original => v.categoryName}
         when 'socialTag'
-          self.tags << {:name => v.name, :score => importance_to_score(v.importance)}
+          self.tags << {:name => v.name.gsub('_', ' and ').downcase, :score => importance_to_score(v.importance)}
         when 'entities'
-          item = {:guid => k, :name => v.name, :type => v._type}
+          item = {:guid => k, :name => v.name, :type => v._type.remove_formatting.titleize, :score => 1.0}
 
           instances = Array(v.instances).select{|i| i.exact.downcase != item[:name].downcase }
           item[:matches] = instances if instances && instances.size > 0
@@ -49,7 +49,7 @@ module OpenCalais
           if OpenCalais::GEO_TYPES.include?(v._type)
             if (v.resolutions && v.resolutions.size > 0)
               r = v.resolutions.first
-              item[:name]      = r.shortname
+              item[:name]      = r.shortname || r.name
               item[:latitude]  = r.latitude
               item[:longitude] = r.longitude
               item[:country]   = r.containedbycountry if r.containedbycountry
@@ -60,13 +60,15 @@ module OpenCalais
             self.entities << item
           end
         when 'relations'
-          item = v.reject_if{|k,v| k[0] == '_' || k == 'instances'}
-          item[:type] = v._type
+          item = v.reject{|k,v| k[0] == '_' || k == 'instances'} || {}
+          item[:type] = v._type.remove_formatting.titleize
           self.relations << item
         end
       end
 
-      #  remove social tags which are in the topics list already
+      # remove social tags which are in the topics list already
+      topic_names = self.topics.collect{|topic| topic[:name].downcase}
+      self.tags.delete_if{|tag| topic_names.include?(tag[:name]) }
     end
   end
 end

data/lib/open_calais/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module OpenCalais
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/open_calais.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('multi_xml')
   gem.add_runtime_dependency('excon')
   gem.add_runtime_dependency('hashie',  '>= 0.4.0')
+  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: open_calais
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  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
@@ -119,6 +119,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.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
@@ -189,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4380033744204018911
+      hash: -2805080082593624096
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4380033744204018911
+      hash: -2805080082593624096
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23