calais 0.0.8 → 0.0.9

data/CHANGELOG.markdown

@@ -1,5 +1,14 @@
 # Changes
 
+## 0.0.9
+
+* updates related to API changes
+* community patches to support bundler, support ruby 1.9
+
+## 0.0.8
+
+* community patches to use nokogiri
+
 ## 0.0.7
 * verified 4.0 API
 * moved gem packaging to `jeweler` and documentation to `yard`

data/Gemfile

@@ -0,0 +1,11 @@
+source :gemcutter
+
+gem "rake", "0.8.7"
+gem "curb", "0.6.7"
+gem "nokogiri"
+gem "jeweler"
+gem "yard"
+
+group :test do
+  gem "rspec"
+end

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 0
-:patch: 8
 :major: 0
+:minor: 0
+:build: 
+:patch: 9

data/lib/calais.rb

@@ -9,8 +9,10 @@ require 'nokogiri'
 require 'json'
 require 'curb'
 
-$KCODE = "UTF8"
-require 'jcode'
+if RUBY_VERSION.to_f < 1.9
+  $KCODE = "UTF8"
+  require 'jcode'
+end
 
 $:.unshift File.expand_path(File.dirname(__FILE__)) + '/calais'
 
@@ -24,8 +26,8 @@ module Calais
 
   AVAILABLE_CONTENT_TYPES = {
     :xml => 'text/xml',
-    :text => 'text/txt',
     :html => 'text/html',
+    :htmlraw => 'text/htmlraw',
     :raw => 'text/raw'
   }
 
@@ -36,8 +38,8 @@ module Calais
     :json => 'application/json'
   }
 
-  KNOWN_ENABLES = ['GenericRelations']
-  KNOWN_DISCARDS = ['er/Company', 'er/Geo']
+  KNOWN_ENABLES = ['GenericRelations', 'SocialTags']
+  KNOWN_DISCARDS = ['er/Company', 'er/Geo', 'er/Product']
 
   MAX_RETRIES = 5
   HTTP_TIMEOUT = 60

data/lib/calais/client.rb

@@ -6,7 +6,7 @@ module Calais
 
     # processing directives
     attr_accessor :content_type, :output_format, :reltag_base_url, :calculate_relevance, :omit_outputting_original_text
-    attr_accessor :metadata_enables, :metadata_discards
+    attr_accessor :store_rdf, :metadata_enables, :metadata_discards
 
     # user directives
     attr_accessor :allow_distribution, :allow_search, :external_id, :submitter
@@ -47,9 +47,11 @@ module Calais
       processing_node = Nokogiri::XML::Node.new('c:processingDirectives', document)
       processing_node['c:contentType'] = AVAILABLE_CONTENT_TYPES[@content_type] if @content_type
       processing_node['c:outputFormat'] = AVAILABLE_OUTPUT_FORMATS[@output_format] if @output_format
+      processing_node['c:calculateRelevanceScore'] = 'false' if @calculate_relevance == false
       processing_node['c:reltagBaseURL'] = @reltag_base_url.to_s if @reltag_base_url
       
-      processing_node['c:enableMetadataType'] = @metadata_enables.join(';') unless @metadata_enables.empty?
+      processing_node['c:enableMetadataType'] = @metadata_enables.join(',') unless @metadata_enables.empty?
+      processing_node['c:docRDFaccessible'] = @store_rdf if @store_rdf
       processing_node['c:discardMetadata'] = @metadata_discards.join(';') unless @metadata_discards.empty?
       processing_node['c:omitOutputtingOriginalText'] = 'true' if @omit_outputting_original_text
       
@@ -84,7 +86,7 @@ module Calais
         raise 'unknown content type' unless AVAILABLE_CONTENT_TYPES.keys.include?(@content_type) if @content_type
         raise 'unknown output format' unless AVAILABLE_OUTPUT_FORMATS.keys.include?(@output_format) if @output_format
 
-        %w[calculate_relevance allow_distribution allow_search].each do |variable|
+        %w[calculate_relevance store_rdf allow_distribution allow_search].each do |variable|
           value = self.send(variable)
           unless NilClass === value || TrueClass === value || FalseClass === value
             raise "expected a boolean value for #{variable} but got #{value}"
@@ -93,11 +95,11 @@ module Calais
 
         @metadata_enables ||= []
         unknown_enables = Set.new(@metadata_enables) - KNOWN_ENABLES
-        raise "unknown metadata enables: #{unknown_enables.to_ainspect}" unless unknown_enables.empty?
+        raise "unknown metadata enables: #{unknown_enables.to_a.inspect}" unless unknown_enables.empty?
 
         @metadata_discards ||= []
         unknown_discards = Set.new(@metadata_discards) - KNOWN_DISCARDS
-        raise "unknown metadata discards: #{unknown_discards.to_ainspect}" unless unknown_discards.empty?
+        raise "unknown metadata discards: #{unknown_discards.to_a.inspect}" unless unknown_discards.empty?
       end
 
       def do_request(post_fields)

data/spec/calais/client_spec.rb

@@ -45,7 +45,7 @@ describe Calais::Client, :params_xml do
     client.external_id = Digest::SHA1.hexdigest(client.content)
     client.submitter = 'calais.rb'
 
-    client.params_xml.should == %[<c:params xmlns:c="http://s.opencalais.com/1/pred/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">\n  <c:processingDirectives c:contentType="text/xml" c:outputFormat="application/json" c:reltagBaseURL="http://opencalais.com" c:enableMetadataType="GenericRelations" c:discardMetadata="er/Company;er/Geo"/>\n  <c:userDirectives c:allowDistribution="true" c:allowSearch="true" c:externalID="1a008b91e7d21962e132bc1d6cb252532116a606" c:submitter="calais.rb"/>\n</c:params>]
+    client.params_xml.should == %[<c:params xmlns:c="http://s.opencalais.com/1/pred/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">\n  <c:processingDirectives c:contentType="text/xml" c:outputFormat="application/json" c:reltagBaseURL="http://opencalais.com" c:enableMetadataType="GenericRelations,SocialTags" c:discardMetadata="er/Company;er/Geo;er/Product"/>\n  <c:userDirectives c:allowDistribution="true" c:allowSearch="true" c:externalID="1a008b91e7d21962e132bc1d6cb252532116a606" c:submitter="calais.rb"/>\n</c:params>]
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: calais
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Abhay Kumar
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: curb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: A Ruby interface to the Calais Web Service
 email: info@opensynapse.net
 executables: []
@@ -52,6 +69,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - CHANGELOG.markdown
+- Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -73,20 +91,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: calais
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby interface to the Calais Web Service
 test_files: 
 - spec/calais/client_spec.rb