open_calais 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dddc985b23664df2bceb1d3e76514a8e3380d7ed
-  data.tar.gz: 86e484371ee46d9f7054c2576cdac9dff8b85b8a
+  metadata.gz: a2fdfafb9d1563e07adfb6bf8149e012008ffdfb
+  data.tar.gz: 0638f12eac133c7fa41d58e116e8b9bb8af480d7
 SHA512:
-  metadata.gz: 62f0a663c050ac632b8258136125d9db76bd60e826d41d39e114ae019f590c710930e62d2d3551a0cd644e5b34f5e1d11be0d801dd2c7a9df9a778d2f858c88b
-  data.tar.gz: 291b85dc4ffc2c9601e54c090a617f50fdc4372bcb949d931b308b33235afae5440b31918a3bcd9753bcdaa02adcfb0ab57d9e0db79fcd617719a855c62bebac
+  metadata.gz: 2d5c0b3cd56aed6317fff624e417c49c9e1e2f964211ceaf5dcac549c47af363cfad88f8ee312e80b74db54bfa596e7afc10dca8276d89287ca4e6b5c4448928
+  data.tar.gz: f8ec4708f9e19d2c36df508ee6c3147b5e4c78ae93b2d5a3b1b8e161e7d62f5c2e33f7cfa8d921fa6cc70958ea3e94f9affb8a24f1c9f38d5067cd3821d728a8

data/lib/open_calais.rb

@@ -14,30 +14,20 @@ module OpenCalais
     :license_id                    => 'X-AG-Access-Token',
     :content_type                  => 'Content-Type',
     :output_format                 => 'outputFormat',
-    :reltag_base_url               => 'reltagBaseURL',
-    :calculate_relevance_score     => 'calculateRelevanceScore',
-    :enable_metadata_type          => 'enableMetadataType',
-    :doc_rdf_accessible            => 'docRDFaccessible',
-    :discard_metadata              => 'discardMetadata',
-    :omit_outputting_original_text => 'omitOutputtingOriginalText',
-    :allow_distribution            => 'allowDistribution',
-    :allow_search                  => 'allowSearch',
-    :external_id                   => 'externalID',
-    :submitter                     => 'submitter'
+    :language                      => 'x-calais-language'
   }
 
   CONTENT_TYPES = {
-    :xml     => 'TEXT/XML',
-    :html    => 'TEXT/HTML',
-    :htmlraw => 'TEXT/HTMLRAW',
+    :xml     => 'text/xml',
+    :html    => 'text/html',
+    :htmlraw => 'text/htmlraw',
     :raw     => 'text/raw'
   }
 
   OUTPUT_FORMATS = {
-    :rdf          => 'XML/RDF',
-    :simple       => 'Text/Simple',
-    :microformats => 'Text/Microformats',
-    :json         => 'application/json'
+    :rdf  => 'xml/rdf',
+    :n3   => 'text/n3',
+    :json => 'application/json'
   }
 
   METADATA_SOCIAL_TAGS = 'SocialTags'
@@ -49,5 +39,4 @@ module OpenCalais
   GEO_TYPES       = %w(City Continent Country NaturalFeature ProvinceOrState Region)
 
   DISAMBUGUATIONS = %w(er/Company er/Geo er/Product)
-
 end

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 = {params: current_options}.merge(opts)
+      options = current_options.merge(opts)
 
       response = connection(options).post do |request|
         request.body = text
@@ -49,7 +49,5 @@ module OpenCalais
     # using analyze as a standard method name
     # enrich is more OpenCalais specific
     alias_method :enrich, :analyze
-
   end
-
 end

data/lib/open_calais/configuration.rb

@@ -53,6 +53,5 @@ module OpenCalais
       self.user_agent         = DEFAULT_USER_AGENT
       self
     end
-
   end
 end

data/lib/open_calais/connection.rb

@@ -22,20 +22,17 @@ module OpenCalais
           'Accept'       => "#{OpenCalais::OUTPUT_FORMATS[:json]};charset=utf-8",
 
           # open calais default headers
-          OpenCalais::HEADERS[:license_id]                    => api_key,
-          OpenCalais::HEADERS[:content_type]                  => OpenCalais::CONTENT_TYPES[:raw],
-          OpenCalais::HEADERS[:output_format]                 => OpenCalais::OUTPUT_FORMATS[:json],
-          OpenCalais::HEADERS[:calculate_relevance_score]     => 'false',
-          OpenCalais::HEADERS[:enable_metadata_type]          => 'SocialTags',
-          OpenCalais::HEADERS[:doc_rdf_accessible]            => 'false',
-          OpenCalais::HEADERS[:omit_outputting_original_text] => 'TRUE' # case matters here, actually
+          OpenCalais::HEADERS[:license_id]    => api_key,
+          OpenCalais::HEADERS[:content_type]  => OpenCalais::CONTENT_TYPES[:raw],
+          OpenCalais::HEADERS[:output_format] => OpenCalais::OUTPUT_FORMATS[:json],
+          OpenCalais::HEADERS[:language]      => 'English'
         },
         :ssl => {:verify => false},
         :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)}
-      options
+      options.select{|k,v| ALLOWED_OPTIONS.include?(k.to_sym)}
     end
 
     def connection(options={})

data/lib/open_calais/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module OpenCalais
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/client_test.rb

@@ -36,5 +36,4 @@ describe OpenCalais::Client do
     response.wont_be_nil
     response.raw.wont_be_nil
   end
-
 end

data/test/open_calais_test.rb

@@ -21,5 +21,4 @@ describe OpenCalais do
 
     OpenCalais.options[:api_key].must_equal "this is a test key"
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_calais
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday