open_calais 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/open_calais.rb +7 -18
- data/lib/open_calais/client.rb +1 -3
- data/lib/open_calais/configuration.rb +0 -1
- data/lib/open_calais/connection.rb +5 -8
- data/lib/open_calais/version.rb +1 -1
- data/test/client_test.rb +0 -1
- data/test/open_calais_test.rb +0 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a2fdfafb9d1563e07adfb6bf8149e012008ffdfb
|
4
|
+
data.tar.gz: 0638f12eac133c7fa41d58e116e8b9bb8af480d7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2d5c0b3cd56aed6317fff624e417c49c9e1e2f964211ceaf5dcac549c47af363cfad88f8ee312e80b74db54bfa596e7afc10dca8276d89287ca4e6b5c4448928
|
7
|
+
data.tar.gz: f8ec4708f9e19d2c36df508ee6c3147b5e4c78ae93b2d5a3b1b8e161e7d62f5c2e33f7cfa8d921fa6cc70958ea3e94f9affb8a24f1c9f38d5067cd3821d728a8
|
data/lib/open_calais.rb
CHANGED
@@ -14,30 +14,20 @@ module OpenCalais
|
|
14
14
|
:license_id => 'X-AG-Access-Token',
|
15
15
|
:content_type => 'Content-Type',
|
16
16
|
:output_format => 'outputFormat',
|
17
|
-
:
|
18
|
-
:calculate_relevance_score => 'calculateRelevanceScore',
|
19
|
-
:enable_metadata_type => 'enableMetadataType',
|
20
|
-
:doc_rdf_accessible => 'docRDFaccessible',
|
21
|
-
:discard_metadata => 'discardMetadata',
|
22
|
-
:omit_outputting_original_text => 'omitOutputtingOriginalText',
|
23
|
-
:allow_distribution => 'allowDistribution',
|
24
|
-
:allow_search => 'allowSearch',
|
25
|
-
:external_id => 'externalID',
|
26
|
-
:submitter => 'submitter'
|
17
|
+
:language => 'x-calais-language'
|
27
18
|
}
|
28
19
|
|
29
20
|
CONTENT_TYPES = {
|
30
|
-
:xml => '
|
31
|
-
:html => '
|
32
|
-
:htmlraw => '
|
21
|
+
:xml => 'text/xml',
|
22
|
+
:html => 'text/html',
|
23
|
+
:htmlraw => 'text/htmlraw',
|
33
24
|
:raw => 'text/raw'
|
34
25
|
}
|
35
26
|
|
36
27
|
OUTPUT_FORMATS = {
|
37
|
-
:rdf
|
38
|
-
:
|
39
|
-
:
|
40
|
-
:json => 'application/json'
|
28
|
+
:rdf => 'xml/rdf',
|
29
|
+
:n3 => 'text/n3',
|
30
|
+
:json => 'application/json'
|
41
31
|
}
|
42
32
|
|
43
33
|
METADATA_SOCIAL_TAGS = 'SocialTags'
|
@@ -49,5 +39,4 @@ module OpenCalais
|
|
49
39
|
GEO_TYPES = %w(City Continent Country NaturalFeature ProvinceOrState Region)
|
50
40
|
|
51
41
|
DISAMBUGUATIONS = %w(er/Company er/Geo er/Product)
|
52
|
-
|
53
42
|
end
|
data/lib/open_calais/client.rb
CHANGED
@@ -38,7 +38,7 @@ module OpenCalais
|
|
38
38
|
|
39
39
|
def analyze(text, opts={})
|
40
40
|
raise 'Specify a value for the text' unless (text && text.length > 0)
|
41
|
-
options =
|
41
|
+
options = current_options.merge(opts)
|
42
42
|
|
43
43
|
response = connection(options).post do |request|
|
44
44
|
request.body = text
|
@@ -49,7 +49,5 @@ module OpenCalais
|
|
49
49
|
# using analyze as a standard method name
|
50
50
|
# enrich is more OpenCalais specific
|
51
51
|
alias_method :enrich, :analyze
|
52
|
-
|
53
52
|
end
|
54
|
-
|
55
53
|
end
|
@@ -22,20 +22,17 @@ module OpenCalais
|
|
22
22
|
'Accept' => "#{OpenCalais::OUTPUT_FORMATS[:json]};charset=utf-8",
|
23
23
|
|
24
24
|
# open calais default headers
|
25
|
-
OpenCalais::HEADERS[:license_id]
|
26
|
-
OpenCalais::HEADERS[:content_type]
|
27
|
-
OpenCalais::HEADERS[:output_format]
|
28
|
-
OpenCalais::HEADERS[:
|
29
|
-
OpenCalais::HEADERS[:enable_metadata_type] => 'SocialTags',
|
30
|
-
OpenCalais::HEADERS[:doc_rdf_accessible] => 'false',
|
31
|
-
OpenCalais::HEADERS[:omit_outputting_original_text] => 'TRUE' # case matters here, actually
|
25
|
+
OpenCalais::HEADERS[:license_id] => api_key,
|
26
|
+
OpenCalais::HEADERS[:content_type] => OpenCalais::CONTENT_TYPES[:raw],
|
27
|
+
OpenCalais::HEADERS[:output_format] => OpenCalais::OUTPUT_FORMATS[:json],
|
28
|
+
OpenCalais::HEADERS[:language] => 'English'
|
32
29
|
},
|
33
30
|
:ssl => {:verify => false},
|
34
31
|
:url => endpoint
|
35
32
|
}.merge(opts)
|
36
33
|
options[:headers] = options[:headers].merge(headers)
|
37
34
|
OpenCalais::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}
|
38
|
-
options
|
35
|
+
options.select{|k,v| ALLOWED_OPTIONS.include?(k.to_sym)}
|
39
36
|
end
|
40
37
|
|
41
38
|
def connection(options={})
|
data/lib/open_calais/version.rb
CHANGED
data/test/client_test.rb
CHANGED
data/test/open_calais_test.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: open_calais
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrew Kuklewicz
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-06-
|
11
|
+
date: 2015-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|