lymbix 0.3.4 → 0.3.5

data/Changelog

@@ -1,3 +1,4 @@
+v.0.3.5 - added tonalize_article, tonalize_paragraph which belongs to the 2.0 version of gyrus, also modified the request to include the version header
 v.0.3.4 - fixed issue when setting host it still kept default host instead
 v.0.3.3 - gem now uses configuration class to set host properties for gyrus
 v.0.3.2 - made incorrect changes to gem

data/lib/lymbix/base.rb

@@ -169,10 +169,26 @@ module Lymbix
     
     # END
     
+    def word_data(phrase)
+      response = request(:post, 'word_data', {:phrase => phrase}).data
+    end
+    
+    def update_user_app_config(user_app_config_xml)
+      response = request(:post, 'update_user_app_config', {:user_app_config => user_app_config_xml},{:version => 2}).data
+    end
+    
+    def checksum_user_app_config
+      response = request(:get, 'checksum_user_app_config',nil,{:version => 2}).data
+    end
+    
     def tonalize_words(phrase)
       response = request(:post, 'tonalize_words', {:phrase => phrase}).data
     end
     
+    def tonalize_paragraph(paragraph)
+      response = request(:post, 'tonalize_paragraph', {:paragraph => paragraph}, {:version => 2}).data
+    end
+    
     def tone_alternates(phrase)
       response = request(:post, 'suggestions',{:phrase => phrase}).data
     end
@@ -181,6 +197,10 @@ module Lymbix
       response = request(:post, 'suggest_alternates',{:phrase => phrase, :alternates => alternates}).data
     end
     
+    def tonalize_article(article)
+      response = request(:post, 'tonalize_article',{:article => article},{:version => 2}).data
+    end
+    
     def all_connotative_categories
       response = request(:get, 'connotative_categories')
       all_cc = []
@@ -206,8 +226,12 @@ module Lymbix
     end
     
     private
-    def request(action, method, data = nil)
-      Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id}, data).run
+    def request(action, method, data = nil,headers = nil)
+      if headers
+        Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id, :version => headers[:version]}, data).run
+      else
+        Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id, :version => 1}, data).run
+      end
     end
 
   end

data/lib/lymbix/request.rb

@@ -16,7 +16,7 @@ module Lymbix
     
     def connection
       options = {}
-      options[:headers] = {:accept => "application/json", :APP_ID => self.header_hash[:app_id].to_s, :LYMBIX_USER_ID => self.header_hash[:lymbix_user_id], :AUTHENTICATION => self.header_hash[:auth_key]}            
+      options[:headers] = {:accept => "application/json", :APP_ID => self.header_hash[:app_id].to_s, :LYMBIX_USER_ID => self.header_hash[:lymbix_user_id], :AUTHENTICATION => self.header_hash[:auth_key], :VERSION => self.header_hash[:version]}            
       RestClient::Resource.new(self.url, options)
     end
     
@@ -24,25 +24,29 @@ module Lymbix
       case(self.http_method)
       when :get
         self.connection[self.method].get do |resp|
+          begin
           case resp.code 
             when 200
               self.response = resp.body
             when 401
               raise RestClient::Unauthorized
-            else
-              raise Exception
             end
+          rescue
+            puts resp.inspect
+          end
         end
       when :post
         self.connection[self.method].post(object) do |resp|
+          begin
           case resp.code 
             when 200
               self.response = resp.body
             when 401
               raise RestClient::Unauthorized
-            else
-              raise Exception
             end
+          rescue
+            puts resp.inspect
+          end
         end
       end
       Response.new(self.response)

data/lib/lymbix/response.rb

@@ -7,15 +7,20 @@ module Lymbix
 
     def initialize(response)
       unless response == "null"
-        @data = JSON.parse(response.to_s)
-        unless @data.class == Array
-          if @data["success"] == "false"
-            @success = false
+        begin
+          @data = JSON.parse(response.to_s)
+          unless @data.class == Array
+            if @data["success"] == "false"
+              @success = false
+            else
+              @success = true
+            end
           else
             @success = true
           end
-        else
-          @success = true
+        rescue
+        @success = false
+        @data = response
         end
       else
         @success = false

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lymbix
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Patrick Roy
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -53,23 +54,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The Lymbix gem provides an interface to gyrus (connotative logic and database).