open_calais 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e83c4943a15fe6e32a9ef29e41c98cc93c8f5027
+  data.tar.gz: 74891ffae6746754684263c2ba604686c186af47
+SHA512:
+  metadata.gz: f5bf49e97dd891cdd99932a86754e302a9dd68e5dde6b61149fc1095805652e4dc4b5f82d2b61c916f9b2a01346b171198c35245fa2a1ec9daaafb982be4ffa3
+  data.tar.gz: b5f6f8cc0ff27feacd86c973f3125eb3d286f936c5fb0eed4c82fc4b9f93cd44e02e7da8bd1b4dfdd0b7e4e2a4b10d4680e5f414d5ab0ab1c62e58fe70f54665

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .key
+.ruby-version
 .rbenv-version
 .yardoc
 Gemfile.lock

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "2.1.6"
+  - "2.2.1"

data/README.md

@@ -1,6 +1,18 @@
 # OpenCalais
 
-Ruby gem to access the [OpenCalais API](http://www.opencalais.com/documentation/calais-web-service-api/api-invocation/rest), using the new-ish REST API, and JSON responses.
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)
+[![Build Status](https://travis-ci.org/PRX/open_calais.svg?branch=master)](https://travis-ci.org/PRX/open_calais)
+[![Code Climate](https://codeclimate.com/github/PRX/open_calais/badges/gpa.svg)](https://codeclimate.com/github/PRX/open_calais)
+[![Coverage Status](https://coveralls.io/repos/PRX/open_calais/badge.svg?branch=master)](https://coveralls.io/r/PRX/open_calais?branch=master)
+[![Dependency Status](https://gemnasium.com/PRX/open_calais.svg)](https://gemnasium.com/PRX/open_calais)
+
+### Gem Version 0.1.* supports the original OpenCalais API
+### Gem Version 0.2.* now uses the upgraded API http://new.opencalais.com/upgrade/
+
+If you are upgrading the the new version of the API, you will need a new API key. You should also review the [upgrade guide](http://new.opencalais.com/upgrade/).
+
+This is a ruby gem to access the [OpenCalais API](http://www.opencalais.com/documentation/calais-web-service-api/api-invocation/rest), using the REST API, and JSON responses.
+
 It uses [Faraday](https://github.com/lostisland/faraday) to abstract HTTP library (defaults to use excon because it is excellent), and multi_json to abstract JSON parsing.
 
 It returns a parsed version of the response, but the response also contains the raw response (converted from json to hashes/arrays/string/etc).

data/lib/open_calais.rb

@@ -11,7 +11,7 @@ module OpenCalais
   extend Configuration
 
   HEADERS = {
-    :license_id                    => 'x-calais-licenseID',
+    :license_id                    => 'X-AG-Access-Token',
     :content_type                  => 'Content-Type',
     :output_format                 => 'outputFormat',
     :reltag_base_url               => 'reltagBaseURL',
@@ -30,14 +30,14 @@ module OpenCalais
     :xml     => 'TEXT/XML',
     :html    => 'TEXT/HTML',
     :htmlraw => 'TEXT/HTMLRAW',
-    :raw     => 'TEXT/RAW'
+    :raw     => 'text/raw'
   }
 
   OUTPUT_FORMATS = {
     :rdf          => 'XML/RDF',
     :simple       => 'Text/Simple',
     :microformats => 'Text/Microformats',
-    :json         => 'Application/JSON'
+    :json         => 'application/json'
   }
 
   METADATA_SOCIAL_TAGS = 'SocialTags'

data/lib/open_calais/client.rb

@@ -38,7 +38,7 @@ module OpenCalais
 
     def analyze(text, opts={})
       raise 'Specify a value for the text' unless (text && text.length > 0)
-      options = current_options.merge(opts)
+      options = {params: current_options}.merge(opts)
 
       response = connection(options).post do |request|
         request.body = text

data/lib/open_calais/configuration.rb

@@ -17,7 +17,7 @@ module OpenCalais
     DEFAULT_ADAPTER = :excon
 
     # The api endpoint to get REST info from opencalais
-    DEFAULT_ENDPOINT = 'http://api.opencalais.com/tag/rs/enrich'.freeze
+    DEFAULT_ENDPOINT = 'https://api.thomsonreuters.com/permid/calais'.freeze
 
     # The value sent in the http header for 'User-Agent' if none is set
     DEFAULT_USER_AGENT = "OpenCalais Ruby Gem #{OpenCalais::VERSION}".freeze
@@ -47,7 +47,7 @@ module OpenCalais
 
     # Reset configuration options to their defaults
     def reset!
-      self.api_key       	    = DEFAULT_API_KEY     
+      self.api_key       	    = DEFAULT_API_KEY
       self.adapter            = DEFAULT_ADAPTER
       self.endpoint           = DEFAULT_ENDPOINT
       self.user_agent         = DEFAULT_USER_AGENT
@@ -55,4 +55,4 @@ module OpenCalais
     end
 
   end
-end
+end

data/lib/open_calais/connection.rb

@@ -34,7 +34,7 @@ module OpenCalais
         :url => endpoint
       }.merge(opts)
       options[:headers] = options[:headers].merge(headers)
-      OpenCalais::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}      
+      OpenCalais::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}
       options
     end
 

data/lib/open_calais/response.rb

@@ -38,7 +38,7 @@ module OpenCalais
       r.each do |k,v|
         case v._typeGroup
         when 'topics'
-          self.topics << {:name => humanize_topic(v.categoryName), :score => v.score.to_f, :original => v.categoryName}
+          self.topics << {:name => humanize_topic(v.name), :score => v.score.to_f, :original => v.name}
         when 'socialTag'
           self.tags << {:name => v.name.gsub('_', ' and ').downcase, :score => importance_to_score(v.importance)}
         when 'entities'
@@ -72,4 +72,4 @@ module OpenCalais
       self.tags.delete_if{|tag| topic_names.include?(tag[:name]) }
     end
   end
-end
+end

data/lib/open_calais/version.rb

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

data/open_calais.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency('faraday', ['>= 0.7.4', '< 0.9'])
+  gem.add_runtime_dependency('faraday', '>= 0.7.4')
   gem.add_runtime_dependency('faraday_middleware', '~> 0.9')
   gem.add_runtime_dependency('multi_json', '>= 1.0.3', '~> 1.0')
   gem.add_runtime_dependency('multi_xml')
@@ -29,4 +29,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('minitest')
+  gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('coveralls')
 end

data/test/test_helper.rb

@@ -1,5 +1,13 @@
 # -*- encoding: utf-8 -*-
 
+require 'simplecov'
+SimpleCov.start
+
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 require 'minitest/spec'
 require 'minitest/autorun'
 

metadata

@@ -1,186 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: open_calais
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   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: excon
   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: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a gem to call the OpenCalais improved REST API. http://www.opencalais.com/
@@ -191,7 +192,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -209,33 +211,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/PRX/open_calais
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 644485484940200324
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 644485484940200324
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a gem to call the OpenCalais improved REST API.
 test_files:
 - test/client_test.rb